Merge branch 'dev-3.5' into dev-3.6

7 files changed, 32 insertions, 20 deletions

diff --git a/nz-admin/src/main/java/com/nis/common/utils/ExcelUtils.java b/nz-admin/src/main/java/com/nis/common/utils/ExcelUtils.java
index 2ddb2c5f..58e5e190 100644
--- a/nz-admin/src/main/java/com/nis/common/utils/ExcelUtils.java
+++ b/nz-admin/src/main/java/com/nis/common/utils/ExcelUtils.java
@@ -103,8 +103,12 @@ public class ExcelUtils {
                     // 在excel里,日期也是数字,在此要进行判断
                     if (HSSFDateUtil.isCellDateFormatted(cell)) {
                         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-                        Date date = cell.getDateCellValue();
-                        result = sdf.format(date);
+                        String format = sdf.format(cell.getDateCellValue());
+                        if(format.startsWith("1899-12-31")){ // 只有时分的日期格式会被默认设置为1899-12-31
+                            sdf = new SimpleDateFormat("HH:mm");
+                            format = sdf.format(cell.getDateCellValue());
+                        }
+                        result = format;
                     }
                     else {
                         // 数字也按照字符串类型获取值
diff --git a/nz-admin/src/main/java/com/nis/common/utils/ImportValidateUtil.java b/nz-admin/src/main/java/com/nis/common/utils/ImportValidateUtil.java
index 8a174a58..45ffbf23 100644
--- a/nz-admin/src/main/java/com/nis/common/utils/ImportValidateUtil.java
+++ b/nz-admin/src/main/java/com/nis/common/utils/ImportValidateUtil.java
@@ -208,9 +208,15 @@ public class ImportValidateUtil {
     /**
      * 校验端口是否符合规范
      */
-    public void validateIp(String ip, int lineNum, int headerIndex) {
+    public void validateIp(String ip, int lineNum, int headerIndex, String type) {
         if (StrUtil.isNotEmpty(ip)) {
-            if (!CommonUtils.checkIp(ip)) {
+            boolean checkIp;
+            switch (type){
+                case "4": checkIp = CommonUtils.checkIpv4(ip); break;
+                case "6": checkIp = CommonUtils.checkIpv6(ip); break;
+                default: checkIp = CommonUtils.checkIp(ip); break;
+            }
+            if (!checkIp) {
                 String header = headerInfos.get(headerIndex);
                 this.recordImportAttrErr(lineNum, RCode.IMPORT_FORMAT_ERROR.setParam(header));
             }
diff --git a/nz-admin/src/main/java/com/nis/modules/alert/service/impl/AlertRuleServiceImpl.java b/nz-admin/src/main/java/com/nis/modules/alert/service/impl/AlertRuleServiceImpl.java
index 3b9463f9..83b7f945 100644
--- a/nz-admin/src/main/java/com/nis/modules/alert/service/impl/AlertRuleServiceImpl.java
+++ b/nz-admin/src/main/java/com/nis/modules/alert/service/impl/AlertRuleServiceImpl.java
@@ -407,6 +407,8 @@ public class AlertRuleServiceImpl extends ServiceImpl<AlertRuleDao, AlertRuleEnt
             schedDays = StrUtil.emptyToDefault(schedDays, "1,2,3,4,5,6,7");
             schedStime = StrUtil.emptyToDefault(schedStime, "00:00");
             schedEtime = StrUtil.emptyToDefault(schedEtime, "23:59");
+            if(schedStime.length() < 5) schedStime = "0" + schedStime;
+            if(schedEtime.length() < 5) schedEtime = "0" + schedEtime;
 
             Arrays.stream(StrUtil.split(schedDays, ",")).distinct().forEach(s -> {
                 validateUtil.validateRegex(s, "^[1-7]$", lineNum, AlertRuleImportEnum.SCHED_DAYS.getIndex());
diff --git a/nz-admin/src/main/java/com/nis/modules/endpoint/service/impl/MonitorEndpointServiceImpl.java b/nz-admin/src/main/java/com/nis/modules/endpoint/service/impl/MonitorEndpointServiceImpl.java
index 5384e9d4..ec55c35f 100644
--- a/nz-admin/src/main/java/com/nis/modules/endpoint/service/impl/MonitorEndpointServiceImpl.java
+++ b/nz-admin/src/main/java/com/nis/modules/endpoint/service/impl/MonitorEndpointServiceImpl.java
@@ -1063,7 +1063,7 @@ public class MonitorEndpointServiceImpl extends ServiceImpl<MonitorEndpointDao,
 
                     Object host = configMap.get("host");
                     if (ToolUtil.isNotEmpty(host))
-                        validateUtil.validateIp(host.toString(), lineNum, MonitorEndpointImportEnum.CONFIGURATIONS.getIndex());
+                        validateUtil.validateIp(host.toString(), lineNum, MonitorEndpointImportEnum.CONFIGURATIONS.getIndex(), "");
 
                     Object port = configMap.get("port");
                     if (ToolUtil.isNotEmpty(port))
diff --git a/nz-admin/src/main/java/com/nis/modules/ipam/service/impl/IpamIpServiceImpl.java b/nz-admin/src/main/java/com/nis/modules/ipam/service/impl/IpamIpServiceImpl.java
index 821e9bc5..50062c54 100644
--- a/nz-admin/src/main/java/com/nis/modules/ipam/service/impl/IpamIpServiceImpl.java
+++ b/nz-admin/src/main/java/com/nis/modules/ipam/service/impl/IpamIpServiceImpl.java
@@ -205,7 +205,7 @@ public class IpamIpServiceImpl extends ServiceImpl<IpamIpDao, IpamIp> implements
             String addr = dataMap.get(IpamIpEum.ADDR.getIndex());
             IpamSubnet ipamSubnet = ipamSubnetService.getOne(new LambdaQueryWrapper<IpamSubnet>().eq(IpamSubnet::getName, subnetName));
             validateUtil.validateRequired(addr, lineNum, IpamIpEum.ADDR.getIndex());
-            validateUtil.validateIp(addr, lineNum , IpamIpEum.ADDR.getIndex());
+            validateUtil.validateIp(addr, lineNum , IpamIpEum.ADDR.getIndex(), "");
             if (ipamSubnet == null){
                 validateUtil.recordImportAttrErr(lineNum, RCode.IPAM_IP_SUBNET_ISNULL);
             }else {
diff --git a/nz-admin/src/main/java/com/nis/modules/ipam/service/impl/IpamSubnetServiceImpl.java b/nz-admin/src/main/java/com/nis/modules/ipam/service/impl/IpamSubnetServiceImpl.java
index 3264db7a..447d7dfe 100644
--- a/nz-admin/src/main/java/com/nis/modules/ipam/service/impl/IpamSubnetServiceImpl.java
+++ b/nz-admin/src/main/java/com/nis/modules/ipam/service/impl/IpamSubnetServiceImpl.java
@@ -315,7 +315,7 @@ public class IpamSubnetServiceImpl extends ServiceImpl<IpamSubnetDao, IpamSubnet
 			//ip校验
             String addr = dataMap.get(IpamSubnetEum.ADDR.getIndex());
 			validateUtil.validateRequired(addr, lineNum, IpamSubnetEum.ADDR.getIndex());
-			validateUtil.validateIp(addr, lineNum, IpamSubnetEum.ADDR.getIndex());
+			validateUtil.validateIp(addr, lineNum, IpamSubnetEum.ADDR.getIndex(), type);
 
 			//掩码校验
             String mask = dataMap.get(IpamSubnetEum.MASK.getIndex());
diff --git a/nz-admin/src/main/resources/db/V2022.10.11__reserved_buildIn_data.sql b/nz-admin/src/main/resources/db/V2022.10.11__reserved_buildIn_data.sql
index 8a5d27d3..c3ea9cc1 100644
--- a/nz-admin/src/main/resources/db/V2022.10.11__reserved_buildIn_data.sql
+++ b/nz-admin/src/main/resources/db/V2022.10.11__reserved_buildIn_data.sql
@@ -15,7 +15,7 @@ UPDATE asset_field_value SET meta_id = meta_id + 100000;
 INSERT INTO `alert_rule`
 (`id`, `name`, `expr`, `last`, `summary`, `description`, `receiver`, `build_in`, `operator`, `threshold`, `unit`, `seq`, `severity_id`, `method`, `state`, `type`, `inr`, `timeout`, `auto_expired`, `sched_enable`, `sched_days`, `sched_stime`, `sched_etime`, `notify_active`, `notify_expired`, `trb_shot`)
 SELECT
-1, 'Default snmptrap', '1.3.6.1', 3600, '{{$message}}', '{{$variables}}', '', '1', '', NULL, 0, NULL, 3, '', 1, 3, 0, 300, 1, 0, '1,2,3,4,5,6,7', '00:00', '23:59', 1, 1, ''
+1, 'Default snmptrap', '1.3.6.1', 3600, '{{$message}}', '{{$variables}}', '', '1', '', NULL, 0, NULL, 3, '', 1, 3, 0, 300, 1, 0, '1,2,3,4,5,6,7', '00:00', '23:59', 1, 1, '' FROM dual
 WHERE NOT EXISTS (SELECT name FROM `alert_rule` WHERE name = "Default snmptrap" or id = 1);
 
 UPDATE alert_rule SET build_in = 1 WHERE id = 1;
@@ -46,7 +46,7 @@ UPDATE record_rule SET id = id + 100000 WHERE build_in != 1 ORDER BY id DESC;
 INSERT INTO `visual_panel`
 (`id`, `name`, `create_by`, `type`, `link`, `pid`, `weight`, `build_in`, `seq`, `param`, `remark`, `uts`)
 SELECT
-1, 'Overview', 1, 'dashboard', 0, 0, 0, '1', 'v3.2-buildin', '{}', '', 0
+1, 'Overview', 1, 'dashboard', 0, 0, 0, '1', 'v3.2-buildin', '{}', '', 0 FROM dual
 WHERE NOT EXISTS (SELECT name FROM `visual_panel` WHERE ( name = "Overview" or id = 1) and seq = "v3.2-buildin");
 
 UPDATE visual_panel SET build_in = 1 WHERE id = 1;
@@ -132,12 +132,12 @@ UPDATE asset_brand SET id = id + 100000 WHERE name not in ("Generic","GDNT") ORD
 
 INSERT INTO `asset_brand` (`id`, `name`, `remark`, `seq`)
 SELECT
-1, 'Generic', '', 'build-in'
+1, 'Generic', '', 'build-in' FROM dual
 WHERE NOT EXISTS (SELECT name FROM `asset_brand` WHERE name = "Generic");
 
 INSERT INTO `asset_brand` (`id`, `name`, `remark`, `seq`)
 SELECT
-2, 'GDNT', '', 'build-in'
+2, 'GDNT', '', 'build-in' FROM dual
 WHERE NOT EXISTS (SELECT name FROM `asset_brand` WHERE name = "GDNT");
 
 
@@ -156,55 +156,55 @@ UPDATE asset_model SET id = id + 100000 WHERE name NOT IN ( 'Generic Linux', 'Ge
 
 INSERT INTO `asset_model` (`id`, `brand_id`, `name`, `remark`, `seq`, `usize`, `chart_ids`, `type_id`, `sys_object_id`, `tsg_appliance`)
 SELECT
-1, @GenericBrandId, 'Generic Linux',    '', 'builld-in', 1, '', 6, '', 0
+1, @GenericBrandId, 'Generic Linux',    '', 'builld-in', 1, '', 6, '', 0 FROM dual
 WHERE NOT EXISTS (SELECT name FROM `asset_model` WHERE name = "Generic Linux")
 AND EXISTS ( SELECT NAME FROM `asset_type_conf` WHERE id = 6 );
 
 INSERT INTO `asset_model` (`id`, `brand_id`, `name`, `remark`, `seq`, `usize`, `chart_ids`, `type_id`, `sys_object_id`, `tsg_appliance`)
 SELECT
-2, @GenericBrandId, 'Generic switch',   '', 'builld-in', 1, '', 4, '', 0
+2, @GenericBrandId, 'Generic switch',   '', 'builld-in', 1, '', 4, '', 0 FROM dual
 WHERE NOT EXISTS (SELECT name FROM `asset_model` WHERE name = "Generic switch")
 AND EXISTS ( SELECT NAME FROM `asset_type_conf` WHERE id = 4 );
 
 INSERT INTO `asset_model` (`id`, `brand_id`, `name`, `remark`, `seq`, `usize`, `chart_ids`, `type_id`, `sys_object_id`, `tsg_appliance`)
 SELECT
-3, @GenericBrandId, 'Generic router',   '', 'builld-in', 1, '', 2, '', 0
+3, @GenericBrandId, 'Generic router',   '', 'builld-in', 1, '', 2, '', 0 FROM dual
 WHERE NOT EXISTS (SELECT name FROM `asset_model` WHERE name = "Generic router")
 AND EXISTS ( SELECT NAME FROM `asset_type_conf` WHERE id = 2 );
 
 INSERT INTO `asset_model` (`id`, `brand_id`, `name`, `remark`, `seq`, `usize`, `chart_ids`, `type_id`, `sys_object_id`, `tsg_appliance`)
 SELECT
-4, @GenericBrandId, 'Generic firewall', '', 'builld-in', 1, '', 3, '', 0
+4, @GenericBrandId, 'Generic firewall', '', 'builld-in', 1, '', 3, '', 0 FROM dual
 WHERE NOT EXISTS (SELECT name FROM `asset_model` WHERE name = "Generic firewall")
 AND EXISTS ( SELECT NAME FROM `asset_type_conf` WHERE id = 3 );
 
 INSERT INTO `asset_model` (`id`, `brand_id`, `name`, `remark`, `seq`, `usize`, `chart_ids`, `type_id`, `sys_object_id`, `tsg_appliance`)
 SELECT
-5, @GenericBrandId, 'Generic VM',       '', 'builld-in', 1, '', 7, '', 0
+5, @GenericBrandId, 'Generic VM',       '', 'builld-in', 1, '', 7, '', 0 FROM dual
 WHERE NOT EXISTS (SELECT name FROM `asset_model` WHERE name = "Generic VM")
 AND EXISTS ( SELECT NAME FROM `asset_type_conf` WHERE id = 7 );
 
 INSERT INTO `asset_model` (`id`, `brand_id`, `name`, `remark`, `seq`, `usize`, `chart_ids`, `type_id`, `sys_object_id`, `tsg_appliance`)
 SELECT
-6, @GenericBrandId, 'Generic computer', '', 'builld-in', 1, '', 5, '', 0
+6, @GenericBrandId, 'Generic computer', '', 'builld-in', 1, '', 5, '', 0 FROM dual
 WHERE NOT EXISTS (SELECT name FROM `asset_model` WHERE name = "Generic computer")
 AND EXISTS ( SELECT NAME FROM `asset_type_conf` WHERE id = 5 );
 
 INSERT INTO `asset_model` (`id`, `brand_id`, `name`, `remark`, `seq`, `usize`, `chart_ids`, `type_id`, `sys_object_id`, `tsg_appliance`)
 SELECT
-7, @GDNTBrandId, 'TSG-X',            '', 'builld-in', 1, '', 3, '', 1
+7, @GDNTBrandId, 'TSG-X',            '', 'builld-in', 1, '', 3, '', 1 FROM dual
 WHERE NOT EXISTS (SELECT name FROM `asset_model` WHERE name = "TSG-X")
 AND EXISTS ( SELECT NAME FROM `asset_type_conf` WHERE id = 3 );
 
 INSERT INTO `asset_model` (`id`, `brand_id`, `name`, `remark`, `seq`, `usize`, `chart_ids`, `type_id`, `sys_object_id`, `tsg_appliance`)
 SELECT
-8, @GDNTBrandId, 'TSG-7400',         '', 'builld-in', 1, '', 8, '', 0
+8, @GDNTBrandId, 'TSG-7400',         '', 'builld-in', 1, '', 8, '', 0 FROM dual
 WHERE NOT EXISTS (SELECT name FROM `asset_model` WHERE name = "TSG-7400")
 AND EXISTS ( SELECT NAME FROM `asset_type_conf` WHERE id = 8 );
 
 INSERT INTO `asset_model` (`id`, `brand_id`, `name`, `remark`, `seq`, `usize`, `chart_ids`, `type_id`, `sys_object_id`, `tsg_appliance`)
 SELECT
-9, @GDNTBrandId, 'TSG-9140',         '', 'builld-in', 1, '', 3, '', 0
+9, @GDNTBrandId, 'TSG-9140',         '', 'builld-in', 1, '', 3, '', 0 FROM dual
 WHERE NOT EXISTS (SELECT name FROM `asset_model` WHERE name = "TSG-9140")
 AND EXISTS ( SELECT NAME FROM `asset_type_conf` WHERE id = 3 );