diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index f626ab7..97a8131 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -151,7 +151,7 @@ + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getThreshold() + "," + busConfigDTO.getSleepStartTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数、阈值、睡眠开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index f626ab7..97a8131 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -151,7 +151,7 @@ + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getThreshold() + "," + busConfigDTO.getSleepStartTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数、阈值、睡眠开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 9e6929e..2f8dc74 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index f626ab7..97a8131 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -151,7 +151,7 @@ + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getThreshold() + "," + busConfigDTO.getSleepStartTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数、阈值、睡眠开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 9e6929e..2f8dc74 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 860a67b..52ff667 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -136,7 +136,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index f626ab7..97a8131 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -151,7 +151,7 @@ + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getThreshold() + "," + busConfigDTO.getSleepStartTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数、阈值、睡眠开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 9e6929e..2f8dc74 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 860a67b..52ff667 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -136,7 +136,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java index 1a9bb6e..4aa661a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.system.dao.BusConfigMapper; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.dto.ExcelModel.KadConfigExportDTO; import com.casic.missiles.modular.system.model.BusConfig; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.redis.RedisPublisherUtil; @@ -152,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.KAD.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -305,6 +306,8 @@ @Override public void exp(List busConfigDTOList, HttpServletResponse response) { + List configExportDTOList = new ArrayList<>(); + FileInputStream fis = null; try { response.setContentType("application/octet-stream"); @@ -318,22 +321,22 @@ var.put("list", new ArrayList() { { for (int i = 0; i < busConfigDTOList.size(); i++) { - BusConfigDTO busConfigDTO = busConfigDTOList.get(i); + KadConfigExportDTO configExportDTO = new KadConfigExportDTO(busConfigDTOList.get(i)); + configExportDTOList.add(configExportDTO); add(new HashMap() { { - put("设备编号", busConfigDTO.getDevcode()); - put("重传次数", busConfigDTO.getRetryTimes()); - put("采集间隔", busConfigDTO.getCollectInterval()); - put("上传周期", busConfigDTO.getUploadPeriod()); - put("IP地址", busConfigDTO.getIp()); - put("端口", busConfigDTO.getPort()); - put("最大尝试次数", busConfigDTO.getAttemptsMax()); - put("已尝试次数", busConfigDTO.getAttemptsCurrent()); - put("端口号", "port"); - put("低报报警阈值", busConfigDTO.getLowerThreshold()); - put("高报报警阈值", busConfigDTO.getUpperThreshold()); - put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发"); - put("创建时间", busConfigDTO.getWritetime()); + put("设备编号", configExportDTO.getDevcode()); + put("重传次数", configExportDTO.getRetryTimes()); + put("采集间隔", configExportDTO.getCollectInterval()); + put("上传周期", configExportDTO.getUploadPeriod()); + put("IP地址", configExportDTO.getIp()); + put("端口", configExportDTO.getPort()); + put("最大尝试次数", configExportDTO.getAttemptsMax()); + put("已尝试次数", configExportDTO.getAttemptsCurrent()); + put("低报报警阈值", configExportDTO.getLowerThreshold()); + put("高报报警阈值", configExportDTO.getUpperThreshold()); + put("下发状态", configExportDTO.getStatusName()); + put("创建时间", configExportDTO.getWritetime()); } }); } @@ -341,7 +344,7 @@ }); //输出模板 //TODO 导出类设置 - exportService.exportExcel(response, BusConfigDTO.class, busConfigDTOList, "导出文件"); + exportService.exportExcel(response, KadConfigExportDTO.class, configExportDTOList, "导出文件"); } catch (Exception e) { e.printStackTrace(); } finally { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index f626ab7..97a8131 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -151,7 +151,7 @@ + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getThreshold() + "," + busConfigDTO.getSleepStartTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数、阈值、睡眠开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 9e6929e..2f8dc74 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 860a67b..52ff667 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -136,7 +136,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java index 1a9bb6e..4aa661a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.system.dao.BusConfigMapper; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.dto.ExcelModel.KadConfigExportDTO; import com.casic.missiles.modular.system.model.BusConfig; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.redis.RedisPublisherUtil; @@ -152,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.KAD.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -305,6 +306,8 @@ @Override public void exp(List busConfigDTOList, HttpServletResponse response) { + List configExportDTOList = new ArrayList<>(); + FileInputStream fis = null; try { response.setContentType("application/octet-stream"); @@ -318,22 +321,22 @@ var.put("list", new ArrayList() { { for (int i = 0; i < busConfigDTOList.size(); i++) { - BusConfigDTO busConfigDTO = busConfigDTOList.get(i); + KadConfigExportDTO configExportDTO = new KadConfigExportDTO(busConfigDTOList.get(i)); + configExportDTOList.add(configExportDTO); add(new HashMap() { { - put("设备编号", busConfigDTO.getDevcode()); - put("重传次数", busConfigDTO.getRetryTimes()); - put("采集间隔", busConfigDTO.getCollectInterval()); - put("上传周期", busConfigDTO.getUploadPeriod()); - put("IP地址", busConfigDTO.getIp()); - put("端口", busConfigDTO.getPort()); - put("最大尝试次数", busConfigDTO.getAttemptsMax()); - put("已尝试次数", busConfigDTO.getAttemptsCurrent()); - put("端口号", "port"); - put("低报报警阈值", busConfigDTO.getLowerThreshold()); - put("高报报警阈值", busConfigDTO.getUpperThreshold()); - put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发"); - put("创建时间", busConfigDTO.getWritetime()); + put("设备编号", configExportDTO.getDevcode()); + put("重传次数", configExportDTO.getRetryTimes()); + put("采集间隔", configExportDTO.getCollectInterval()); + put("上传周期", configExportDTO.getUploadPeriod()); + put("IP地址", configExportDTO.getIp()); + put("端口", configExportDTO.getPort()); + put("最大尝试次数", configExportDTO.getAttemptsMax()); + put("已尝试次数", configExportDTO.getAttemptsCurrent()); + put("低报报警阈值", configExportDTO.getLowerThreshold()); + put("高报报警阈值", configExportDTO.getUpperThreshold()); + put("下发状态", configExportDTO.getStatusName()); + put("创建时间", configExportDTO.getWritetime()); } }); } @@ -341,7 +344,7 @@ }); //输出模板 //TODO 导出类设置 - exportService.exportExcel(response, BusConfigDTO.class, busConfigDTOList, "导出文件"); + exportService.exportExcel(response, KadConfigExportDTO.class, configExportDTOList, "导出文件"); } catch (Exception e) { e.printStackTrace(); } finally { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 3713c00..2987fda 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Methane.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -223,7 +223,7 @@ }else { if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不能小于5"); return stringMap; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index f626ab7..97a8131 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -151,7 +151,7 @@ + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getThreshold() + "," + busConfigDTO.getSleepStartTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数、阈值、睡眠开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 9e6929e..2f8dc74 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 860a67b..52ff667 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -136,7 +136,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java index 1a9bb6e..4aa661a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.system.dao.BusConfigMapper; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.dto.ExcelModel.KadConfigExportDTO; import com.casic.missiles.modular.system.model.BusConfig; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.redis.RedisPublisherUtil; @@ -152,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.KAD.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -305,6 +306,8 @@ @Override public void exp(List busConfigDTOList, HttpServletResponse response) { + List configExportDTOList = new ArrayList<>(); + FileInputStream fis = null; try { response.setContentType("application/octet-stream"); @@ -318,22 +321,22 @@ var.put("list", new ArrayList() { { for (int i = 0; i < busConfigDTOList.size(); i++) { - BusConfigDTO busConfigDTO = busConfigDTOList.get(i); + KadConfigExportDTO configExportDTO = new KadConfigExportDTO(busConfigDTOList.get(i)); + configExportDTOList.add(configExportDTO); add(new HashMap() { { - put("设备编号", busConfigDTO.getDevcode()); - put("重传次数", busConfigDTO.getRetryTimes()); - put("采集间隔", busConfigDTO.getCollectInterval()); - put("上传周期", busConfigDTO.getUploadPeriod()); - put("IP地址", busConfigDTO.getIp()); - put("端口", busConfigDTO.getPort()); - put("最大尝试次数", busConfigDTO.getAttemptsMax()); - put("已尝试次数", busConfigDTO.getAttemptsCurrent()); - put("端口号", "port"); - put("低报报警阈值", busConfigDTO.getLowerThreshold()); - put("高报报警阈值", busConfigDTO.getUpperThreshold()); - put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发"); - put("创建时间", busConfigDTO.getWritetime()); + put("设备编号", configExportDTO.getDevcode()); + put("重传次数", configExportDTO.getRetryTimes()); + put("采集间隔", configExportDTO.getCollectInterval()); + put("上传周期", configExportDTO.getUploadPeriod()); + put("IP地址", configExportDTO.getIp()); + put("端口", configExportDTO.getPort()); + put("最大尝试次数", configExportDTO.getAttemptsMax()); + put("已尝试次数", configExportDTO.getAttemptsCurrent()); + put("低报报警阈值", configExportDTO.getLowerThreshold()); + put("高报报警阈值", configExportDTO.getUpperThreshold()); + put("下发状态", configExportDTO.getStatusName()); + put("创建时间", configExportDTO.getWritetime()); } }); } @@ -341,7 +344,7 @@ }); //输出模板 //TODO 导出类设置 - exportService.exportExcel(response, BusConfigDTO.class, busConfigDTOList, "导出文件"); + exportService.exportExcel(response, KadConfigExportDTO.class, configExportDTOList, "导出文件"); } catch (Exception e) { e.printStackTrace(); } finally { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 3713c00..2987fda 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Methane.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -223,7 +223,7 @@ }else { if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不能小于5"); return stringMap; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 046bf4e..8fc6a2d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getCollectTime() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); // Device device = iDeviceService.selectById(busConfigDTO.getDeviceId()); // if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index f626ab7..97a8131 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -151,7 +151,7 @@ + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getThreshold() + "," + busConfigDTO.getSleepStartTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数、阈值、睡眠开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 9e6929e..2f8dc74 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 860a67b..52ff667 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -136,7 +136,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java index 1a9bb6e..4aa661a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.system.dao.BusConfigMapper; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.dto.ExcelModel.KadConfigExportDTO; import com.casic.missiles.modular.system.model.BusConfig; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.redis.RedisPublisherUtil; @@ -152,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.KAD.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -305,6 +306,8 @@ @Override public void exp(List busConfigDTOList, HttpServletResponse response) { + List configExportDTOList = new ArrayList<>(); + FileInputStream fis = null; try { response.setContentType("application/octet-stream"); @@ -318,22 +321,22 @@ var.put("list", new ArrayList() { { for (int i = 0; i < busConfigDTOList.size(); i++) { - BusConfigDTO busConfigDTO = busConfigDTOList.get(i); + KadConfigExportDTO configExportDTO = new KadConfigExportDTO(busConfigDTOList.get(i)); + configExportDTOList.add(configExportDTO); add(new HashMap() { { - put("设备编号", busConfigDTO.getDevcode()); - put("重传次数", busConfigDTO.getRetryTimes()); - put("采集间隔", busConfigDTO.getCollectInterval()); - put("上传周期", busConfigDTO.getUploadPeriod()); - put("IP地址", busConfigDTO.getIp()); - put("端口", busConfigDTO.getPort()); - put("最大尝试次数", busConfigDTO.getAttemptsMax()); - put("已尝试次数", busConfigDTO.getAttemptsCurrent()); - put("端口号", "port"); - put("低报报警阈值", busConfigDTO.getLowerThreshold()); - put("高报报警阈值", busConfigDTO.getUpperThreshold()); - put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发"); - put("创建时间", busConfigDTO.getWritetime()); + put("设备编号", configExportDTO.getDevcode()); + put("重传次数", configExportDTO.getRetryTimes()); + put("采集间隔", configExportDTO.getCollectInterval()); + put("上传周期", configExportDTO.getUploadPeriod()); + put("IP地址", configExportDTO.getIp()); + put("端口", configExportDTO.getPort()); + put("最大尝试次数", configExportDTO.getAttemptsMax()); + put("已尝试次数", configExportDTO.getAttemptsCurrent()); + put("低报报警阈值", configExportDTO.getLowerThreshold()); + put("高报报警阈值", configExportDTO.getUpperThreshold()); + put("下发状态", configExportDTO.getStatusName()); + put("创建时间", configExportDTO.getWritetime()); } }); } @@ -341,7 +344,7 @@ }); //输出模板 //TODO 导出类设置 - exportService.exportExcel(response, BusConfigDTO.class, busConfigDTOList, "导出文件"); + exportService.exportExcel(response, KadConfigExportDTO.class, configExportDTOList, "导出文件"); } catch (Exception e) { e.printStackTrace(); } finally { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 3713c00..2987fda 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Methane.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -223,7 +223,7 @@ }else { if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不能小于5"); return stringMap; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 046bf4e..8fc6a2d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getCollectTime() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); // Device device = iDeviceService.selectById(busConfigDTO.getDeviceId()); // if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java index 13eb940..9a635f4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java @@ -153,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.PRESS.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index f626ab7..97a8131 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -151,7 +151,7 @@ + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getThreshold() + "," + busConfigDTO.getSleepStartTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数、阈值、睡眠开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 9e6929e..2f8dc74 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 860a67b..52ff667 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -136,7 +136,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java index 1a9bb6e..4aa661a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.system.dao.BusConfigMapper; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.dto.ExcelModel.KadConfigExportDTO; import com.casic.missiles.modular.system.model.BusConfig; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.redis.RedisPublisherUtil; @@ -152,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.KAD.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -305,6 +306,8 @@ @Override public void exp(List busConfigDTOList, HttpServletResponse response) { + List configExportDTOList = new ArrayList<>(); + FileInputStream fis = null; try { response.setContentType("application/octet-stream"); @@ -318,22 +321,22 @@ var.put("list", new ArrayList() { { for (int i = 0; i < busConfigDTOList.size(); i++) { - BusConfigDTO busConfigDTO = busConfigDTOList.get(i); + KadConfigExportDTO configExportDTO = new KadConfigExportDTO(busConfigDTOList.get(i)); + configExportDTOList.add(configExportDTO); add(new HashMap() { { - put("设备编号", busConfigDTO.getDevcode()); - put("重传次数", busConfigDTO.getRetryTimes()); - put("采集间隔", busConfigDTO.getCollectInterval()); - put("上传周期", busConfigDTO.getUploadPeriod()); - put("IP地址", busConfigDTO.getIp()); - put("端口", busConfigDTO.getPort()); - put("最大尝试次数", busConfigDTO.getAttemptsMax()); - put("已尝试次数", busConfigDTO.getAttemptsCurrent()); - put("端口号", "port"); - put("低报报警阈值", busConfigDTO.getLowerThreshold()); - put("高报报警阈值", busConfigDTO.getUpperThreshold()); - put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发"); - put("创建时间", busConfigDTO.getWritetime()); + put("设备编号", configExportDTO.getDevcode()); + put("重传次数", configExportDTO.getRetryTimes()); + put("采集间隔", configExportDTO.getCollectInterval()); + put("上传周期", configExportDTO.getUploadPeriod()); + put("IP地址", configExportDTO.getIp()); + put("端口", configExportDTO.getPort()); + put("最大尝试次数", configExportDTO.getAttemptsMax()); + put("已尝试次数", configExportDTO.getAttemptsCurrent()); + put("低报报警阈值", configExportDTO.getLowerThreshold()); + put("高报报警阈值", configExportDTO.getUpperThreshold()); + put("下发状态", configExportDTO.getStatusName()); + put("创建时间", configExportDTO.getWritetime()); } }); } @@ -341,7 +344,7 @@ }); //输出模板 //TODO 导出类设置 - exportService.exportExcel(response, BusConfigDTO.class, busConfigDTOList, "导出文件"); + exportService.exportExcel(response, KadConfigExportDTO.class, configExportDTOList, "导出文件"); } catch (Exception e) { e.printStackTrace(); } finally { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 3713c00..2987fda 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Methane.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -223,7 +223,7 @@ }else { if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不能小于5"); return stringMap; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 046bf4e..8fc6a2d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getCollectTime() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); // Device device = iDeviceService.selectById(busConfigDTO.getDeviceId()); // if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java index 13eb940..9a635f4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java @@ -153,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.PRESS.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 994e825..d28a498 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getCollectInterval() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getCollectTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集间隔、重传次数、采集次数、采集开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.TempHumi.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index f626ab7..97a8131 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -151,7 +151,7 @@ + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getThreshold() + "," + busConfigDTO.getSleepStartTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数、阈值、睡眠开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 9e6929e..2f8dc74 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 860a67b..52ff667 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -136,7 +136,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java index 1a9bb6e..4aa661a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.system.dao.BusConfigMapper; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.dto.ExcelModel.KadConfigExportDTO; import com.casic.missiles.modular.system.model.BusConfig; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.redis.RedisPublisherUtil; @@ -152,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.KAD.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -305,6 +306,8 @@ @Override public void exp(List busConfigDTOList, HttpServletResponse response) { + List configExportDTOList = new ArrayList<>(); + FileInputStream fis = null; try { response.setContentType("application/octet-stream"); @@ -318,22 +321,22 @@ var.put("list", new ArrayList() { { for (int i = 0; i < busConfigDTOList.size(); i++) { - BusConfigDTO busConfigDTO = busConfigDTOList.get(i); + KadConfigExportDTO configExportDTO = new KadConfigExportDTO(busConfigDTOList.get(i)); + configExportDTOList.add(configExportDTO); add(new HashMap() { { - put("设备编号", busConfigDTO.getDevcode()); - put("重传次数", busConfigDTO.getRetryTimes()); - put("采集间隔", busConfigDTO.getCollectInterval()); - put("上传周期", busConfigDTO.getUploadPeriod()); - put("IP地址", busConfigDTO.getIp()); - put("端口", busConfigDTO.getPort()); - put("最大尝试次数", busConfigDTO.getAttemptsMax()); - put("已尝试次数", busConfigDTO.getAttemptsCurrent()); - put("端口号", "port"); - put("低报报警阈值", busConfigDTO.getLowerThreshold()); - put("高报报警阈值", busConfigDTO.getUpperThreshold()); - put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发"); - put("创建时间", busConfigDTO.getWritetime()); + put("设备编号", configExportDTO.getDevcode()); + put("重传次数", configExportDTO.getRetryTimes()); + put("采集间隔", configExportDTO.getCollectInterval()); + put("上传周期", configExportDTO.getUploadPeriod()); + put("IP地址", configExportDTO.getIp()); + put("端口", configExportDTO.getPort()); + put("最大尝试次数", configExportDTO.getAttemptsMax()); + put("已尝试次数", configExportDTO.getAttemptsCurrent()); + put("低报报警阈值", configExportDTO.getLowerThreshold()); + put("高报报警阈值", configExportDTO.getUpperThreshold()); + put("下发状态", configExportDTO.getStatusName()); + put("创建时间", configExportDTO.getWritetime()); } }); } @@ -341,7 +344,7 @@ }); //输出模板 //TODO 导出类设置 - exportService.exportExcel(response, BusConfigDTO.class, busConfigDTOList, "导出文件"); + exportService.exportExcel(response, KadConfigExportDTO.class, configExportDTOList, "导出文件"); } catch (Exception e) { e.printStackTrace(); } finally { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 3713c00..2987fda 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Methane.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -223,7 +223,7 @@ }else { if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不能小于5"); return stringMap; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 046bf4e..8fc6a2d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getCollectTime() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); // Device device = iDeviceService.selectById(busConfigDTO.getDeviceId()); // if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java index 13eb940..9a635f4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java @@ -153,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.PRESS.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 994e825..d28a498 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getCollectInterval() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getCollectTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集间隔、重传次数、采集次数、采集开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.TempHumi.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 77f78cb..575e393 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Tube.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index f626ab7..97a8131 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -151,7 +151,7 @@ + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getThreshold() + "," + busConfigDTO.getSleepStartTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数、阈值、睡眠开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 9e6929e..2f8dc74 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 860a67b..52ff667 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -136,7 +136,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java index 1a9bb6e..4aa661a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.system.dao.BusConfigMapper; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.dto.ExcelModel.KadConfigExportDTO; import com.casic.missiles.modular.system.model.BusConfig; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.redis.RedisPublisherUtil; @@ -152,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.KAD.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -305,6 +306,8 @@ @Override public void exp(List busConfigDTOList, HttpServletResponse response) { + List configExportDTOList = new ArrayList<>(); + FileInputStream fis = null; try { response.setContentType("application/octet-stream"); @@ -318,22 +321,22 @@ var.put("list", new ArrayList() { { for (int i = 0; i < busConfigDTOList.size(); i++) { - BusConfigDTO busConfigDTO = busConfigDTOList.get(i); + KadConfigExportDTO configExportDTO = new KadConfigExportDTO(busConfigDTOList.get(i)); + configExportDTOList.add(configExportDTO); add(new HashMap() { { - put("设备编号", busConfigDTO.getDevcode()); - put("重传次数", busConfigDTO.getRetryTimes()); - put("采集间隔", busConfigDTO.getCollectInterval()); - put("上传周期", busConfigDTO.getUploadPeriod()); - put("IP地址", busConfigDTO.getIp()); - put("端口", busConfigDTO.getPort()); - put("最大尝试次数", busConfigDTO.getAttemptsMax()); - put("已尝试次数", busConfigDTO.getAttemptsCurrent()); - put("端口号", "port"); - put("低报报警阈值", busConfigDTO.getLowerThreshold()); - put("高报报警阈值", busConfigDTO.getUpperThreshold()); - put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发"); - put("创建时间", busConfigDTO.getWritetime()); + put("设备编号", configExportDTO.getDevcode()); + put("重传次数", configExportDTO.getRetryTimes()); + put("采集间隔", configExportDTO.getCollectInterval()); + put("上传周期", configExportDTO.getUploadPeriod()); + put("IP地址", configExportDTO.getIp()); + put("端口", configExportDTO.getPort()); + put("最大尝试次数", configExportDTO.getAttemptsMax()); + put("已尝试次数", configExportDTO.getAttemptsCurrent()); + put("低报报警阈值", configExportDTO.getLowerThreshold()); + put("高报报警阈值", configExportDTO.getUpperThreshold()); + put("下发状态", configExportDTO.getStatusName()); + put("创建时间", configExportDTO.getWritetime()); } }); } @@ -341,7 +344,7 @@ }); //输出模板 //TODO 导出类设置 - exportService.exportExcel(response, BusConfigDTO.class, busConfigDTOList, "导出文件"); + exportService.exportExcel(response, KadConfigExportDTO.class, configExportDTOList, "导出文件"); } catch (Exception e) { e.printStackTrace(); } finally { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 3713c00..2987fda 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Methane.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -223,7 +223,7 @@ }else { if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不能小于5"); return stringMap; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 046bf4e..8fc6a2d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getCollectTime() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); // Device device = iDeviceService.selectById(busConfigDTO.getDeviceId()); // if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java index 13eb940..9a635f4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java @@ -153,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.PRESS.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 994e825..d28a498 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getCollectInterval() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getCollectTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集间隔、重传次数、采集次数、采集开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.TempHumi.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 77f78cb..575e393 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Tube.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java index 3475266..bd6640d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Well.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index f626ab7..97a8131 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -151,7 +151,7 @@ + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getThreshold() + "," + busConfigDTO.getSleepStartTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数、阈值、睡眠开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 9e6929e..2f8dc74 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 860a67b..52ff667 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -136,7 +136,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java index 1a9bb6e..4aa661a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.system.dao.BusConfigMapper; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.dto.ExcelModel.KadConfigExportDTO; import com.casic.missiles.modular.system.model.BusConfig; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.redis.RedisPublisherUtil; @@ -152,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.KAD.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -305,6 +306,8 @@ @Override public void exp(List busConfigDTOList, HttpServletResponse response) { + List configExportDTOList = new ArrayList<>(); + FileInputStream fis = null; try { response.setContentType("application/octet-stream"); @@ -318,22 +321,22 @@ var.put("list", new ArrayList() { { for (int i = 0; i < busConfigDTOList.size(); i++) { - BusConfigDTO busConfigDTO = busConfigDTOList.get(i); + KadConfigExportDTO configExportDTO = new KadConfigExportDTO(busConfigDTOList.get(i)); + configExportDTOList.add(configExportDTO); add(new HashMap() { { - put("设备编号", busConfigDTO.getDevcode()); - put("重传次数", busConfigDTO.getRetryTimes()); - put("采集间隔", busConfigDTO.getCollectInterval()); - put("上传周期", busConfigDTO.getUploadPeriod()); - put("IP地址", busConfigDTO.getIp()); - put("端口", busConfigDTO.getPort()); - put("最大尝试次数", busConfigDTO.getAttemptsMax()); - put("已尝试次数", busConfigDTO.getAttemptsCurrent()); - put("端口号", "port"); - put("低报报警阈值", busConfigDTO.getLowerThreshold()); - put("高报报警阈值", busConfigDTO.getUpperThreshold()); - put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发"); - put("创建时间", busConfigDTO.getWritetime()); + put("设备编号", configExportDTO.getDevcode()); + put("重传次数", configExportDTO.getRetryTimes()); + put("采集间隔", configExportDTO.getCollectInterval()); + put("上传周期", configExportDTO.getUploadPeriod()); + put("IP地址", configExportDTO.getIp()); + put("端口", configExportDTO.getPort()); + put("最大尝试次数", configExportDTO.getAttemptsMax()); + put("已尝试次数", configExportDTO.getAttemptsCurrent()); + put("低报报警阈值", configExportDTO.getLowerThreshold()); + put("高报报警阈值", configExportDTO.getUpperThreshold()); + put("下发状态", configExportDTO.getStatusName()); + put("创建时间", configExportDTO.getWritetime()); } }); } @@ -341,7 +344,7 @@ }); //输出模板 //TODO 导出类设置 - exportService.exportExcel(response, BusConfigDTO.class, busConfigDTOList, "导出文件"); + exportService.exportExcel(response, KadConfigExportDTO.class, configExportDTOList, "导出文件"); } catch (Exception e) { e.printStackTrace(); } finally { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 3713c00..2987fda 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Methane.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -223,7 +223,7 @@ }else { if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不能小于5"); return stringMap; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 046bf4e..8fc6a2d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getCollectTime() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); // Device device = iDeviceService.selectById(busConfigDTO.getDeviceId()); // if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java index 13eb940..9a635f4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java @@ -153,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.PRESS.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 994e825..d28a498 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getCollectInterval() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getCollectTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集间隔、重传次数、采集次数、采集开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.TempHumi.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 77f78cb..575e393 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Tube.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java index 3475266..bd6640d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Well.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java index 28fcf31..a537435 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index f626ab7..97a8131 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -151,7 +151,7 @@ + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getThreshold() + "," + busConfigDTO.getSleepStartTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数、阈值、睡眠开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 9e6929e..2f8dc74 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 860a67b..52ff667 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -136,7 +136,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java index 1a9bb6e..4aa661a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.system.dao.BusConfigMapper; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.dto.ExcelModel.KadConfigExportDTO; import com.casic.missiles.modular.system.model.BusConfig; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.redis.RedisPublisherUtil; @@ -152,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.KAD.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -305,6 +306,8 @@ @Override public void exp(List busConfigDTOList, HttpServletResponse response) { + List configExportDTOList = new ArrayList<>(); + FileInputStream fis = null; try { response.setContentType("application/octet-stream"); @@ -318,22 +321,22 @@ var.put("list", new ArrayList() { { for (int i = 0; i < busConfigDTOList.size(); i++) { - BusConfigDTO busConfigDTO = busConfigDTOList.get(i); + KadConfigExportDTO configExportDTO = new KadConfigExportDTO(busConfigDTOList.get(i)); + configExportDTOList.add(configExportDTO); add(new HashMap() { { - put("设备编号", busConfigDTO.getDevcode()); - put("重传次数", busConfigDTO.getRetryTimes()); - put("采集间隔", busConfigDTO.getCollectInterval()); - put("上传周期", busConfigDTO.getUploadPeriod()); - put("IP地址", busConfigDTO.getIp()); - put("端口", busConfigDTO.getPort()); - put("最大尝试次数", busConfigDTO.getAttemptsMax()); - put("已尝试次数", busConfigDTO.getAttemptsCurrent()); - put("端口号", "port"); - put("低报报警阈值", busConfigDTO.getLowerThreshold()); - put("高报报警阈值", busConfigDTO.getUpperThreshold()); - put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发"); - put("创建时间", busConfigDTO.getWritetime()); + put("设备编号", configExportDTO.getDevcode()); + put("重传次数", configExportDTO.getRetryTimes()); + put("采集间隔", configExportDTO.getCollectInterval()); + put("上传周期", configExportDTO.getUploadPeriod()); + put("IP地址", configExportDTO.getIp()); + put("端口", configExportDTO.getPort()); + put("最大尝试次数", configExportDTO.getAttemptsMax()); + put("已尝试次数", configExportDTO.getAttemptsCurrent()); + put("低报报警阈值", configExportDTO.getLowerThreshold()); + put("高报报警阈值", configExportDTO.getUpperThreshold()); + put("下发状态", configExportDTO.getStatusName()); + put("创建时间", configExportDTO.getWritetime()); } }); } @@ -341,7 +344,7 @@ }); //输出模板 //TODO 导出类设置 - exportService.exportExcel(response, BusConfigDTO.class, busConfigDTOList, "导出文件"); + exportService.exportExcel(response, KadConfigExportDTO.class, configExportDTOList, "导出文件"); } catch (Exception e) { e.printStackTrace(); } finally { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 3713c00..2987fda 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Methane.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -223,7 +223,7 @@ }else { if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不能小于5"); return stringMap; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 046bf4e..8fc6a2d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getCollectTime() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); // Device device = iDeviceService.selectById(busConfigDTO.getDeviceId()); // if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java index 13eb940..9a635f4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java @@ -153,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.PRESS.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 994e825..d28a498 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getCollectInterval() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getCollectTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集间隔、重传次数、采集次数、采集开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.TempHumi.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 77f78cb..575e393 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Tube.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java index 3475266..bd6640d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Well.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java index 28fcf31..a537435 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java index cbe9526..fa30b49 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java @@ -27,6 +27,7 @@ @Resource private AbstractPermissionContext service; + @Transactional @Override public DeptPermission selectDeptPermission(Long deptId) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index f626ab7..97a8131 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -151,7 +151,7 @@ + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getThreshold() + "," + busConfigDTO.getSleepStartTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数、阈值、睡眠开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 9e6929e..2f8dc74 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 860a67b..52ff667 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -136,7 +136,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java index 1a9bb6e..4aa661a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.system.dao.BusConfigMapper; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.dto.ExcelModel.KadConfigExportDTO; import com.casic.missiles.modular.system.model.BusConfig; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.redis.RedisPublisherUtil; @@ -152,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.KAD.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -305,6 +306,8 @@ @Override public void exp(List busConfigDTOList, HttpServletResponse response) { + List configExportDTOList = new ArrayList<>(); + FileInputStream fis = null; try { response.setContentType("application/octet-stream"); @@ -318,22 +321,22 @@ var.put("list", new ArrayList() { { for (int i = 0; i < busConfigDTOList.size(); i++) { - BusConfigDTO busConfigDTO = busConfigDTOList.get(i); + KadConfigExportDTO configExportDTO = new KadConfigExportDTO(busConfigDTOList.get(i)); + configExportDTOList.add(configExportDTO); add(new HashMap() { { - put("设备编号", busConfigDTO.getDevcode()); - put("重传次数", busConfigDTO.getRetryTimes()); - put("采集间隔", busConfigDTO.getCollectInterval()); - put("上传周期", busConfigDTO.getUploadPeriod()); - put("IP地址", busConfigDTO.getIp()); - put("端口", busConfigDTO.getPort()); - put("最大尝试次数", busConfigDTO.getAttemptsMax()); - put("已尝试次数", busConfigDTO.getAttemptsCurrent()); - put("端口号", "port"); - put("低报报警阈值", busConfigDTO.getLowerThreshold()); - put("高报报警阈值", busConfigDTO.getUpperThreshold()); - put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发"); - put("创建时间", busConfigDTO.getWritetime()); + put("设备编号", configExportDTO.getDevcode()); + put("重传次数", configExportDTO.getRetryTimes()); + put("采集间隔", configExportDTO.getCollectInterval()); + put("上传周期", configExportDTO.getUploadPeriod()); + put("IP地址", configExportDTO.getIp()); + put("端口", configExportDTO.getPort()); + put("最大尝试次数", configExportDTO.getAttemptsMax()); + put("已尝试次数", configExportDTO.getAttemptsCurrent()); + put("低报报警阈值", configExportDTO.getLowerThreshold()); + put("高报报警阈值", configExportDTO.getUpperThreshold()); + put("下发状态", configExportDTO.getStatusName()); + put("创建时间", configExportDTO.getWritetime()); } }); } @@ -341,7 +344,7 @@ }); //输出模板 //TODO 导出类设置 - exportService.exportExcel(response, BusConfigDTO.class, busConfigDTOList, "导出文件"); + exportService.exportExcel(response, KadConfigExportDTO.class, configExportDTOList, "导出文件"); } catch (Exception e) { e.printStackTrace(); } finally { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 3713c00..2987fda 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Methane.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -223,7 +223,7 @@ }else { if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不能小于5"); return stringMap; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 046bf4e..8fc6a2d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getCollectTime() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); // Device device = iDeviceService.selectById(busConfigDTO.getDeviceId()); // if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java index 13eb940..9a635f4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java @@ -153,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.PRESS.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 994e825..d28a498 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getCollectInterval() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getCollectTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集间隔、重传次数、采集次数、采集开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.TempHumi.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 77f78cb..575e393 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Tube.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java index 3475266..bd6640d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Well.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java index 28fcf31..a537435 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java index cbe9526..fa30b49 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java @@ -27,6 +27,7 @@ @Resource private AbstractPermissionContext service; + @Transactional @Override public DeptPermission selectDeptPermission(Long deptId) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index 0695eee..d73efb6 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -66,7 +66,7 @@ @ExcelProperty("报警阈值") private float threshold; /** - * 井深百分比 + * 报警阈值（%） */ @ExcelProperty("报警阈值（%）") private float percent; @@ -136,16 +136,16 @@ * sensorId */ private String sensorId; -// /** -// * 低报报警阈值 -// */ -// @ExcelProperty("低报报警阈值") -// private String lowerThreshold; -// /** -// * 高报报警阈值 -// */ -// @ExcelProperty("高报报警阈值") -// private String upperThreshold; + /** + * 低报报警阈值 + */ + @ExcelProperty("低报报警阈值") + private String lowerThreshold; + /** + * 高报报警阈值 + */ + @ExcelProperty("高报报警阈值") + private String upperThreshold; /** * 创建时间 diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index f626ab7..97a8131 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -151,7 +151,7 @@ + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getThreshold() + "," + busConfigDTO.getSleepStartTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数、阈值、睡眠开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 9e6929e..2f8dc74 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 860a67b..52ff667 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -136,7 +136,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java index 1a9bb6e..4aa661a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.system.dao.BusConfigMapper; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.dto.ExcelModel.KadConfigExportDTO; import com.casic.missiles.modular.system.model.BusConfig; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.redis.RedisPublisherUtil; @@ -152,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.KAD.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -305,6 +306,8 @@ @Override public void exp(List busConfigDTOList, HttpServletResponse response) { + List configExportDTOList = new ArrayList<>(); + FileInputStream fis = null; try { response.setContentType("application/octet-stream"); @@ -318,22 +321,22 @@ var.put("list", new ArrayList() { { for (int i = 0; i < busConfigDTOList.size(); i++) { - BusConfigDTO busConfigDTO = busConfigDTOList.get(i); + KadConfigExportDTO configExportDTO = new KadConfigExportDTO(busConfigDTOList.get(i)); + configExportDTOList.add(configExportDTO); add(new HashMap() { { - put("设备编号", busConfigDTO.getDevcode()); - put("重传次数", busConfigDTO.getRetryTimes()); - put("采集间隔", busConfigDTO.getCollectInterval()); - put("上传周期", busConfigDTO.getUploadPeriod()); - put("IP地址", busConfigDTO.getIp()); - put("端口", busConfigDTO.getPort()); - put("最大尝试次数", busConfigDTO.getAttemptsMax()); - put("已尝试次数", busConfigDTO.getAttemptsCurrent()); - put("端口号", "port"); - put("低报报警阈值", busConfigDTO.getLowerThreshold()); - put("高报报警阈值", busConfigDTO.getUpperThreshold()); - put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发"); - put("创建时间", busConfigDTO.getWritetime()); + put("设备编号", configExportDTO.getDevcode()); + put("重传次数", configExportDTO.getRetryTimes()); + put("采集间隔", configExportDTO.getCollectInterval()); + put("上传周期", configExportDTO.getUploadPeriod()); + put("IP地址", configExportDTO.getIp()); + put("端口", configExportDTO.getPort()); + put("最大尝试次数", configExportDTO.getAttemptsMax()); + put("已尝试次数", configExportDTO.getAttemptsCurrent()); + put("低报报警阈值", configExportDTO.getLowerThreshold()); + put("高报报警阈值", configExportDTO.getUpperThreshold()); + put("下发状态", configExportDTO.getStatusName()); + put("创建时间", configExportDTO.getWritetime()); } }); } @@ -341,7 +344,7 @@ }); //输出模板 //TODO 导出类设置 - exportService.exportExcel(response, BusConfigDTO.class, busConfigDTOList, "导出文件"); + exportService.exportExcel(response, KadConfigExportDTO.class, configExportDTOList, "导出文件"); } catch (Exception e) { e.printStackTrace(); } finally { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 3713c00..2987fda 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Methane.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -223,7 +223,7 @@ }else { if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不能小于5"); return stringMap; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 046bf4e..8fc6a2d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getCollectTime() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); // Device device = iDeviceService.selectById(busConfigDTO.getDeviceId()); // if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java index 13eb940..9a635f4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java @@ -153,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.PRESS.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 994e825..d28a498 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getCollectInterval() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getCollectTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集间隔、重传次数、采集次数、采集开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.TempHumi.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 77f78cb..575e393 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Tube.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java index 3475266..bd6640d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Well.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java index 28fcf31..a537435 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java index cbe9526..fa30b49 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java @@ -27,6 +27,7 @@ @Resource private AbstractPermissionContext service; + @Transactional @Override public DeptPermission selectDeptPermission(Long deptId) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index 0695eee..d73efb6 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -66,7 +66,7 @@ @ExcelProperty("报警阈值") private float threshold; /** - * 井深百分比 + * 报警阈值（%） */ @ExcelProperty("报警阈值（%）") private float percent; @@ -136,16 +136,16 @@ * sensorId */ private String sensorId; -// /** -// * 低报报警阈值 -// */ -// @ExcelProperty("低报报警阈值") -// private String lowerThreshold; -// /** -// * 高报报警阈值 -// */ -// @ExcelProperty("高报报警阈值") -// private String upperThreshold; + /** + * 低报报警阈值 + */ + @ExcelProperty("低报报警阈值") + private String lowerThreshold; + /** + * 高报报警阈值 + */ + @ExcelProperty("高报报警阈值") + private String upperThreshold; /** * 创建时间 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java index 72ca1de..4162af9 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.casic.missiles.modular.system.dto.BusConfigDTO; import lombok.Data; import org.springframework.stereotype.Component; @@ -29,16 +30,41 @@ private String ip; @ExcelProperty("端口号") private String port; - @ExcelProperty("最大尝试次数") - private String attemptsMax; @ExcelProperty("采集间隔（分）") private String collectInterval; @ExcelProperty("上传周期（分）") private String uploadPeriod; - + @ExcelProperty("重传次数") + private String retryTimes; @ExcelProperty("低报报警阈值") private String lowerThreshold; @ExcelProperty("高报报警阈值") private String upperThreshold; + @ExcelProperty("已尝试次数") + private String attemptsCurrent; + @ExcelProperty("最大尝试次数") + private String attemptsMax; + @ExcelProperty("下发状态") + private String statusName; + private String writetime; + public KadConfigExportDTO() { + } + + public KadConfigExportDTO(BusConfigDTO busConfigDTO) { + + this.devcode = busConfigDTO.getDevcode(); + this.retryTimes = busConfigDTO.getRetryTimes(); + this.collectInterval = busConfigDTO.getCollectInterval(); + this.uploadPeriod = busConfigDTO.getUploadPeriod(); + this.ip = busConfigDTO.getIp(); + this.port =busConfigDTO.getPort(); + this.attemptsCurrent=busConfigDTO.getAttemptsCurrent(); + this.attemptsMax=busConfigDTO.getAttemptsMax(); + this.lowerThreshold=busConfigDTO.getLowerThreshold(); + this.upperThreshold=busConfigDTO.getUpperThreshold(); + this.writetime=busConfigDTO.getWritetime(); + this.statusName="1".equals(busConfigDTO.getStatus())?"已下发":"未下发"; + + } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index f626ab7..97a8131 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -151,7 +151,7 @@ + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getThreshold() + "," + busConfigDTO.getSleepStartTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数、阈值、睡眠开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 9e6929e..2f8dc74 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 860a67b..52ff667 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -136,7 +136,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java index 1a9bb6e..4aa661a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.system.dao.BusConfigMapper; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.dto.ExcelModel.KadConfigExportDTO; import com.casic.missiles.modular.system.model.BusConfig; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.redis.RedisPublisherUtil; @@ -152,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.KAD.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -305,6 +306,8 @@ @Override public void exp(List busConfigDTOList, HttpServletResponse response) { + List configExportDTOList = new ArrayList<>(); + FileInputStream fis = null; try { response.setContentType("application/octet-stream"); @@ -318,22 +321,22 @@ var.put("list", new ArrayList() { { for (int i = 0; i < busConfigDTOList.size(); i++) { - BusConfigDTO busConfigDTO = busConfigDTOList.get(i); + KadConfigExportDTO configExportDTO = new KadConfigExportDTO(busConfigDTOList.get(i)); + configExportDTOList.add(configExportDTO); add(new HashMap() { { - put("设备编号", busConfigDTO.getDevcode()); - put("重传次数", busConfigDTO.getRetryTimes()); - put("采集间隔", busConfigDTO.getCollectInterval()); - put("上传周期", busConfigDTO.getUploadPeriod()); - put("IP地址", busConfigDTO.getIp()); - put("端口", busConfigDTO.getPort()); - put("最大尝试次数", busConfigDTO.getAttemptsMax()); - put("已尝试次数", busConfigDTO.getAttemptsCurrent()); - put("端口号", "port"); - put("低报报警阈值", busConfigDTO.getLowerThreshold()); - put("高报报警阈值", busConfigDTO.getUpperThreshold()); - put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发"); - put("创建时间", busConfigDTO.getWritetime()); + put("设备编号", configExportDTO.getDevcode()); + put("重传次数", configExportDTO.getRetryTimes()); + put("采集间隔", configExportDTO.getCollectInterval()); + put("上传周期", configExportDTO.getUploadPeriod()); + put("IP地址", configExportDTO.getIp()); + put("端口", configExportDTO.getPort()); + put("最大尝试次数", configExportDTO.getAttemptsMax()); + put("已尝试次数", configExportDTO.getAttemptsCurrent()); + put("低报报警阈值", configExportDTO.getLowerThreshold()); + put("高报报警阈值", configExportDTO.getUpperThreshold()); + put("下发状态", configExportDTO.getStatusName()); + put("创建时间", configExportDTO.getWritetime()); } }); } @@ -341,7 +344,7 @@ }); //输出模板 //TODO 导出类设置 - exportService.exportExcel(response, BusConfigDTO.class, busConfigDTOList, "导出文件"); + exportService.exportExcel(response, KadConfigExportDTO.class, configExportDTOList, "导出文件"); } catch (Exception e) { e.printStackTrace(); } finally { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 3713c00..2987fda 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Methane.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -223,7 +223,7 @@ }else { if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不能小于5"); return stringMap; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 046bf4e..8fc6a2d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getCollectTime() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); // Device device = iDeviceService.selectById(busConfigDTO.getDeviceId()); // if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java index 13eb940..9a635f4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java @@ -153,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.PRESS.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 994e825..d28a498 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getCollectInterval() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getCollectTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集间隔、重传次数、采集次数、采集开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.TempHumi.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 77f78cb..575e393 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Tube.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java index 3475266..bd6640d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Well.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java index 28fcf31..a537435 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java index cbe9526..fa30b49 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java @@ -27,6 +27,7 @@ @Resource private AbstractPermissionContext service; + @Transactional @Override public DeptPermission selectDeptPermission(Long deptId) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index 0695eee..d73efb6 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -66,7 +66,7 @@ @ExcelProperty("报警阈值") private float threshold; /** - * 井深百分比 + * 报警阈值（%） */ @ExcelProperty("报警阈值（%）") private float percent; @@ -136,16 +136,16 @@ * sensorId */ private String sensorId; -// /** -// * 低报报警阈值 -// */ -// @ExcelProperty("低报报警阈值") -// private String lowerThreshold; -// /** -// * 高报报警阈值 -// */ -// @ExcelProperty("高报报警阈值") -// private String upperThreshold; + /** + * 低报报警阈值 + */ + @ExcelProperty("低报报警阈值") + private String lowerThreshold; + /** + * 高报报警阈值 + */ + @ExcelProperty("高报报警阈值") + private String upperThreshold; /** * 创建时间 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java index 72ca1de..4162af9 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.casic.missiles.modular.system.dto.BusConfigDTO; import lombok.Data; import org.springframework.stereotype.Component; @@ -29,16 +30,41 @@ private String ip; @ExcelProperty("端口号") private String port; - @ExcelProperty("最大尝试次数") - private String attemptsMax; @ExcelProperty("采集间隔（分）") private String collectInterval; @ExcelProperty("上传周期（分）") private String uploadPeriod; - + @ExcelProperty("重传次数") + private String retryTimes; @ExcelProperty("低报报警阈值") private String lowerThreshold; @ExcelProperty("高报报警阈值") private String upperThreshold; + @ExcelProperty("已尝试次数") + private String attemptsCurrent; + @ExcelProperty("最大尝试次数") + private String attemptsMax; + @ExcelProperty("下发状态") + private String statusName; + private String writetime; + public KadConfigExportDTO() { + } + + public KadConfigExportDTO(BusConfigDTO busConfigDTO) { + + this.devcode = busConfigDTO.getDevcode(); + this.retryTimes = busConfigDTO.getRetryTimes(); + this.collectInterval = busConfigDTO.getCollectInterval(); + this.uploadPeriod = busConfigDTO.getUploadPeriod(); + this.ip = busConfigDTO.getIp(); + this.port =busConfigDTO.getPort(); + this.attemptsCurrent=busConfigDTO.getAttemptsCurrent(); + this.attemptsMax=busConfigDTO.getAttemptsMax(); + this.lowerThreshold=busConfigDTO.getLowerThreshold(); + this.upperThreshold=busConfigDTO.getUpperThreshold(); + this.writetime=busConfigDTO.getWritetime(); + this.statusName="1".equals(busConfigDTO.getStatus())?"已下发":"未下发"; + + } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index e68c8ab..5a8bc03 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -76,6 +76,9 @@ @TableField("AREA") private String area; + @TableField(exist = false) + private String areaName; + /** * 区域 */ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index f626ab7..97a8131 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -151,7 +151,7 @@ + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getThreshold() + "," + busConfigDTO.getSleepStartTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数、阈值、睡眠开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 9e6929e..2f8dc74 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 860a67b..52ff667 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -136,7 +136,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java index 1a9bb6e..4aa661a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.system.dao.BusConfigMapper; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.dto.ExcelModel.KadConfigExportDTO; import com.casic.missiles.modular.system.model.BusConfig; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.redis.RedisPublisherUtil; @@ -152,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.KAD.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -305,6 +306,8 @@ @Override public void exp(List busConfigDTOList, HttpServletResponse response) { + List configExportDTOList = new ArrayList<>(); + FileInputStream fis = null; try { response.setContentType("application/octet-stream"); @@ -318,22 +321,22 @@ var.put("list", new ArrayList() { { for (int i = 0; i < busConfigDTOList.size(); i++) { - BusConfigDTO busConfigDTO = busConfigDTOList.get(i); + KadConfigExportDTO configExportDTO = new KadConfigExportDTO(busConfigDTOList.get(i)); + configExportDTOList.add(configExportDTO); add(new HashMap() { { - put("设备编号", busConfigDTO.getDevcode()); - put("重传次数", busConfigDTO.getRetryTimes()); - put("采集间隔", busConfigDTO.getCollectInterval()); - put("上传周期", busConfigDTO.getUploadPeriod()); - put("IP地址", busConfigDTO.getIp()); - put("端口", busConfigDTO.getPort()); - put("最大尝试次数", busConfigDTO.getAttemptsMax()); - put("已尝试次数", busConfigDTO.getAttemptsCurrent()); - put("端口号", "port"); - put("低报报警阈值", busConfigDTO.getLowerThreshold()); - put("高报报警阈值", busConfigDTO.getUpperThreshold()); - put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发"); - put("创建时间", busConfigDTO.getWritetime()); + put("设备编号", configExportDTO.getDevcode()); + put("重传次数", configExportDTO.getRetryTimes()); + put("采集间隔", configExportDTO.getCollectInterval()); + put("上传周期", configExportDTO.getUploadPeriod()); + put("IP地址", configExportDTO.getIp()); + put("端口", configExportDTO.getPort()); + put("最大尝试次数", configExportDTO.getAttemptsMax()); + put("已尝试次数", configExportDTO.getAttemptsCurrent()); + put("低报报警阈值", configExportDTO.getLowerThreshold()); + put("高报报警阈值", configExportDTO.getUpperThreshold()); + put("下发状态", configExportDTO.getStatusName()); + put("创建时间", configExportDTO.getWritetime()); } }); } @@ -341,7 +344,7 @@ }); //输出模板 //TODO 导出类设置 - exportService.exportExcel(response, BusConfigDTO.class, busConfigDTOList, "导出文件"); + exportService.exportExcel(response, KadConfigExportDTO.class, configExportDTOList, "导出文件"); } catch (Exception e) { e.printStackTrace(); } finally { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 3713c00..2987fda 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Methane.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -223,7 +223,7 @@ }else { if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不能小于5"); return stringMap; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 046bf4e..8fc6a2d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getCollectTime() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); // Device device = iDeviceService.selectById(busConfigDTO.getDeviceId()); // if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java index 13eb940..9a635f4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java @@ -153,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.PRESS.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 994e825..d28a498 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getCollectInterval() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getCollectTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集间隔、重传次数、采集次数、采集开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.TempHumi.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 77f78cb..575e393 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Tube.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java index 3475266..bd6640d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Well.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java index 28fcf31..a537435 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java index cbe9526..fa30b49 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java @@ -27,6 +27,7 @@ @Resource private AbstractPermissionContext service; + @Transactional @Override public DeptPermission selectDeptPermission(Long deptId) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index 0695eee..d73efb6 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -66,7 +66,7 @@ @ExcelProperty("报警阈值") private float threshold; /** - * 井深百分比 + * 报警阈值（%） */ @ExcelProperty("报警阈值（%）") private float percent; @@ -136,16 +136,16 @@ * sensorId */ private String sensorId; -// /** -// * 低报报警阈值 -// */ -// @ExcelProperty("低报报警阈值") -// private String lowerThreshold; -// /** -// * 高报报警阈值 -// */ -// @ExcelProperty("高报报警阈值") -// private String upperThreshold; + /** + * 低报报警阈值 + */ + @ExcelProperty("低报报警阈值") + private String lowerThreshold; + /** + * 高报报警阈值 + */ + @ExcelProperty("高报报警阈值") + private String upperThreshold; /** * 创建时间 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java index 72ca1de..4162af9 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.casic.missiles.modular.system.dto.BusConfigDTO; import lombok.Data; import org.springframework.stereotype.Component; @@ -29,16 +30,41 @@ private String ip; @ExcelProperty("端口号") private String port; - @ExcelProperty("最大尝试次数") - private String attemptsMax; @ExcelProperty("采集间隔（分）") private String collectInterval; @ExcelProperty("上传周期（分）") private String uploadPeriod; - + @ExcelProperty("重传次数") + private String retryTimes; @ExcelProperty("低报报警阈值") private String lowerThreshold; @ExcelProperty("高报报警阈值") private String upperThreshold; + @ExcelProperty("已尝试次数") + private String attemptsCurrent; + @ExcelProperty("最大尝试次数") + private String attemptsMax; + @ExcelProperty("下发状态") + private String statusName; + private String writetime; + public KadConfigExportDTO() { + } + + public KadConfigExportDTO(BusConfigDTO busConfigDTO) { + + this.devcode = busConfigDTO.getDevcode(); + this.retryTimes = busConfigDTO.getRetryTimes(); + this.collectInterval = busConfigDTO.getCollectInterval(); + this.uploadPeriod = busConfigDTO.getUploadPeriod(); + this.ip = busConfigDTO.getIp(); + this.port =busConfigDTO.getPort(); + this.attemptsCurrent=busConfigDTO.getAttemptsCurrent(); + this.attemptsMax=busConfigDTO.getAttemptsMax(); + this.lowerThreshold=busConfigDTO.getLowerThreshold(); + this.upperThreshold=busConfigDTO.getUpperThreshold(); + this.writetime=busConfigDTO.getWritetime(); + this.statusName="1".equals(busConfigDTO.getStatus())?"已下发":"未下发"; + + } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index e68c8ab..5a8bc03 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -76,6 +76,9 @@ @TableField("AREA") private String area; + @TableField(exist = false) + private String areaName; + /** * 区域 */ diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java index a8cd989..3211431 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java @@ -58,6 +58,8 @@ * 默认城市区划 */ private String area; + @TableField(exist = false) + private String areaName; /** * 使用地图（0百度，1高德，2arcgis） */ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index f626ab7..97a8131 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -151,7 +151,7 @@ + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getThreshold() + "," + busConfigDTO.getSleepStartTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数、阈值、睡眠开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 9e6929e..2f8dc74 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 860a67b..52ff667 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -136,7 +136,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java index 1a9bb6e..4aa661a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.system.dao.BusConfigMapper; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.dto.ExcelModel.KadConfigExportDTO; import com.casic.missiles.modular.system.model.BusConfig; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.redis.RedisPublisherUtil; @@ -152,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.KAD.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -305,6 +306,8 @@ @Override public void exp(List busConfigDTOList, HttpServletResponse response) { + List configExportDTOList = new ArrayList<>(); + FileInputStream fis = null; try { response.setContentType("application/octet-stream"); @@ -318,22 +321,22 @@ var.put("list", new ArrayList() { { for (int i = 0; i < busConfigDTOList.size(); i++) { - BusConfigDTO busConfigDTO = busConfigDTOList.get(i); + KadConfigExportDTO configExportDTO = new KadConfigExportDTO(busConfigDTOList.get(i)); + configExportDTOList.add(configExportDTO); add(new HashMap() { { - put("设备编号", busConfigDTO.getDevcode()); - put("重传次数", busConfigDTO.getRetryTimes()); - put("采集间隔", busConfigDTO.getCollectInterval()); - put("上传周期", busConfigDTO.getUploadPeriod()); - put("IP地址", busConfigDTO.getIp()); - put("端口", busConfigDTO.getPort()); - put("最大尝试次数", busConfigDTO.getAttemptsMax()); - put("已尝试次数", busConfigDTO.getAttemptsCurrent()); - put("端口号", "port"); - put("低报报警阈值", busConfigDTO.getLowerThreshold()); - put("高报报警阈值", busConfigDTO.getUpperThreshold()); - put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发"); - put("创建时间", busConfigDTO.getWritetime()); + put("设备编号", configExportDTO.getDevcode()); + put("重传次数", configExportDTO.getRetryTimes()); + put("采集间隔", configExportDTO.getCollectInterval()); + put("上传周期", configExportDTO.getUploadPeriod()); + put("IP地址", configExportDTO.getIp()); + put("端口", configExportDTO.getPort()); + put("最大尝试次数", configExportDTO.getAttemptsMax()); + put("已尝试次数", configExportDTO.getAttemptsCurrent()); + put("低报报警阈值", configExportDTO.getLowerThreshold()); + put("高报报警阈值", configExportDTO.getUpperThreshold()); + put("下发状态", configExportDTO.getStatusName()); + put("创建时间", configExportDTO.getWritetime()); } }); } @@ -341,7 +344,7 @@ }); //输出模板 //TODO 导出类设置 - exportService.exportExcel(response, BusConfigDTO.class, busConfigDTOList, "导出文件"); + exportService.exportExcel(response, KadConfigExportDTO.class, configExportDTOList, "导出文件"); } catch (Exception e) { e.printStackTrace(); } finally { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 3713c00..2987fda 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Methane.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -223,7 +223,7 @@ }else { if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不能小于5"); return stringMap; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 046bf4e..8fc6a2d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getCollectTime() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); // Device device = iDeviceService.selectById(busConfigDTO.getDeviceId()); // if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java index 13eb940..9a635f4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java @@ -153,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.PRESS.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 994e825..d28a498 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getCollectInterval() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getCollectTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集间隔、重传次数、采集次数、采集开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.TempHumi.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 77f78cb..575e393 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Tube.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java index 3475266..bd6640d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Well.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java index 28fcf31..a537435 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java index cbe9526..fa30b49 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java @@ -27,6 +27,7 @@ @Resource private AbstractPermissionContext service; + @Transactional @Override public DeptPermission selectDeptPermission(Long deptId) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index 0695eee..d73efb6 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -66,7 +66,7 @@ @ExcelProperty("报警阈值") private float threshold; /** - * 井深百分比 + * 报警阈值（%） */ @ExcelProperty("报警阈值（%）") private float percent; @@ -136,16 +136,16 @@ * sensorId */ private String sensorId; -// /** -// * 低报报警阈值 -// */ -// @ExcelProperty("低报报警阈值") -// private String lowerThreshold; -// /** -// * 高报报警阈值 -// */ -// @ExcelProperty("高报报警阈值") -// private String upperThreshold; + /** + * 低报报警阈值 + */ + @ExcelProperty("低报报警阈值") + private String lowerThreshold; + /** + * 高报报警阈值 + */ + @ExcelProperty("高报报警阈值") + private String upperThreshold; /** * 创建时间 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java index 72ca1de..4162af9 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.casic.missiles.modular.system.dto.BusConfigDTO; import lombok.Data; import org.springframework.stereotype.Component; @@ -29,16 +30,41 @@ private String ip; @ExcelProperty("端口号") private String port; - @ExcelProperty("最大尝试次数") - private String attemptsMax; @ExcelProperty("采集间隔（分）") private String collectInterval; @ExcelProperty("上传周期（分）") private String uploadPeriod; - + @ExcelProperty("重传次数") + private String retryTimes; @ExcelProperty("低报报警阈值") private String lowerThreshold; @ExcelProperty("高报报警阈值") private String upperThreshold; + @ExcelProperty("已尝试次数") + private String attemptsCurrent; + @ExcelProperty("最大尝试次数") + private String attemptsMax; + @ExcelProperty("下发状态") + private String statusName; + private String writetime; + public KadConfigExportDTO() { + } + + public KadConfigExportDTO(BusConfigDTO busConfigDTO) { + + this.devcode = busConfigDTO.getDevcode(); + this.retryTimes = busConfigDTO.getRetryTimes(); + this.collectInterval = busConfigDTO.getCollectInterval(); + this.uploadPeriod = busConfigDTO.getUploadPeriod(); + this.ip = busConfigDTO.getIp(); + this.port =busConfigDTO.getPort(); + this.attemptsCurrent=busConfigDTO.getAttemptsCurrent(); + this.attemptsMax=busConfigDTO.getAttemptsMax(); + this.lowerThreshold=busConfigDTO.getLowerThreshold(); + this.upperThreshold=busConfigDTO.getUpperThreshold(); + this.writetime=busConfigDTO.getWritetime(); + this.statusName="1".equals(busConfigDTO.getStatus())?"已下发":"未下发"; + + } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index e68c8ab..5a8bc03 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -76,6 +76,9 @@ @TableField("AREA") private String area; + @TableField(exist = false) + private String areaName; + /** * 区域 */ diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java index a8cd989..3211431 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java @@ -58,6 +58,8 @@ * 默认城市区划 */ private String area; + @TableField(exist = false) + private String areaName; /** * 使用地图（0百度，1高德，2arcgis） */ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java index 6f76952..f5b87ed 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java @@ -41,6 +41,8 @@ String getAreaPId(@Param("id") Long id); + String getAreaName(@Param("id") Long id); + List getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid); void updateBatchBfcf(@Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("deptIds") List deptIds); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index f626ab7..97a8131 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -151,7 +151,7 @@ + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getThreshold() + "," + busConfigDTO.getSleepStartTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数、阈值、睡眠开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 9e6929e..2f8dc74 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 860a67b..52ff667 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -136,7 +136,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java index 1a9bb6e..4aa661a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.system.dao.BusConfigMapper; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.dto.ExcelModel.KadConfigExportDTO; import com.casic.missiles.modular.system.model.BusConfig; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.redis.RedisPublisherUtil; @@ -152,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.KAD.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -305,6 +306,8 @@ @Override public void exp(List busConfigDTOList, HttpServletResponse response) { + List configExportDTOList = new ArrayList<>(); + FileInputStream fis = null; try { response.setContentType("application/octet-stream"); @@ -318,22 +321,22 @@ var.put("list", new ArrayList() { { for (int i = 0; i < busConfigDTOList.size(); i++) { - BusConfigDTO busConfigDTO = busConfigDTOList.get(i); + KadConfigExportDTO configExportDTO = new KadConfigExportDTO(busConfigDTOList.get(i)); + configExportDTOList.add(configExportDTO); add(new HashMap() { { - put("设备编号", busConfigDTO.getDevcode()); - put("重传次数", busConfigDTO.getRetryTimes()); - put("采集间隔", busConfigDTO.getCollectInterval()); - put("上传周期", busConfigDTO.getUploadPeriod()); - put("IP地址", busConfigDTO.getIp()); - put("端口", busConfigDTO.getPort()); - put("最大尝试次数", busConfigDTO.getAttemptsMax()); - put("已尝试次数", busConfigDTO.getAttemptsCurrent()); - put("端口号", "port"); - put("低报报警阈值", busConfigDTO.getLowerThreshold()); - put("高报报警阈值", busConfigDTO.getUpperThreshold()); - put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发"); - put("创建时间", busConfigDTO.getWritetime()); + put("设备编号", configExportDTO.getDevcode()); + put("重传次数", configExportDTO.getRetryTimes()); + put("采集间隔", configExportDTO.getCollectInterval()); + put("上传周期", configExportDTO.getUploadPeriod()); + put("IP地址", configExportDTO.getIp()); + put("端口", configExportDTO.getPort()); + put("最大尝试次数", configExportDTO.getAttemptsMax()); + put("已尝试次数", configExportDTO.getAttemptsCurrent()); + put("低报报警阈值", configExportDTO.getLowerThreshold()); + put("高报报警阈值", configExportDTO.getUpperThreshold()); + put("下发状态", configExportDTO.getStatusName()); + put("创建时间", configExportDTO.getWritetime()); } }); } @@ -341,7 +344,7 @@ }); //输出模板 //TODO 导出类设置 - exportService.exportExcel(response, BusConfigDTO.class, busConfigDTOList, "导出文件"); + exportService.exportExcel(response, KadConfigExportDTO.class, configExportDTOList, "导出文件"); } catch (Exception e) { e.printStackTrace(); } finally { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 3713c00..2987fda 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Methane.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -223,7 +223,7 @@ }else { if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不能小于5"); return stringMap; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 046bf4e..8fc6a2d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getCollectTime() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); // Device device = iDeviceService.selectById(busConfigDTO.getDeviceId()); // if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java index 13eb940..9a635f4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java @@ -153,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.PRESS.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 994e825..d28a498 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getCollectInterval() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getCollectTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集间隔、重传次数、采集次数、采集开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.TempHumi.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 77f78cb..575e393 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Tube.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java index 3475266..bd6640d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Well.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java index 28fcf31..a537435 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java index cbe9526..fa30b49 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java @@ -27,6 +27,7 @@ @Resource private AbstractPermissionContext service; + @Transactional @Override public DeptPermission selectDeptPermission(Long deptId) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index 0695eee..d73efb6 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -66,7 +66,7 @@ @ExcelProperty("报警阈值") private float threshold; /** - * 井深百分比 + * 报警阈值（%） */ @ExcelProperty("报警阈值（%）") private float percent; @@ -136,16 +136,16 @@ * sensorId */ private String sensorId; -// /** -// * 低报报警阈值 -// */ -// @ExcelProperty("低报报警阈值") -// private String lowerThreshold; -// /** -// * 高报报警阈值 -// */ -// @ExcelProperty("高报报警阈值") -// private String upperThreshold; + /** + * 低报报警阈值 + */ + @ExcelProperty("低报报警阈值") + private String lowerThreshold; + /** + * 高报报警阈值 + */ + @ExcelProperty("高报报警阈值") + private String upperThreshold; /** * 创建时间 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java index 72ca1de..4162af9 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.casic.missiles.modular.system.dto.BusConfigDTO; import lombok.Data; import org.springframework.stereotype.Component; @@ -29,16 +30,41 @@ private String ip; @ExcelProperty("端口号") private String port; - @ExcelProperty("最大尝试次数") - private String attemptsMax; @ExcelProperty("采集间隔（分）") private String collectInterval; @ExcelProperty("上传周期（分）") private String uploadPeriod; - + @ExcelProperty("重传次数") + private String retryTimes; @ExcelProperty("低报报警阈值") private String lowerThreshold; @ExcelProperty("高报报警阈值") private String upperThreshold; + @ExcelProperty("已尝试次数") + private String attemptsCurrent; + @ExcelProperty("最大尝试次数") + private String attemptsMax; + @ExcelProperty("下发状态") + private String statusName; + private String writetime; + public KadConfigExportDTO() { + } + + public KadConfigExportDTO(BusConfigDTO busConfigDTO) { + + this.devcode = busConfigDTO.getDevcode(); + this.retryTimes = busConfigDTO.getRetryTimes(); + this.collectInterval = busConfigDTO.getCollectInterval(); + this.uploadPeriod = busConfigDTO.getUploadPeriod(); + this.ip = busConfigDTO.getIp(); + this.port =busConfigDTO.getPort(); + this.attemptsCurrent=busConfigDTO.getAttemptsCurrent(); + this.attemptsMax=busConfigDTO.getAttemptsMax(); + this.lowerThreshold=busConfigDTO.getLowerThreshold(); + this.upperThreshold=busConfigDTO.getUpperThreshold(); + this.writetime=busConfigDTO.getWritetime(); + this.statusName="1".equals(busConfigDTO.getStatus())?"已下发":"未下发"; + + } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index e68c8ab..5a8bc03 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -76,6 +76,9 @@ @TableField("AREA") private String area; + @TableField(exist = false) + private String areaName; + /** * 区域 */ diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java index a8cd989..3211431 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java @@ -58,6 +58,8 @@ * 默认城市区划 */ private String area; + @TableField(exist = false) + private String areaName; /** * 使用地图（0百度，1高德，2arcgis） */ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java index 6f76952..f5b87ed 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java @@ -41,6 +41,8 @@ String getAreaPId(@Param("id") Long id); + String getAreaName(@Param("id") Long id); + List getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid); void updateBatchBfcf(@Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("deptIds") List deptIds); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index a9a12cf..9238827 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -228,6 +228,12 @@ WHERE a.id = #{id} + + - UPDATE bus_well_info SET bfzt = #{bfzt} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index f626ab7..97a8131 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -151,7 +151,7 @@ + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getThreshold() + "," + busConfigDTO.getSleepStartTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数、阈值、睡眠开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 9e6929e..2f8dc74 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 860a67b..52ff667 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -136,7 +136,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java index 1a9bb6e..4aa661a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.system.dao.BusConfigMapper; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.dto.ExcelModel.KadConfigExportDTO; import com.casic.missiles.modular.system.model.BusConfig; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.redis.RedisPublisherUtil; @@ -152,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.KAD.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -305,6 +306,8 @@ @Override public void exp(List busConfigDTOList, HttpServletResponse response) { + List configExportDTOList = new ArrayList<>(); + FileInputStream fis = null; try { response.setContentType("application/octet-stream"); @@ -318,22 +321,22 @@ var.put("list", new ArrayList() { { for (int i = 0; i < busConfigDTOList.size(); i++) { - BusConfigDTO busConfigDTO = busConfigDTOList.get(i); + KadConfigExportDTO configExportDTO = new KadConfigExportDTO(busConfigDTOList.get(i)); + configExportDTOList.add(configExportDTO); add(new HashMap() { { - put("设备编号", busConfigDTO.getDevcode()); - put("重传次数", busConfigDTO.getRetryTimes()); - put("采集间隔", busConfigDTO.getCollectInterval()); - put("上传周期", busConfigDTO.getUploadPeriod()); - put("IP地址", busConfigDTO.getIp()); - put("端口", busConfigDTO.getPort()); - put("最大尝试次数", busConfigDTO.getAttemptsMax()); - put("已尝试次数", busConfigDTO.getAttemptsCurrent()); - put("端口号", "port"); - put("低报报警阈值", busConfigDTO.getLowerThreshold()); - put("高报报警阈值", busConfigDTO.getUpperThreshold()); - put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发"); - put("创建时间", busConfigDTO.getWritetime()); + put("设备编号", configExportDTO.getDevcode()); + put("重传次数", configExportDTO.getRetryTimes()); + put("采集间隔", configExportDTO.getCollectInterval()); + put("上传周期", configExportDTO.getUploadPeriod()); + put("IP地址", configExportDTO.getIp()); + put("端口", configExportDTO.getPort()); + put("最大尝试次数", configExportDTO.getAttemptsMax()); + put("已尝试次数", configExportDTO.getAttemptsCurrent()); + put("低报报警阈值", configExportDTO.getLowerThreshold()); + put("高报报警阈值", configExportDTO.getUpperThreshold()); + put("下发状态", configExportDTO.getStatusName()); + put("创建时间", configExportDTO.getWritetime()); } }); } @@ -341,7 +344,7 @@ }); //输出模板 //TODO 导出类设置 - exportService.exportExcel(response, BusConfigDTO.class, busConfigDTOList, "导出文件"); + exportService.exportExcel(response, KadConfigExportDTO.class, configExportDTOList, "导出文件"); } catch (Exception e) { e.printStackTrace(); } finally { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 3713c00..2987fda 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Methane.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -223,7 +223,7 @@ }else { if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不能小于5"); return stringMap; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 046bf4e..8fc6a2d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getCollectTime() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); // Device device = iDeviceService.selectById(busConfigDTO.getDeviceId()); // if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java index 13eb940..9a635f4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java @@ -153,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.PRESS.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 994e825..d28a498 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getCollectInterval() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getCollectTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集间隔、重传次数、采集次数、采集开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.TempHumi.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 77f78cb..575e393 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Tube.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java index 3475266..bd6640d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Well.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java index 28fcf31..a537435 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java index cbe9526..fa30b49 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java @@ -27,6 +27,7 @@ @Resource private AbstractPermissionContext service; + @Transactional @Override public DeptPermission selectDeptPermission(Long deptId) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index 0695eee..d73efb6 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -66,7 +66,7 @@ @ExcelProperty("报警阈值") private float threshold; /** - * 井深百分比 + * 报警阈值（%） */ @ExcelProperty("报警阈值（%）") private float percent; @@ -136,16 +136,16 @@ * sensorId */ private String sensorId; -// /** -// * 低报报警阈值 -// */ -// @ExcelProperty("低报报警阈值") -// private String lowerThreshold; -// /** -// * 高报报警阈值 -// */ -// @ExcelProperty("高报报警阈值") -// private String upperThreshold; + /** + * 低报报警阈值 + */ + @ExcelProperty("低报报警阈值") + private String lowerThreshold; + /** + * 高报报警阈值 + */ + @ExcelProperty("高报报警阈值") + private String upperThreshold; /** * 创建时间 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java index 72ca1de..4162af9 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.casic.missiles.modular.system.dto.BusConfigDTO; import lombok.Data; import org.springframework.stereotype.Component; @@ -29,16 +30,41 @@ private String ip; @ExcelProperty("端口号") private String port; - @ExcelProperty("最大尝试次数") - private String attemptsMax; @ExcelProperty("采集间隔（分）") private String collectInterval; @ExcelProperty("上传周期（分）") private String uploadPeriod; - + @ExcelProperty("重传次数") + private String retryTimes; @ExcelProperty("低报报警阈值") private String lowerThreshold; @ExcelProperty("高报报警阈值") private String upperThreshold; + @ExcelProperty("已尝试次数") + private String attemptsCurrent; + @ExcelProperty("最大尝试次数") + private String attemptsMax; + @ExcelProperty("下发状态") + private String statusName; + private String writetime; + public KadConfigExportDTO() { + } + + public KadConfigExportDTO(BusConfigDTO busConfigDTO) { + + this.devcode = busConfigDTO.getDevcode(); + this.retryTimes = busConfigDTO.getRetryTimes(); + this.collectInterval = busConfigDTO.getCollectInterval(); + this.uploadPeriod = busConfigDTO.getUploadPeriod(); + this.ip = busConfigDTO.getIp(); + this.port =busConfigDTO.getPort(); + this.attemptsCurrent=busConfigDTO.getAttemptsCurrent(); + this.attemptsMax=busConfigDTO.getAttemptsMax(); + this.lowerThreshold=busConfigDTO.getLowerThreshold(); + this.upperThreshold=busConfigDTO.getUpperThreshold(); + this.writetime=busConfigDTO.getWritetime(); + this.statusName="1".equals(busConfigDTO.getStatus())?"已下发":"未下发"; + + } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index e68c8ab..5a8bc03 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -76,6 +76,9 @@ @TableField("AREA") private String area; + @TableField(exist = false) + private String areaName; + /** * 区域 */ diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java index a8cd989..3211431 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java @@ -58,6 +58,8 @@ * 默认城市区划 */ private String area; + @TableField(exist = false) + private String areaName; /** * 使用地图（0百度，1高德，2arcgis） */ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java index 6f76952..f5b87ed 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java @@ -41,6 +41,8 @@ String getAreaPId(@Param("id") Long id); + String getAreaName(@Param("id") Long id); + List getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid); void updateBatchBfcf(@Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("deptIds") List deptIds); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index a9a12cf..9238827 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -228,6 +228,12 @@ WHERE a.id = #{id} + + - UPDATE bus_well_info SET bfzt = #{bfzt} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java index 5ba92d3..64e8f59 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java @@ -44,6 +44,8 @@ String getAreaPid(Long id); + String getAreaName(Long id); + Integer armingById(Long id,String bfzt); void updateBatchBfcf(String keywords, String wellType, String deptid, String bfzt, List deptIds); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index f626ab7..97a8131 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -151,7 +151,7 @@ + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getThreshold() + "," + busConfigDTO.getSleepStartTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数、阈值、睡眠开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 9e6929e..2f8dc74 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 860a67b..52ff667 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -136,7 +136,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java index 1a9bb6e..4aa661a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.system.dao.BusConfigMapper; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.dto.ExcelModel.KadConfigExportDTO; import com.casic.missiles.modular.system.model.BusConfig; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.redis.RedisPublisherUtil; @@ -152,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.KAD.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -305,6 +306,8 @@ @Override public void exp(List busConfigDTOList, HttpServletResponse response) { + List configExportDTOList = new ArrayList<>(); + FileInputStream fis = null; try { response.setContentType("application/octet-stream"); @@ -318,22 +321,22 @@ var.put("list", new ArrayList() { { for (int i = 0; i < busConfigDTOList.size(); i++) { - BusConfigDTO busConfigDTO = busConfigDTOList.get(i); + KadConfigExportDTO configExportDTO = new KadConfigExportDTO(busConfigDTOList.get(i)); + configExportDTOList.add(configExportDTO); add(new HashMap() { { - put("设备编号", busConfigDTO.getDevcode()); - put("重传次数", busConfigDTO.getRetryTimes()); - put("采集间隔", busConfigDTO.getCollectInterval()); - put("上传周期", busConfigDTO.getUploadPeriod()); - put("IP地址", busConfigDTO.getIp()); - put("端口", busConfigDTO.getPort()); - put("最大尝试次数", busConfigDTO.getAttemptsMax()); - put("已尝试次数", busConfigDTO.getAttemptsCurrent()); - put("端口号", "port"); - put("低报报警阈值", busConfigDTO.getLowerThreshold()); - put("高报报警阈值", busConfigDTO.getUpperThreshold()); - put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发"); - put("创建时间", busConfigDTO.getWritetime()); + put("设备编号", configExportDTO.getDevcode()); + put("重传次数", configExportDTO.getRetryTimes()); + put("采集间隔", configExportDTO.getCollectInterval()); + put("上传周期", configExportDTO.getUploadPeriod()); + put("IP地址", configExportDTO.getIp()); + put("端口", configExportDTO.getPort()); + put("最大尝试次数", configExportDTO.getAttemptsMax()); + put("已尝试次数", configExportDTO.getAttemptsCurrent()); + put("低报报警阈值", configExportDTO.getLowerThreshold()); + put("高报报警阈值", configExportDTO.getUpperThreshold()); + put("下发状态", configExportDTO.getStatusName()); + put("创建时间", configExportDTO.getWritetime()); } }); } @@ -341,7 +344,7 @@ }); //输出模板 //TODO 导出类设置 - exportService.exportExcel(response, BusConfigDTO.class, busConfigDTOList, "导出文件"); + exportService.exportExcel(response, KadConfigExportDTO.class, configExportDTOList, "导出文件"); } catch (Exception e) { e.printStackTrace(); } finally { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 3713c00..2987fda 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Methane.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -223,7 +223,7 @@ }else { if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不能小于5"); return stringMap; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 046bf4e..8fc6a2d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getCollectTime() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); // Device device = iDeviceService.selectById(busConfigDTO.getDeviceId()); // if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java index 13eb940..9a635f4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java @@ -153,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.PRESS.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 994e825..d28a498 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getCollectInterval() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getCollectTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集间隔、重传次数、采集次数、采集开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.TempHumi.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 77f78cb..575e393 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Tube.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java index 3475266..bd6640d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Well.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java index 28fcf31..a537435 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java index cbe9526..fa30b49 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java @@ -27,6 +27,7 @@ @Resource private AbstractPermissionContext service; + @Transactional @Override public DeptPermission selectDeptPermission(Long deptId) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index 0695eee..d73efb6 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -66,7 +66,7 @@ @ExcelProperty("报警阈值") private float threshold; /** - * 井深百分比 + * 报警阈值（%） */ @ExcelProperty("报警阈值（%）") private float percent; @@ -136,16 +136,16 @@ * sensorId */ private String sensorId; -// /** -// * 低报报警阈值 -// */ -// @ExcelProperty("低报报警阈值") -// private String lowerThreshold; -// /** -// * 高报报警阈值 -// */ -// @ExcelProperty("高报报警阈值") -// private String upperThreshold; + /** + * 低报报警阈值 + */ + @ExcelProperty("低报报警阈值") + private String lowerThreshold; + /** + * 高报报警阈值 + */ + @ExcelProperty("高报报警阈值") + private String upperThreshold; /** * 创建时间 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java index 72ca1de..4162af9 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.casic.missiles.modular.system.dto.BusConfigDTO; import lombok.Data; import org.springframework.stereotype.Component; @@ -29,16 +30,41 @@ private String ip; @ExcelProperty("端口号") private String port; - @ExcelProperty("最大尝试次数") - private String attemptsMax; @ExcelProperty("采集间隔（分）") private String collectInterval; @ExcelProperty("上传周期（分）") private String uploadPeriod; - + @ExcelProperty("重传次数") + private String retryTimes; @ExcelProperty("低报报警阈值") private String lowerThreshold; @ExcelProperty("高报报警阈值") private String upperThreshold; + @ExcelProperty("已尝试次数") + private String attemptsCurrent; + @ExcelProperty("最大尝试次数") + private String attemptsMax; + @ExcelProperty("下发状态") + private String statusName; + private String writetime; + public KadConfigExportDTO() { + } + + public KadConfigExportDTO(BusConfigDTO busConfigDTO) { + + this.devcode = busConfigDTO.getDevcode(); + this.retryTimes = busConfigDTO.getRetryTimes(); + this.collectInterval = busConfigDTO.getCollectInterval(); + this.uploadPeriod = busConfigDTO.getUploadPeriod(); + this.ip = busConfigDTO.getIp(); + this.port =busConfigDTO.getPort(); + this.attemptsCurrent=busConfigDTO.getAttemptsCurrent(); + this.attemptsMax=busConfigDTO.getAttemptsMax(); + this.lowerThreshold=busConfigDTO.getLowerThreshold(); + this.upperThreshold=busConfigDTO.getUpperThreshold(); + this.writetime=busConfigDTO.getWritetime(); + this.statusName="1".equals(busConfigDTO.getStatus())?"已下发":"未下发"; + + } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index e68c8ab..5a8bc03 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -76,6 +76,9 @@ @TableField("AREA") private String area; + @TableField(exist = false) + private String areaName; + /** * 区域 */ diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java index a8cd989..3211431 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java @@ -58,6 +58,8 @@ * 默认城市区划 */ private String area; + @TableField(exist = false) + private String areaName; /** * 使用地图（0百度，1高德，2arcgis） */ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java index 6f76952..f5b87ed 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java @@ -41,6 +41,8 @@ String getAreaPId(@Param("id") Long id); + String getAreaName(@Param("id") Long id); + List getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid); void updateBatchBfcf(@Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("deptIds") List deptIds); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index a9a12cf..9238827 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -228,6 +228,12 @@ WHERE a.id = #{id} + + - UPDATE bus_well_info SET bfzt = #{bfzt} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java index 5ba92d3..64e8f59 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java @@ -44,6 +44,8 @@ String getAreaPid(Long id); + String getAreaName(Long id); + Integer armingById(Long id,String bfzt); void updateBatchBfcf(String keywords, String wellType, String deptid, String bfzt, List deptIds); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java index ac2f2a0..484c0d8 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java @@ -77,6 +77,7 @@ well.setDeptName(service.getDeptService().getDeptName(well.getDeptid())); well.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, well.getBfzt())); well.setQu(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaPid(Long.valueOf(well.getArea()))); + well.setAreaName(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaName(Long.valueOf(well.getArea()))); well.setResponsibleDeptName(service.getDeptService().getDeptName(Long.valueOf(well.getResponsibleDept()))); }); return list; @@ -247,6 +248,12 @@ return this.baseMapper.getAreaPId(id); } + + @Override + public String getAreaName(Long id) { + return this.baseMapper.getAreaName(id); + } + @Override @Transactional public void updateBatchBfcf(String keywords, String wellType, String deptid, String bfzt, List deptIds) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index f626ab7..97a8131 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -151,7 +151,7 @@ + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getThreshold() + "," + busConfigDTO.getSleepStartTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数、阈值、睡眠开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 9e6929e..2f8dc74 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 860a67b..52ff667 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -136,7 +136,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java index 1a9bb6e..4aa661a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.system.dao.BusConfigMapper; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.dto.ExcelModel.KadConfigExportDTO; import com.casic.missiles.modular.system.model.BusConfig; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.redis.RedisPublisherUtil; @@ -152,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.KAD.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -305,6 +306,8 @@ @Override public void exp(List busConfigDTOList, HttpServletResponse response) { + List configExportDTOList = new ArrayList<>(); + FileInputStream fis = null; try { response.setContentType("application/octet-stream"); @@ -318,22 +321,22 @@ var.put("list", new ArrayList() { { for (int i = 0; i < busConfigDTOList.size(); i++) { - BusConfigDTO busConfigDTO = busConfigDTOList.get(i); + KadConfigExportDTO configExportDTO = new KadConfigExportDTO(busConfigDTOList.get(i)); + configExportDTOList.add(configExportDTO); add(new HashMap() { { - put("设备编号", busConfigDTO.getDevcode()); - put("重传次数", busConfigDTO.getRetryTimes()); - put("采集间隔", busConfigDTO.getCollectInterval()); - put("上传周期", busConfigDTO.getUploadPeriod()); - put("IP地址", busConfigDTO.getIp()); - put("端口", busConfigDTO.getPort()); - put("最大尝试次数", busConfigDTO.getAttemptsMax()); - put("已尝试次数", busConfigDTO.getAttemptsCurrent()); - put("端口号", "port"); - put("低报报警阈值", busConfigDTO.getLowerThreshold()); - put("高报报警阈值", busConfigDTO.getUpperThreshold()); - put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发"); - put("创建时间", busConfigDTO.getWritetime()); + put("设备编号", configExportDTO.getDevcode()); + put("重传次数", configExportDTO.getRetryTimes()); + put("采集间隔", configExportDTO.getCollectInterval()); + put("上传周期", configExportDTO.getUploadPeriod()); + put("IP地址", configExportDTO.getIp()); + put("端口", configExportDTO.getPort()); + put("最大尝试次数", configExportDTO.getAttemptsMax()); + put("已尝试次数", configExportDTO.getAttemptsCurrent()); + put("低报报警阈值", configExportDTO.getLowerThreshold()); + put("高报报警阈值", configExportDTO.getUpperThreshold()); + put("下发状态", configExportDTO.getStatusName()); + put("创建时间", configExportDTO.getWritetime()); } }); } @@ -341,7 +344,7 @@ }); //输出模板 //TODO 导出类设置 - exportService.exportExcel(response, BusConfigDTO.class, busConfigDTOList, "导出文件"); + exportService.exportExcel(response, KadConfigExportDTO.class, configExportDTOList, "导出文件"); } catch (Exception e) { e.printStackTrace(); } finally { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 3713c00..2987fda 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Methane.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -223,7 +223,7 @@ }else { if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不能小于5"); return stringMap; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 046bf4e..8fc6a2d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getCollectTime() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); // Device device = iDeviceService.selectById(busConfigDTO.getDeviceId()); // if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java index 13eb940..9a635f4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java @@ -153,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.PRESS.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 994e825..d28a498 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getCollectInterval() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getCollectTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集间隔、重传次数、采集次数、采集开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.TempHumi.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 77f78cb..575e393 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Tube.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java index 3475266..bd6640d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Well.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java index 28fcf31..a537435 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java index cbe9526..fa30b49 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java @@ -27,6 +27,7 @@ @Resource private AbstractPermissionContext service; + @Transactional @Override public DeptPermission selectDeptPermission(Long deptId) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index 0695eee..d73efb6 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -66,7 +66,7 @@ @ExcelProperty("报警阈值") private float threshold; /** - * 井深百分比 + * 报警阈值（%） */ @ExcelProperty("报警阈值（%）") private float percent; @@ -136,16 +136,16 @@ * sensorId */ private String sensorId; -// /** -// * 低报报警阈值 -// */ -// @ExcelProperty("低报报警阈值") -// private String lowerThreshold; -// /** -// * 高报报警阈值 -// */ -// @ExcelProperty("高报报警阈值") -// private String upperThreshold; + /** + * 低报报警阈值 + */ + @ExcelProperty("低报报警阈值") + private String lowerThreshold; + /** + * 高报报警阈值 + */ + @ExcelProperty("高报报警阈值") + private String upperThreshold; /** * 创建时间 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java index 72ca1de..4162af9 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.casic.missiles.modular.system.dto.BusConfigDTO; import lombok.Data; import org.springframework.stereotype.Component; @@ -29,16 +30,41 @@ private String ip; @ExcelProperty("端口号") private String port; - @ExcelProperty("最大尝试次数") - private String attemptsMax; @ExcelProperty("采集间隔（分）") private String collectInterval; @ExcelProperty("上传周期（分）") private String uploadPeriod; - + @ExcelProperty("重传次数") + private String retryTimes; @ExcelProperty("低报报警阈值") private String lowerThreshold; @ExcelProperty("高报报警阈值") private String upperThreshold; + @ExcelProperty("已尝试次数") + private String attemptsCurrent; + @ExcelProperty("最大尝试次数") + private String attemptsMax; + @ExcelProperty("下发状态") + private String statusName; + private String writetime; + public KadConfigExportDTO() { + } + + public KadConfigExportDTO(BusConfigDTO busConfigDTO) { + + this.devcode = busConfigDTO.getDevcode(); + this.retryTimes = busConfigDTO.getRetryTimes(); + this.collectInterval = busConfigDTO.getCollectInterval(); + this.uploadPeriod = busConfigDTO.getUploadPeriod(); + this.ip = busConfigDTO.getIp(); + this.port =busConfigDTO.getPort(); + this.attemptsCurrent=busConfigDTO.getAttemptsCurrent(); + this.attemptsMax=busConfigDTO.getAttemptsMax(); + this.lowerThreshold=busConfigDTO.getLowerThreshold(); + this.upperThreshold=busConfigDTO.getUpperThreshold(); + this.writetime=busConfigDTO.getWritetime(); + this.statusName="1".equals(busConfigDTO.getStatus())?"已下发":"未下发"; + + } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index e68c8ab..5a8bc03 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -76,6 +76,9 @@ @TableField("AREA") private String area; + @TableField(exist = false) + private String areaName; + /** * 区域 */ diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java index a8cd989..3211431 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java @@ -58,6 +58,8 @@ * 默认城市区划 */ private String area; + @TableField(exist = false) + private String areaName; /** * 使用地图（0百度，1高德，2arcgis） */ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java index 6f76952..f5b87ed 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java @@ -41,6 +41,8 @@ String getAreaPId(@Param("id") Long id); + String getAreaName(@Param("id") Long id); + List getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid); void updateBatchBfcf(@Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("deptIds") List deptIds); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index a9a12cf..9238827 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -228,6 +228,12 @@ WHERE a.id = #{id} + + - UPDATE bus_well_info SET bfzt = #{bfzt} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java index 5ba92d3..64e8f59 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java @@ -44,6 +44,8 @@ String getAreaPid(Long id); + String getAreaName(Long id); + Integer armingById(Long id,String bfzt); void updateBatchBfcf(String keywords, String wellType, String deptid, String bfzt, List deptIds); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java index ac2f2a0..484c0d8 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java @@ -77,6 +77,7 @@ well.setDeptName(service.getDeptService().getDeptName(well.getDeptid())); well.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, well.getBfzt())); well.setQu(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaPid(Long.valueOf(well.getArea()))); + well.setAreaName(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaName(Long.valueOf(well.getArea()))); well.setResponsibleDeptName(service.getDeptService().getDeptName(Long.valueOf(well.getResponsibleDept()))); }); return list; @@ -247,6 +248,12 @@ return this.baseMapper.getAreaPId(id); } + + @Override + public String getAreaName(Long id) { + return this.baseMapper.getAreaName(id); + } + @Override @Transactional public void updateBatchBfcf(String keywords, String wellType, String deptid, String bfzt, List deptIds) { diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 977448f..6f9eec4 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -31,7 +31,7 @@ casic: kaptcha-open: false #是否开启登录时验证码 (true/false) #kaptcha-open: false #是否开启登录时验证码 (true/false) - no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/webjars/**,/swagger-resources/** + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/webjars/**,/swagger-resources/**,/websocket/* db: init: enable: false diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index f626ab7..97a8131 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -151,7 +151,7 @@ + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getThreshold() + "," + busConfigDTO.getSleepStartTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数、阈值、睡眠开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 9e6929e..2f8dc74 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 860a67b..52ff667 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -136,7 +136,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java index 1a9bb6e..4aa661a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.system.dao.BusConfigMapper; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.dto.ExcelModel.KadConfigExportDTO; import com.casic.missiles.modular.system.model.BusConfig; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.redis.RedisPublisherUtil; @@ -152,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.KAD.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -305,6 +306,8 @@ @Override public void exp(List busConfigDTOList, HttpServletResponse response) { + List configExportDTOList = new ArrayList<>(); + FileInputStream fis = null; try { response.setContentType("application/octet-stream"); @@ -318,22 +321,22 @@ var.put("list", new ArrayList() { { for (int i = 0; i < busConfigDTOList.size(); i++) { - BusConfigDTO busConfigDTO = busConfigDTOList.get(i); + KadConfigExportDTO configExportDTO = new KadConfigExportDTO(busConfigDTOList.get(i)); + configExportDTOList.add(configExportDTO); add(new HashMap() { { - put("设备编号", busConfigDTO.getDevcode()); - put("重传次数", busConfigDTO.getRetryTimes()); - put("采集间隔", busConfigDTO.getCollectInterval()); - put("上传周期", busConfigDTO.getUploadPeriod()); - put("IP地址", busConfigDTO.getIp()); - put("端口", busConfigDTO.getPort()); - put("最大尝试次数", busConfigDTO.getAttemptsMax()); - put("已尝试次数", busConfigDTO.getAttemptsCurrent()); - put("端口号", "port"); - put("低报报警阈值", busConfigDTO.getLowerThreshold()); - put("高报报警阈值", busConfigDTO.getUpperThreshold()); - put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发"); - put("创建时间", busConfigDTO.getWritetime()); + put("设备编号", configExportDTO.getDevcode()); + put("重传次数", configExportDTO.getRetryTimes()); + put("采集间隔", configExportDTO.getCollectInterval()); + put("上传周期", configExportDTO.getUploadPeriod()); + put("IP地址", configExportDTO.getIp()); + put("端口", configExportDTO.getPort()); + put("最大尝试次数", configExportDTO.getAttemptsMax()); + put("已尝试次数", configExportDTO.getAttemptsCurrent()); + put("低报报警阈值", configExportDTO.getLowerThreshold()); + put("高报报警阈值", configExportDTO.getUpperThreshold()); + put("下发状态", configExportDTO.getStatusName()); + put("创建时间", configExportDTO.getWritetime()); } }); } @@ -341,7 +344,7 @@ }); //输出模板 //TODO 导出类设置 - exportService.exportExcel(response, BusConfigDTO.class, busConfigDTOList, "导出文件"); + exportService.exportExcel(response, KadConfigExportDTO.class, configExportDTOList, "导出文件"); } catch (Exception e) { e.printStackTrace(); } finally { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 3713c00..2987fda 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Methane.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -223,7 +223,7 @@ }else { if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不能小于5"); return stringMap; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 046bf4e..8fc6a2d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getCollectTime() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); // Device device = iDeviceService.selectById(busConfigDTO.getDeviceId()); // if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java index 13eb940..9a635f4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java @@ -153,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.PRESS.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 994e825..d28a498 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getCollectInterval() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getCollectTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集间隔、重传次数、采集次数、采集开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.TempHumi.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 77f78cb..575e393 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Tube.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java index 3475266..bd6640d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Well.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java index 28fcf31..a537435 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java index cbe9526..fa30b49 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java @@ -27,6 +27,7 @@ @Resource private AbstractPermissionContext service; + @Transactional @Override public DeptPermission selectDeptPermission(Long deptId) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index 0695eee..d73efb6 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -66,7 +66,7 @@ @ExcelProperty("报警阈值") private float threshold; /** - * 井深百分比 + * 报警阈值（%） */ @ExcelProperty("报警阈值（%）") private float percent; @@ -136,16 +136,16 @@ * sensorId */ private String sensorId; -// /** -// * 低报报警阈值 -// */ -// @ExcelProperty("低报报警阈值") -// private String lowerThreshold; -// /** -// * 高报报警阈值 -// */ -// @ExcelProperty("高报报警阈值") -// private String upperThreshold; + /** + * 低报报警阈值 + */ + @ExcelProperty("低报报警阈值") + private String lowerThreshold; + /** + * 高报报警阈值 + */ + @ExcelProperty("高报报警阈值") + private String upperThreshold; /** * 创建时间 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java index 72ca1de..4162af9 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.casic.missiles.modular.system.dto.BusConfigDTO; import lombok.Data; import org.springframework.stereotype.Component; @@ -29,16 +30,41 @@ private String ip; @ExcelProperty("端口号") private String port; - @ExcelProperty("最大尝试次数") - private String attemptsMax; @ExcelProperty("采集间隔（分）") private String collectInterval; @ExcelProperty("上传周期（分）") private String uploadPeriod; - + @ExcelProperty("重传次数") + private String retryTimes; @ExcelProperty("低报报警阈值") private String lowerThreshold; @ExcelProperty("高报报警阈值") private String upperThreshold; + @ExcelProperty("已尝试次数") + private String attemptsCurrent; + @ExcelProperty("最大尝试次数") + private String attemptsMax; + @ExcelProperty("下发状态") + private String statusName; + private String writetime; + public KadConfigExportDTO() { + } + + public KadConfigExportDTO(BusConfigDTO busConfigDTO) { + + this.devcode = busConfigDTO.getDevcode(); + this.retryTimes = busConfigDTO.getRetryTimes(); + this.collectInterval = busConfigDTO.getCollectInterval(); + this.uploadPeriod = busConfigDTO.getUploadPeriod(); + this.ip = busConfigDTO.getIp(); + this.port =busConfigDTO.getPort(); + this.attemptsCurrent=busConfigDTO.getAttemptsCurrent(); + this.attemptsMax=busConfigDTO.getAttemptsMax(); + this.lowerThreshold=busConfigDTO.getLowerThreshold(); + this.upperThreshold=busConfigDTO.getUpperThreshold(); + this.writetime=busConfigDTO.getWritetime(); + this.statusName="1".equals(busConfigDTO.getStatus())?"已下发":"未下发"; + + } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index e68c8ab..5a8bc03 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -76,6 +76,9 @@ @TableField("AREA") private String area; + @TableField(exist = false) + private String areaName; + /** * 区域 */ diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java index a8cd989..3211431 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java @@ -58,6 +58,8 @@ * 默认城市区划 */ private String area; + @TableField(exist = false) + private String areaName; /** * 使用地图（0百度，1高德，2arcgis） */ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java index 6f76952..f5b87ed 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java @@ -41,6 +41,8 @@ String getAreaPId(@Param("id") Long id); + String getAreaName(@Param("id") Long id); + List getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid); void updateBatchBfcf(@Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("deptIds") List deptIds); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index a9a12cf..9238827 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -228,6 +228,12 @@ WHERE a.id = #{id} + + - UPDATE bus_well_info SET bfzt = #{bfzt} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java index 5ba92d3..64e8f59 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java @@ -44,6 +44,8 @@ String getAreaPid(Long id); + String getAreaName(Long id); + Integer armingById(Long id,String bfzt); void updateBatchBfcf(String keywords, String wellType, String deptid, String bfzt, List deptIds); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java index ac2f2a0..484c0d8 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java @@ -77,6 +77,7 @@ well.setDeptName(service.getDeptService().getDeptName(well.getDeptid())); well.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, well.getBfzt())); well.setQu(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaPid(Long.valueOf(well.getArea()))); + well.setAreaName(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaName(Long.valueOf(well.getArea()))); well.setResponsibleDeptName(service.getDeptService().getDeptName(Long.valueOf(well.getResponsibleDept()))); }); return list; @@ -247,6 +248,12 @@ return this.baseMapper.getAreaPId(id); } + + @Override + public String getAreaName(Long id) { + return this.baseMapper.getAreaName(id); + } + @Override @Transactional public void updateBatchBfcf(String keywords, String wellType, String deptid, String bfzt, List deptIds) { diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 977448f..6f9eec4 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -31,7 +31,7 @@ casic: kaptcha-open: false #是否开启登录时验证码 (true/false) #kaptcha-open: false #是否开启登录时验证码 (true/false) - no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/webjars/**,/swagger-resources/** + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/webjars/**,/swagger-resources/**,/websocket/* db: init: enable: false diff --git a/casic-web/src/main/resources/config/temp/config_template.xlsx b/casic-web/src/main/resources/config/temp/config_template.xlsx index 3af0e2b..06fefe1 100644 --- a/casic-web/src/main/resources/config/temp/config_template.xlsx +++ b/casic-web/src/main/resources/config/temp/config_template.xlsx Binary files differ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index f626ab7..97a8131 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -151,7 +151,7 @@ + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getThreshold() + "," + busConfigDTO.getSleepStartTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数、阈值、睡眠开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 9e6929e..2f8dc74 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 860a67b..52ff667 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -136,7 +136,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java index 1a9bb6e..4aa661a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.system.dao.BusConfigMapper; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.dto.ExcelModel.KadConfigExportDTO; import com.casic.missiles.modular.system.model.BusConfig; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.redis.RedisPublisherUtil; @@ -152,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.KAD.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -305,6 +306,8 @@ @Override public void exp(List busConfigDTOList, HttpServletResponse response) { + List configExportDTOList = new ArrayList<>(); + FileInputStream fis = null; try { response.setContentType("application/octet-stream"); @@ -318,22 +321,22 @@ var.put("list", new ArrayList() { { for (int i = 0; i < busConfigDTOList.size(); i++) { - BusConfigDTO busConfigDTO = busConfigDTOList.get(i); + KadConfigExportDTO configExportDTO = new KadConfigExportDTO(busConfigDTOList.get(i)); + configExportDTOList.add(configExportDTO); add(new HashMap() { { - put("设备编号", busConfigDTO.getDevcode()); - put("重传次数", busConfigDTO.getRetryTimes()); - put("采集间隔", busConfigDTO.getCollectInterval()); - put("上传周期", busConfigDTO.getUploadPeriod()); - put("IP地址", busConfigDTO.getIp()); - put("端口", busConfigDTO.getPort()); - put("最大尝试次数", busConfigDTO.getAttemptsMax()); - put("已尝试次数", busConfigDTO.getAttemptsCurrent()); - put("端口号", "port"); - put("低报报警阈值", busConfigDTO.getLowerThreshold()); - put("高报报警阈值", busConfigDTO.getUpperThreshold()); - put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发"); - put("创建时间", busConfigDTO.getWritetime()); + put("设备编号", configExportDTO.getDevcode()); + put("重传次数", configExportDTO.getRetryTimes()); + put("采集间隔", configExportDTO.getCollectInterval()); + put("上传周期", configExportDTO.getUploadPeriod()); + put("IP地址", configExportDTO.getIp()); + put("端口", configExportDTO.getPort()); + put("最大尝试次数", configExportDTO.getAttemptsMax()); + put("已尝试次数", configExportDTO.getAttemptsCurrent()); + put("低报报警阈值", configExportDTO.getLowerThreshold()); + put("高报报警阈值", configExportDTO.getUpperThreshold()); + put("下发状态", configExportDTO.getStatusName()); + put("创建时间", configExportDTO.getWritetime()); } }); } @@ -341,7 +344,7 @@ }); //输出模板 //TODO 导出类设置 - exportService.exportExcel(response, BusConfigDTO.class, busConfigDTOList, "导出文件"); + exportService.exportExcel(response, KadConfigExportDTO.class, configExportDTOList, "导出文件"); } catch (Exception e) { e.printStackTrace(); } finally { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 3713c00..2987fda 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Methane.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -223,7 +223,7 @@ }else { if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不能小于5"); return stringMap; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 046bf4e..8fc6a2d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getCollectTime() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); // Device device = iDeviceService.selectById(busConfigDTO.getDeviceId()); // if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java index 13eb940..9a635f4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java @@ -153,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.PRESS.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 994e825..d28a498 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getCollectInterval() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getCollectTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集间隔、重传次数、采集次数、采集开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.TempHumi.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 77f78cb..575e393 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Tube.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java index 3475266..bd6640d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Well.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java index 28fcf31..a537435 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java index cbe9526..fa30b49 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java @@ -27,6 +27,7 @@ @Resource private AbstractPermissionContext service; + @Transactional @Override public DeptPermission selectDeptPermission(Long deptId) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index 0695eee..d73efb6 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -66,7 +66,7 @@ @ExcelProperty("报警阈值") private float threshold; /** - * 井深百分比 + * 报警阈值（%） */ @ExcelProperty("报警阈值（%）") private float percent; @@ -136,16 +136,16 @@ * sensorId */ private String sensorId; -// /** -// * 低报报警阈值 -// */ -// @ExcelProperty("低报报警阈值") -// private String lowerThreshold; -// /** -// * 高报报警阈值 -// */ -// @ExcelProperty("高报报警阈值") -// private String upperThreshold; + /** + * 低报报警阈值 + */ + @ExcelProperty("低报报警阈值") + private String lowerThreshold; + /** + * 高报报警阈值 + */ + @ExcelProperty("高报报警阈值") + private String upperThreshold; /** * 创建时间 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java index 72ca1de..4162af9 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.casic.missiles.modular.system.dto.BusConfigDTO; import lombok.Data; import org.springframework.stereotype.Component; @@ -29,16 +30,41 @@ private String ip; @ExcelProperty("端口号") private String port; - @ExcelProperty("最大尝试次数") - private String attemptsMax; @ExcelProperty("采集间隔（分）") private String collectInterval; @ExcelProperty("上传周期（分）") private String uploadPeriod; - + @ExcelProperty("重传次数") + private String retryTimes; @ExcelProperty("低报报警阈值") private String lowerThreshold; @ExcelProperty("高报报警阈值") private String upperThreshold; + @ExcelProperty("已尝试次数") + private String attemptsCurrent; + @ExcelProperty("最大尝试次数") + private String attemptsMax; + @ExcelProperty("下发状态") + private String statusName; + private String writetime; + public KadConfigExportDTO() { + } + + public KadConfigExportDTO(BusConfigDTO busConfigDTO) { + + this.devcode = busConfigDTO.getDevcode(); + this.retryTimes = busConfigDTO.getRetryTimes(); + this.collectInterval = busConfigDTO.getCollectInterval(); + this.uploadPeriod = busConfigDTO.getUploadPeriod(); + this.ip = busConfigDTO.getIp(); + this.port =busConfigDTO.getPort(); + this.attemptsCurrent=busConfigDTO.getAttemptsCurrent(); + this.attemptsMax=busConfigDTO.getAttemptsMax(); + this.lowerThreshold=busConfigDTO.getLowerThreshold(); + this.upperThreshold=busConfigDTO.getUpperThreshold(); + this.writetime=busConfigDTO.getWritetime(); + this.statusName="1".equals(busConfigDTO.getStatus())?"已下发":"未下发"; + + } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index e68c8ab..5a8bc03 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -76,6 +76,9 @@ @TableField("AREA") private String area; + @TableField(exist = false) + private String areaName; + /** * 区域 */ diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java index a8cd989..3211431 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java @@ -58,6 +58,8 @@ * 默认城市区划 */ private String area; + @TableField(exist = false) + private String areaName; /** * 使用地图（0百度，1高德，2arcgis） */ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java index 6f76952..f5b87ed 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java @@ -41,6 +41,8 @@ String getAreaPId(@Param("id") Long id); + String getAreaName(@Param("id") Long id); + List getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid); void updateBatchBfcf(@Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("deptIds") List deptIds); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index a9a12cf..9238827 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -228,6 +228,12 @@ WHERE a.id = #{id} + + - UPDATE bus_well_info SET bfzt = #{bfzt} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java index 5ba92d3..64e8f59 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java @@ -44,6 +44,8 @@ String getAreaPid(Long id); + String getAreaName(Long id); + Integer armingById(Long id,String bfzt); void updateBatchBfcf(String keywords, String wellType, String deptid, String bfzt, List deptIds); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java index ac2f2a0..484c0d8 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java @@ -77,6 +77,7 @@ well.setDeptName(service.getDeptService().getDeptName(well.getDeptid())); well.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, well.getBfzt())); well.setQu(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaPid(Long.valueOf(well.getArea()))); + well.setAreaName(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaName(Long.valueOf(well.getArea()))); well.setResponsibleDeptName(service.getDeptService().getDeptName(Long.valueOf(well.getResponsibleDept()))); }); return list; @@ -247,6 +248,12 @@ return this.baseMapper.getAreaPId(id); } + + @Override + public String getAreaName(Long id) { + return this.baseMapper.getAreaName(id); + } + @Override @Transactional public void updateBatchBfcf(String keywords, String wellType, String deptid, String bfzt, List deptIds) { diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 977448f..6f9eec4 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -31,7 +31,7 @@ casic: kaptcha-open: false #是否开启登录时验证码 (true/false) #kaptcha-open: false #是否开启登录时验证码 (true/false) - no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/webjars/**,/swagger-resources/** + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/webjars/**,/swagger-resources/**,/websocket/* db: init: enable: false diff --git a/casic-web/src/main/resources/config/temp/config_template.xlsx b/casic-web/src/main/resources/config/temp/config_template.xlsx index 3af0e2b..06fefe1 100644 --- a/casic-web/src/main/resources/config/temp/config_template.xlsx +++ b/casic-web/src/main/resources/config/temp/config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/tube_config_template.xlsx b/casic-web/src/main/resources/config/temp/tube_config_template.xlsx new file mode 100644 index 0000000..830059b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/tube_config_template.xlsx Binary files differ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index f626ab7..97a8131 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -151,7 +151,7 @@ + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getThreshold() + "," + busConfigDTO.getSleepStartTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数、阈值、睡眠开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 9e6929e..2f8dc74 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 860a67b..52ff667 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -136,7 +136,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java index 1a9bb6e..4aa661a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.system.dao.BusConfigMapper; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.dto.ExcelModel.KadConfigExportDTO; import com.casic.missiles.modular.system.model.BusConfig; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.redis.RedisPublisherUtil; @@ -152,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.KAD.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -305,6 +306,8 @@ @Override public void exp(List busConfigDTOList, HttpServletResponse response) { + List configExportDTOList = new ArrayList<>(); + FileInputStream fis = null; try { response.setContentType("application/octet-stream"); @@ -318,22 +321,22 @@ var.put("list", new ArrayList() { { for (int i = 0; i < busConfigDTOList.size(); i++) { - BusConfigDTO busConfigDTO = busConfigDTOList.get(i); + KadConfigExportDTO configExportDTO = new KadConfigExportDTO(busConfigDTOList.get(i)); + configExportDTOList.add(configExportDTO); add(new HashMap() { { - put("设备编号", busConfigDTO.getDevcode()); - put("重传次数", busConfigDTO.getRetryTimes()); - put("采集间隔", busConfigDTO.getCollectInterval()); - put("上传周期", busConfigDTO.getUploadPeriod()); - put("IP地址", busConfigDTO.getIp()); - put("端口", busConfigDTO.getPort()); - put("最大尝试次数", busConfigDTO.getAttemptsMax()); - put("已尝试次数", busConfigDTO.getAttemptsCurrent()); - put("端口号", "port"); - put("低报报警阈值", busConfigDTO.getLowerThreshold()); - put("高报报警阈值", busConfigDTO.getUpperThreshold()); - put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发"); - put("创建时间", busConfigDTO.getWritetime()); + put("设备编号", configExportDTO.getDevcode()); + put("重传次数", configExportDTO.getRetryTimes()); + put("采集间隔", configExportDTO.getCollectInterval()); + put("上传周期", configExportDTO.getUploadPeriod()); + put("IP地址", configExportDTO.getIp()); + put("端口", configExportDTO.getPort()); + put("最大尝试次数", configExportDTO.getAttemptsMax()); + put("已尝试次数", configExportDTO.getAttemptsCurrent()); + put("低报报警阈值", configExportDTO.getLowerThreshold()); + put("高报报警阈值", configExportDTO.getUpperThreshold()); + put("下发状态", configExportDTO.getStatusName()); + put("创建时间", configExportDTO.getWritetime()); } }); } @@ -341,7 +344,7 @@ }); //输出模板 //TODO 导出类设置 - exportService.exportExcel(response, BusConfigDTO.class, busConfigDTOList, "导出文件"); + exportService.exportExcel(response, KadConfigExportDTO.class, configExportDTOList, "导出文件"); } catch (Exception e) { e.printStackTrace(); } finally { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 3713c00..2987fda 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Methane.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -223,7 +223,7 @@ }else { if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不能小于5"); return stringMap; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 046bf4e..8fc6a2d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getCollectTime() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); // Device device = iDeviceService.selectById(busConfigDTO.getDeviceId()); // if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java index 13eb940..9a635f4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java @@ -153,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.PRESS.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 994e825..d28a498 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getCollectInterval() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getCollectTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集间隔、重传次数、采集次数、采集开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.TempHumi.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 77f78cb..575e393 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Tube.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java index 3475266..bd6640d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Well.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java index 28fcf31..a537435 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java index cbe9526..fa30b49 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java @@ -27,6 +27,7 @@ @Resource private AbstractPermissionContext service; + @Transactional @Override public DeptPermission selectDeptPermission(Long deptId) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index 0695eee..d73efb6 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -66,7 +66,7 @@ @ExcelProperty("报警阈值") private float threshold; /** - * 井深百分比 + * 报警阈值（%） */ @ExcelProperty("报警阈值（%）") private float percent; @@ -136,16 +136,16 @@ * sensorId */ private String sensorId; -// /** -// * 低报报警阈值 -// */ -// @ExcelProperty("低报报警阈值") -// private String lowerThreshold; -// /** -// * 高报报警阈值 -// */ -// @ExcelProperty("高报报警阈值") -// private String upperThreshold; + /** + * 低报报警阈值 + */ + @ExcelProperty("低报报警阈值") + private String lowerThreshold; + /** + * 高报报警阈值 + */ + @ExcelProperty("高报报警阈值") + private String upperThreshold; /** * 创建时间 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java index 72ca1de..4162af9 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.casic.missiles.modular.system.dto.BusConfigDTO; import lombok.Data; import org.springframework.stereotype.Component; @@ -29,16 +30,41 @@ private String ip; @ExcelProperty("端口号") private String port; - @ExcelProperty("最大尝试次数") - private String attemptsMax; @ExcelProperty("采集间隔（分）") private String collectInterval; @ExcelProperty("上传周期（分）") private String uploadPeriod; - + @ExcelProperty("重传次数") + private String retryTimes; @ExcelProperty("低报报警阈值") private String lowerThreshold; @ExcelProperty("高报报警阈值") private String upperThreshold; + @ExcelProperty("已尝试次数") + private String attemptsCurrent; + @ExcelProperty("最大尝试次数") + private String attemptsMax; + @ExcelProperty("下发状态") + private String statusName; + private String writetime; + public KadConfigExportDTO() { + } + + public KadConfigExportDTO(BusConfigDTO busConfigDTO) { + + this.devcode = busConfigDTO.getDevcode(); + this.retryTimes = busConfigDTO.getRetryTimes(); + this.collectInterval = busConfigDTO.getCollectInterval(); + this.uploadPeriod = busConfigDTO.getUploadPeriod(); + this.ip = busConfigDTO.getIp(); + this.port =busConfigDTO.getPort(); + this.attemptsCurrent=busConfigDTO.getAttemptsCurrent(); + this.attemptsMax=busConfigDTO.getAttemptsMax(); + this.lowerThreshold=busConfigDTO.getLowerThreshold(); + this.upperThreshold=busConfigDTO.getUpperThreshold(); + this.writetime=busConfigDTO.getWritetime(); + this.statusName="1".equals(busConfigDTO.getStatus())?"已下发":"未下发"; + + } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index e68c8ab..5a8bc03 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -76,6 +76,9 @@ @TableField("AREA") private String area; + @TableField(exist = false) + private String areaName; + /** * 区域 */ diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java index a8cd989..3211431 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java @@ -58,6 +58,8 @@ * 默认城市区划 */ private String area; + @TableField(exist = false) + private String areaName; /** * 使用地图（0百度，1高德，2arcgis） */ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java index 6f76952..f5b87ed 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java @@ -41,6 +41,8 @@ String getAreaPId(@Param("id") Long id); + String getAreaName(@Param("id") Long id); + List getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid); void updateBatchBfcf(@Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("deptIds") List deptIds); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index a9a12cf..9238827 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -228,6 +228,12 @@ WHERE a.id = #{id} + + - UPDATE bus_well_info SET bfzt = #{bfzt} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java index 5ba92d3..64e8f59 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java @@ -44,6 +44,8 @@ String getAreaPid(Long id); + String getAreaName(Long id); + Integer armingById(Long id,String bfzt); void updateBatchBfcf(String keywords, String wellType, String deptid, String bfzt, List deptIds); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java index ac2f2a0..484c0d8 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java @@ -77,6 +77,7 @@ well.setDeptName(service.getDeptService().getDeptName(well.getDeptid())); well.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, well.getBfzt())); well.setQu(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaPid(Long.valueOf(well.getArea()))); + well.setAreaName(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaName(Long.valueOf(well.getArea()))); well.setResponsibleDeptName(service.getDeptService().getDeptName(Long.valueOf(well.getResponsibleDept()))); }); return list; @@ -247,6 +248,12 @@ return this.baseMapper.getAreaPId(id); } + + @Override + public String getAreaName(Long id) { + return this.baseMapper.getAreaName(id); + } + @Override @Transactional public void updateBatchBfcf(String keywords, String wellType, String deptid, String bfzt, List deptIds) { diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 977448f..6f9eec4 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -31,7 +31,7 @@ casic: kaptcha-open: false #是否开启登录时验证码 (true/false) #kaptcha-open: false #是否开启登录时验证码 (true/false) - no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/webjars/**,/swagger-resources/** + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/webjars/**,/swagger-resources/**,/websocket/* db: init: enable: false diff --git a/casic-web/src/main/resources/config/temp/config_template.xlsx b/casic-web/src/main/resources/config/temp/config_template.xlsx index 3af0e2b..06fefe1 100644 --- a/casic-web/src/main/resources/config/temp/config_template.xlsx +++ b/casic-web/src/main/resources/config/temp/config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/tube_config_template.xlsx b/casic-web/src/main/resources/config/temp/tube_config_template.xlsx new file mode 100644 index 0000000..830059b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/tube_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/wellcover_config_template.xlsx b/casic-web/src/main/resources/config/temp/wellcover_config_template.xlsx new file mode 100644 index 0000000..830059b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/wellcover_config_template.xlsx Binary files differ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index ea5cd2c..86fbeb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -59,7 +59,7 @@ - and s.ID =to_number(#{deptid}, '999999999999999999999') + and s.ID =#{deptid} ORDER by writetime DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml index 5d6ff85..97ee3e7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml @@ -27,8 +27,9 @@ FROM bus_imei_iccid WHERE 1=1 - AND DEVCODE = #{devcode} + AND DEVCODE like CONCAT('%',#{devcode},'%') + order by logtime desc diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 4d3478b..a01053a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,lineLength,ONLINESTATE,VALID,TS,BFZT,wellId, @@ -269,7 +269,7 @@ - timestampdiff(DAY,NOW(),install_date) + timestampdiff(DAY,install_date,NOW()) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java index 34ed9a7..617ed38 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/LiquidRequest.java @@ -18,14 +18,21 @@ RedisCommon redisCommon =SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setThresh(StringUtils.isNotBlank(content.split(",")[0])? - Float.valueOf(content.split(",")[0]):null); - commConfigDTO.setHeight(Float.valueOf(content.split(",")[1])); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",", 6)[4])) - commConfigDTO.setIp(content.split(",", 6)[4]); - if(StringUtils.isNotBlank(content.split(",",6)[5])) - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[5])); + String[] configArr= content.split(","); + commConfigDTO.setThresh(StringUtils.isNotBlank(configArr[0])? + Float.valueOf(configArr[0]):null); + commConfigDTO.setHeight(Float.valueOf(configArr[1])); + commConfigDTO.setRepeat(Long.valueOf(configArr[2])); + if(StringUtils.isNotBlank(configArr[4])){ + commConfigDTO.setInterval(Long.valueOf(configArr[4])); + } + if(StringUtils.isNotBlank(configArr[5])){ + commConfigDTO.setTimes(Long.valueOf(configArr[5])); + } + if(StringUtils.isNotBlank(content.split(",", 8)[6])) + commConfigDTO.setIp(content.split(",", 8)[6]); + if(StringUtils.isNotBlank(content.split(",",8)[7])) + commConfigDTO.setPort(Long.valueOf(content.split(",", 8)[7])); redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index a0a177d..525d9df 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -105,9 +105,11 @@ dto.setRetryTimes(configItems[2]); dto.setPercent(null != configItems[3] ? Float.valueOf(configItems[3]) : null); - if (configItems.length == 6) { - dto.setIp(configItems[4]); - dto.setPort(configItems[5]); + dto.setCollectInterval(configItems[4]); + dto.setCollectCount(configItems[5]); + if (configItems.length == 8) { + dto.setIp(configItems[6]); + dto.setPort(configItems[7]); } dto.setPercentExp(dto.getPercent()); } @@ -159,9 +161,11 @@ } busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig.setFramecontent(framecontent); save(busConfig); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -195,9 +199,11 @@ busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO))); busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Liquid.getIndex())); BusConfig busConfig1 = new BusConfig(busConfigDTO); - String framecontent = busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," - + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + "," - + busConfigDTO.getPort(); + String framecontent = + busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + "," + + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + + busConfigDTO.getIp() + "," + busConfigDTO.getPort(); busConfig1.setFramecontent(framecontent); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); @@ -264,7 +270,7 @@ if (0 == busConfigDTOList.get(i).getPercent()) { stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，报警阈值必填且小数位最多保留2位"); + stringMap.put("msg", "第" + (i + 2) + "行，报警阈值%必填且小数位最多保留2位"); return stringMap; } else if (!RegUtil.isDecimal2(String.valueOf(busConfigDTOList.get(i).getPercent()))) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index f626ab7..97a8131 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -151,7 +151,7 @@ + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getThreshold() + "," + busConfigDTO.getSleepStartTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数、阈值、睡眠开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); Device device = iDeviceService.getById(busConfigDTO.getDeviceId()); if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 9e6929e..2f8dc74 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index 860a67b..52ff667 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -136,7 +136,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java index 1a9bb6e..4aa661a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusKadConfigServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.system.dao.BusConfigMapper; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.dto.ExcelModel.KadConfigExportDTO; import com.casic.missiles.modular.system.model.BusConfig; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.redis.RedisPublisherUtil; @@ -152,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.KAD.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -305,6 +306,8 @@ @Override public void exp(List busConfigDTOList, HttpServletResponse response) { + List configExportDTOList = new ArrayList<>(); + FileInputStream fis = null; try { response.setContentType("application/octet-stream"); @@ -318,22 +321,22 @@ var.put("list", new ArrayList() { { for (int i = 0; i < busConfigDTOList.size(); i++) { - BusConfigDTO busConfigDTO = busConfigDTOList.get(i); + KadConfigExportDTO configExportDTO = new KadConfigExportDTO(busConfigDTOList.get(i)); + configExportDTOList.add(configExportDTO); add(new HashMap() { { - put("设备编号", busConfigDTO.getDevcode()); - put("重传次数", busConfigDTO.getRetryTimes()); - put("采集间隔", busConfigDTO.getCollectInterval()); - put("上传周期", busConfigDTO.getUploadPeriod()); - put("IP地址", busConfigDTO.getIp()); - put("端口", busConfigDTO.getPort()); - put("最大尝试次数", busConfigDTO.getAttemptsMax()); - put("已尝试次数", busConfigDTO.getAttemptsCurrent()); - put("端口号", "port"); - put("低报报警阈值", busConfigDTO.getLowerThreshold()); - put("高报报警阈值", busConfigDTO.getUpperThreshold()); - put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发"); - put("创建时间", busConfigDTO.getWritetime()); + put("设备编号", configExportDTO.getDevcode()); + put("重传次数", configExportDTO.getRetryTimes()); + put("采集间隔", configExportDTO.getCollectInterval()); + put("上传周期", configExportDTO.getUploadPeriod()); + put("IP地址", configExportDTO.getIp()); + put("端口", configExportDTO.getPort()); + put("最大尝试次数", configExportDTO.getAttemptsMax()); + put("已尝试次数", configExportDTO.getAttemptsCurrent()); + put("低报报警阈值", configExportDTO.getLowerThreshold()); + put("高报报警阈值", configExportDTO.getUpperThreshold()); + put("下发状态", configExportDTO.getStatusName()); + put("创建时间", configExportDTO.getWritetime()); } }); } @@ -341,7 +344,7 @@ }); //输出模板 //TODO 导出类设置 - exportService.exportExcel(response, BusConfigDTO.class, busConfigDTOList, "导出文件"); + exportService.exportExcel(response, KadConfigExportDTO.class, configExportDTOList, "导出文件"); } catch (Exception e) { e.printStackTrace(); } finally { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 3713c00..2987fda 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Methane.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); @@ -223,7 +223,7 @@ }else { if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ stringMap.put("success", false); - stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不能小于5"); return stringMap; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 046bf4e..8fc6a2d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getCollectTime() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集时间、采集间隔、采集次数、重传次数 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); // Device device = iDeviceService.selectById(busConfigDTO.getDeviceId()); // if (device != null) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java index 13eb940..9a635f4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusPressConfigServiceImpl.java @@ -153,7 +153,7 @@ + (ObjectUtil.isNotEmpty(busConfigDTO.getIp())?busConfigDTO.getIp():"") + "," + (ObjectUtil.isNotEmpty(busConfigDTO.getPort())?busConfigDTO.getPort():"") + "," + busConfigDTO.getLowerThreshold() + "," + busConfigDTO.getUpperThreshold();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.PRESS.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 994e825..d28a498 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -146,7 +146,7 @@ String str = busConfigDTO.getCollectInterval() + "," + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectCount() + "," + busConfigDTO.getCollectTime() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照采集间隔、重传次数、采集次数、采集开始时间 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.TempHumi.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 77f78cb..575e393 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -145,7 +145,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Tube.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java index 3475266..bd6640d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Well.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java index 28fcf31..a537435 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java @@ -133,7 +133,7 @@ String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + "," + busConfigDTO.getUploadPeriod() + "," + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期 - busConfig1.setFramecontent(str); + busConfig1.setFramecontent(str.replaceAll("null","")); save(busConfig1); String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.LG.toString(), busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java index cbe9526..fa30b49 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java @@ -27,6 +27,7 @@ @Resource private AbstractPermissionContext service; + @Transactional @Override public DeptPermission selectDeptPermission(Long deptId) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index 0695eee..d73efb6 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -66,7 +66,7 @@ @ExcelProperty("报警阈值") private float threshold; /** - * 井深百分比 + * 报警阈值（%） */ @ExcelProperty("报警阈值（%）") private float percent; @@ -136,16 +136,16 @@ * sensorId */ private String sensorId; -// /** -// * 低报报警阈值 -// */ -// @ExcelProperty("低报报警阈值") -// private String lowerThreshold; -// /** -// * 高报报警阈值 -// */ -// @ExcelProperty("高报报警阈值") -// private String upperThreshold; + /** + * 低报报警阈值 + */ + @ExcelProperty("低报报警阈值") + private String lowerThreshold; + /** + * 高报报警阈值 + */ + @ExcelProperty("高报报警阈值") + private String upperThreshold; /** * 创建时间 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java index 72ca1de..4162af9 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.casic.missiles.modular.system.dto.BusConfigDTO; import lombok.Data; import org.springframework.stereotype.Component; @@ -29,16 +30,41 @@ private String ip; @ExcelProperty("端口号") private String port; - @ExcelProperty("最大尝试次数") - private String attemptsMax; @ExcelProperty("采集间隔（分）") private String collectInterval; @ExcelProperty("上传周期（分）") private String uploadPeriod; - + @ExcelProperty("重传次数") + private String retryTimes; @ExcelProperty("低报报警阈值") private String lowerThreshold; @ExcelProperty("高报报警阈值") private String upperThreshold; + @ExcelProperty("已尝试次数") + private String attemptsCurrent; + @ExcelProperty("最大尝试次数") + private String attemptsMax; + @ExcelProperty("下发状态") + private String statusName; + private String writetime; + public KadConfigExportDTO() { + } + + public KadConfigExportDTO(BusConfigDTO busConfigDTO) { + + this.devcode = busConfigDTO.getDevcode(); + this.retryTimes = busConfigDTO.getRetryTimes(); + this.collectInterval = busConfigDTO.getCollectInterval(); + this.uploadPeriod = busConfigDTO.getUploadPeriod(); + this.ip = busConfigDTO.getIp(); + this.port =busConfigDTO.getPort(); + this.attemptsCurrent=busConfigDTO.getAttemptsCurrent(); + this.attemptsMax=busConfigDTO.getAttemptsMax(); + this.lowerThreshold=busConfigDTO.getLowerThreshold(); + this.upperThreshold=busConfigDTO.getUpperThreshold(); + this.writetime=busConfigDTO.getWritetime(); + this.statusName="1".equals(busConfigDTO.getStatus())?"已下发":"未下发"; + + } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index e68c8ab..5a8bc03 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -76,6 +76,9 @@ @TableField("AREA") private String area; + @TableField(exist = false) + private String areaName; + /** * 区域 */ diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java index a8cd989..3211431 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java @@ -58,6 +58,8 @@ * 默认城市区划 */ private String area; + @TableField(exist = false) + private String areaName; /** * 使用地图（0百度，1高德，2arcgis） */ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java index 6f76952..f5b87ed 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java @@ -41,6 +41,8 @@ String getAreaPId(@Param("id") Long id); + String getAreaName(@Param("id") Long id); + List getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid); void updateBatchBfcf(@Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("deptIds") List deptIds); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index a9a12cf..9238827 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -228,6 +228,12 @@ WHERE a.id = #{id} + + - UPDATE bus_well_info SET bfzt = #{bfzt} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java index 5ba92d3..64e8f59 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java @@ -44,6 +44,8 @@ String getAreaPid(Long id); + String getAreaName(Long id); + Integer armingById(Long id,String bfzt); void updateBatchBfcf(String keywords, String wellType, String deptid, String bfzt, List deptIds); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java index ac2f2a0..484c0d8 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java @@ -77,6 +77,7 @@ well.setDeptName(service.getDeptService().getDeptName(well.getDeptid())); well.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, well.getBfzt())); well.setQu(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaPid(Long.valueOf(well.getArea()))); + well.setAreaName(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaName(Long.valueOf(well.getArea()))); well.setResponsibleDeptName(service.getDeptService().getDeptName(Long.valueOf(well.getResponsibleDept()))); }); return list; @@ -247,6 +248,12 @@ return this.baseMapper.getAreaPId(id); } + + @Override + public String getAreaName(Long id) { + return this.baseMapper.getAreaName(id); + } + @Override @Transactional public void updateBatchBfcf(String keywords, String wellType, String deptid, String bfzt, List deptIds) { diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 977448f..6f9eec4 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -31,7 +31,7 @@ casic: kaptcha-open: false #是否开启登录时验证码 (true/false) #kaptcha-open: false #是否开启登录时验证码 (true/false) - no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/webjars/**,/swagger-resources/** + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/webjars/**,/swagger-resources/**,/websocket/* db: init: enable: false diff --git a/casic-web/src/main/resources/config/temp/config_template.xlsx b/casic-web/src/main/resources/config/temp/config_template.xlsx index 3af0e2b..06fefe1 100644 --- a/casic-web/src/main/resources/config/temp/config_template.xlsx +++ b/casic-web/src/main/resources/config/temp/config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/tube_config_template.xlsx b/casic-web/src/main/resources/config/temp/tube_config_template.xlsx new file mode 100644 index 0000000..830059b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/tube_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/wellcover_config_template.xlsx b/casic-web/src/main/resources/config/temp/wellcover_config_template.xlsx new file mode 100644 index 0000000..830059b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/wellcover_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/wellliquid_config_template.xlsx b/casic-web/src/main/resources/config/temp/wellliquid_config_template.xlsx new file mode 100644 index 0000000..830059b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/wellliquid_config_template.xlsx Binary files differ