diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index cc153cb..dbe1b00 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -48,7 +48,7 @@ } @Cacheable(value = "CONSTANT", key = "'alarmContent-'+#sName") - public int getAlarmContentByName(String sName) { + public Integer getAlarmContentByName(String sName) { return sysDictMapper.getAlarmContentByName(sName); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index cc153cb..dbe1b00 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -48,7 +48,7 @@ } @Cacheable(value = "CONSTANT", key = "'alarmContent-'+#sName") - public int getAlarmContentByName(String sName) { + public Integer getAlarmContentByName(String sName) { return sysDictMapper.getAlarmContentByName(sName); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 41ef398..5dcebf1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -210,7 +211,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); - map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { @@ -368,11 +369,10 @@ , HttpServletResponse httpServletResponse) throws IOException { Page> page = PageFactory.defaultPage(); - page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); + page.setCurrent(1); page.setSearchCount(false); - page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -405,7 +405,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.get("staff").toString()); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index cc153cb..dbe1b00 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -48,7 +48,7 @@ } @Cacheable(value = "CONSTANT", key = "'alarmContent-'+#sName") - public int getAlarmContentByName(String sName) { + public Integer getAlarmContentByName(String sName) { return sysDictMapper.getAlarmContentByName(sName); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 41ef398..5dcebf1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -210,7 +211,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); - map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { @@ -368,11 +369,10 @@ , HttpServletResponse httpServletResponse) throws IOException { Page> page = PageFactory.defaultPage(); - page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); + page.setCurrent(1); page.setSearchCount(false); - page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -405,7 +405,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.get("staff").toString()); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java new file mode 100644 index 0000000..8af0e15 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; +import java.util.Map; + +public enum DeviceDataFieldTableEnum { + + TABLE_FIELD(new HashMap() { + { + put("data_dig", "UPTIME AS lastDataTs,timestampdiff(DAY,bds.last_data_ts,now()) AS offlineDays"); + put("data_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gas_dector", "gas_sample_value AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_harmful_gas", "CONCAT(CO, ', ', CH4, ', ', H2S, ', ', O2) AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_hydrant", "0 AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_noise", "ddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_hum", "CONCAT(TEMPERATURE, ', ', HUMIDITY) AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_tube", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover", "descn AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_press", "press AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pantilt", "concentration AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover_loca", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellplus", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_h2s", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pressure", "re_val AS dataValue,devcode AS devcode,'' AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + } + }); + public Map tableNameMap; + + DeviceDataFieldTableEnum(Map tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public Map getTableFieldMap() { + return tableNameMap; + } +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index cc153cb..dbe1b00 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -48,7 +48,7 @@ } @Cacheable(value = "CONSTANT", key = "'alarmContent-'+#sName") - public int getAlarmContentByName(String sName) { + public Integer getAlarmContentByName(String sName) { return sysDictMapper.getAlarmContentByName(sName); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 41ef398..5dcebf1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -210,7 +211,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); - map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { @@ -368,11 +369,10 @@ , HttpServletResponse httpServletResponse) throws IOException { Page> page = PageFactory.defaultPage(); - page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); + page.setCurrent(1); page.setSearchCount(false); - page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -405,7 +405,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.get("staff").toString()); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java new file mode 100644 index 0000000..8af0e15 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; +import java.util.Map; + +public enum DeviceDataFieldTableEnum { + + TABLE_FIELD(new HashMap() { + { + put("data_dig", "UPTIME AS lastDataTs,timestampdiff(DAY,bds.last_data_ts,now()) AS offlineDays"); + put("data_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gas_dector", "gas_sample_value AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_harmful_gas", "CONCAT(CO, ', ', CH4, ', ', H2S, ', ', O2) AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_hydrant", "0 AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_noise", "ddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_hum", "CONCAT(TEMPERATURE, ', ', HUMIDITY) AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_tube", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover", "descn AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_press", "press AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pantilt", "concentration AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover_loca", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellplus", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_h2s", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pressure", "re_val AS dataValue,devcode AS devcode,'' AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + } + }); + public Map tableNameMap; + + DeviceDataFieldTableEnum(Map tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public Map getTableFieldMap() { + return tableNameMap; + } +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java new file mode 100644 index 0000000..7a33eaf --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java @@ -0,0 +1,81 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; + +/** + * @author cz + * @date 2022-7-15 + * 上传数据总记录数 + */ +public enum DeviceDataTableEnum { + + DATA_DIG("data_dig", "开挖监测仪"), + DATA_GAS("data_gas", "燃气智能监测终端"), + DATA_GASLIQUID("data_gasliquid_gas,data_gasliquid_liquid", "燃气智能监测终端(一体化)"), + DATA_GAS_DECTOR("data_gas_dector", "燃气探测仪"), + DATA_HARMFUL_GAS("data_harmful_gas", "有害气体监测仪"), + DATA_HYDRANT("data_hydrant", "消防栓防盗水监测仪"), + DATA_LIQUID("data_liquid", "液位监测仪"), + DATA_NOISE("data_noise", "噪声记录仪"), + DATA_PANTILT("data_pantilt", "激光甲烷云台"), + DATA_TEMP_HUM("data_temp_hum", "温湿度监测仪"), + DATA_TUBE("data_tube", "管盯"), + DATA_WELLCOVER("data_wellcover", "井盖状态监测仪"), + DATA_TEMP_PRESS("data_temp_press", "压力温度检测仪"), + DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖定位监测仪"), + DATA_WELLPLUS("data_wellplus", "井盖液位一体机"), + DATA_H2S("data_h2s", "硫化氢检测终端"), + DATA_PRESSURE("data_pressure", "压力检测终端"), + DEVICE_TYPE_TABLE(new HashMap() { + { + put(1, DATA_WELLCOVER); + put(2, DATA_LIQUID); + put(3, DATA_HARMFUL_GAS); + put(4, DATA_GAS); + put(5, DATA_TEMP_HUM); + put(6, DATA_DIG); + put(7, DATA_WELLCOVER_LOCA); + put(8, DATA_NOISE); + put(9, DATA_TEMP_PRESS); + put(10, DATA_GASLIQUID); + put(11, DATA_HYDRANT); + put(12, DATA_TUBE); + put(13, DATA_WELLPLUS); + put(14, DATA_H2S); + put(21, DATA_PANTILT); + put(22, DATA_H2S); + put(23, DATA_GAS); + put(24, DATA_TEMP_PRESS); + put(101, DATA_GAS_DECTOR); + } + }); + + String typeName; + String tableName; + + DeviceDataTableEnum(String tableName, String typeName) { + this.typeName = typeName; + this.tableName = tableName; + } + + public String getTypeName() { + return typeName; + } + + public String getTableName() { + return tableName; + } + + + public HashMap tableNameMap; + + DeviceDataTableEnum(HashMap tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public HashMap getTableNameMap() { + return tableNameMap; + } + + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index cc153cb..dbe1b00 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -48,7 +48,7 @@ } @Cacheable(value = "CONSTANT", key = "'alarmContent-'+#sName") - public int getAlarmContentByName(String sName) { + public Integer getAlarmContentByName(String sName) { return sysDictMapper.getAlarmContentByName(sName); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 41ef398..5dcebf1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -210,7 +211,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); - map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { @@ -368,11 +369,10 @@ , HttpServletResponse httpServletResponse) throws IOException { Page> page = PageFactory.defaultPage(); - page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); + page.setCurrent(1); page.setSearchCount(false); - page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -405,7 +405,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.get("staff").toString()); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java new file mode 100644 index 0000000..8af0e15 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; +import java.util.Map; + +public enum DeviceDataFieldTableEnum { + + TABLE_FIELD(new HashMap() { + { + put("data_dig", "UPTIME AS lastDataTs,timestampdiff(DAY,bds.last_data_ts,now()) AS offlineDays"); + put("data_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gas_dector", "gas_sample_value AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_harmful_gas", "CONCAT(CO, ', ', CH4, ', ', H2S, ', ', O2) AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_hydrant", "0 AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_noise", "ddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_hum", "CONCAT(TEMPERATURE, ', ', HUMIDITY) AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_tube", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover", "descn AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_press", "press AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pantilt", "concentration AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover_loca", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellplus", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_h2s", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pressure", "re_val AS dataValue,devcode AS devcode,'' AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + } + }); + public Map tableNameMap; + + DeviceDataFieldTableEnum(Map tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public Map getTableFieldMap() { + return tableNameMap; + } +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java new file mode 100644 index 0000000..7a33eaf --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java @@ -0,0 +1,81 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; + +/** + * @author cz + * @date 2022-7-15 + * 上传数据总记录数 + */ +public enum DeviceDataTableEnum { + + DATA_DIG("data_dig", "开挖监测仪"), + DATA_GAS("data_gas", "燃气智能监测终端"), + DATA_GASLIQUID("data_gasliquid_gas,data_gasliquid_liquid", "燃气智能监测终端(一体化)"), + DATA_GAS_DECTOR("data_gas_dector", "燃气探测仪"), + DATA_HARMFUL_GAS("data_harmful_gas", "有害气体监测仪"), + DATA_HYDRANT("data_hydrant", "消防栓防盗水监测仪"), + DATA_LIQUID("data_liquid", "液位监测仪"), + DATA_NOISE("data_noise", "噪声记录仪"), + DATA_PANTILT("data_pantilt", "激光甲烷云台"), + DATA_TEMP_HUM("data_temp_hum", "温湿度监测仪"), + DATA_TUBE("data_tube", "管盯"), + DATA_WELLCOVER("data_wellcover", "井盖状态监测仪"), + DATA_TEMP_PRESS("data_temp_press", "压力温度检测仪"), + DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖定位监测仪"), + DATA_WELLPLUS("data_wellplus", "井盖液位一体机"), + DATA_H2S("data_h2s", "硫化氢检测终端"), + DATA_PRESSURE("data_pressure", "压力检测终端"), + DEVICE_TYPE_TABLE(new HashMap() { + { + put(1, DATA_WELLCOVER); + put(2, DATA_LIQUID); + put(3, DATA_HARMFUL_GAS); + put(4, DATA_GAS); + put(5, DATA_TEMP_HUM); + put(6, DATA_DIG); + put(7, DATA_WELLCOVER_LOCA); + put(8, DATA_NOISE); + put(9, DATA_TEMP_PRESS); + put(10, DATA_GASLIQUID); + put(11, DATA_HYDRANT); + put(12, DATA_TUBE); + put(13, DATA_WELLPLUS); + put(14, DATA_H2S); + put(21, DATA_PANTILT); + put(22, DATA_H2S); + put(23, DATA_GAS); + put(24, DATA_TEMP_PRESS); + put(101, DATA_GAS_DECTOR); + } + }); + + String typeName; + String tableName; + + DeviceDataTableEnum(String tableName, String typeName) { + this.typeName = typeName; + this.tableName = tableName; + } + + public String getTypeName() { + return typeName; + } + + public String getTableName() { + return tableName; + } + + + public HashMap tableNameMap; + + DeviceDataTableEnum(HashMap tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public HashMap getTableNameMap() { + return tableNameMap; + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 5f73387..b1258a9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -560,13 +560,13 @@ List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (dValue <= 20.0) { - deviceDataExcelDto.setLiquiddata(dValue + "%LEL"); + deviceDataExcelDto.setStrength(dValue + "%LEL"); } else { DecimalFormat df = new DecimalFormat("0.00"); dValue = dValue / 20.0; - deviceDataExcelDto.setLiquiddata(df.format(dValue) + "%VOL"); + deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL"); } } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index cc153cb..dbe1b00 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -48,7 +48,7 @@ } @Cacheable(value = "CONSTANT", key = "'alarmContent-'+#sName") - public int getAlarmContentByName(String sName) { + public Integer getAlarmContentByName(String sName) { return sysDictMapper.getAlarmContentByName(sName); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 41ef398..5dcebf1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -210,7 +211,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); - map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { @@ -368,11 +369,10 @@ , HttpServletResponse httpServletResponse) throws IOException { Page> page = PageFactory.defaultPage(); - page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); + page.setCurrent(1); page.setSearchCount(false); - page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -405,7 +405,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.get("staff").toString()); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java new file mode 100644 index 0000000..8af0e15 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; +import java.util.Map; + +public enum DeviceDataFieldTableEnum { + + TABLE_FIELD(new HashMap() { + { + put("data_dig", "UPTIME AS lastDataTs,timestampdiff(DAY,bds.last_data_ts,now()) AS offlineDays"); + put("data_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gas_dector", "gas_sample_value AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_harmful_gas", "CONCAT(CO, ', ', CH4, ', ', H2S, ', ', O2) AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_hydrant", "0 AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_noise", "ddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_hum", "CONCAT(TEMPERATURE, ', ', HUMIDITY) AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_tube", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover", "descn AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_press", "press AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pantilt", "concentration AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover_loca", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellplus", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_h2s", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pressure", "re_val AS dataValue,devcode AS devcode,'' AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + } + }); + public Map tableNameMap; + + DeviceDataFieldTableEnum(Map tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public Map getTableFieldMap() { + return tableNameMap; + } +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java new file mode 100644 index 0000000..7a33eaf --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java @@ -0,0 +1,81 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; + +/** + * @author cz + * @date 2022-7-15 + * 上传数据总记录数 + */ +public enum DeviceDataTableEnum { + + DATA_DIG("data_dig", "开挖监测仪"), + DATA_GAS("data_gas", "燃气智能监测终端"), + DATA_GASLIQUID("data_gasliquid_gas,data_gasliquid_liquid", "燃气智能监测终端(一体化)"), + DATA_GAS_DECTOR("data_gas_dector", "燃气探测仪"), + DATA_HARMFUL_GAS("data_harmful_gas", "有害气体监测仪"), + DATA_HYDRANT("data_hydrant", "消防栓防盗水监测仪"), + DATA_LIQUID("data_liquid", "液位监测仪"), + DATA_NOISE("data_noise", "噪声记录仪"), + DATA_PANTILT("data_pantilt", "激光甲烷云台"), + DATA_TEMP_HUM("data_temp_hum", "温湿度监测仪"), + DATA_TUBE("data_tube", "管盯"), + DATA_WELLCOVER("data_wellcover", "井盖状态监测仪"), + DATA_TEMP_PRESS("data_temp_press", "压力温度检测仪"), + DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖定位监测仪"), + DATA_WELLPLUS("data_wellplus", "井盖液位一体机"), + DATA_H2S("data_h2s", "硫化氢检测终端"), + DATA_PRESSURE("data_pressure", "压力检测终端"), + DEVICE_TYPE_TABLE(new HashMap() { + { + put(1, DATA_WELLCOVER); + put(2, DATA_LIQUID); + put(3, DATA_HARMFUL_GAS); + put(4, DATA_GAS); + put(5, DATA_TEMP_HUM); + put(6, DATA_DIG); + put(7, DATA_WELLCOVER_LOCA); + put(8, DATA_NOISE); + put(9, DATA_TEMP_PRESS); + put(10, DATA_GASLIQUID); + put(11, DATA_HYDRANT); + put(12, DATA_TUBE); + put(13, DATA_WELLPLUS); + put(14, DATA_H2S); + put(21, DATA_PANTILT); + put(22, DATA_H2S); + put(23, DATA_GAS); + put(24, DATA_TEMP_PRESS); + put(101, DATA_GAS_DECTOR); + } + }); + + String typeName; + String tableName; + + DeviceDataTableEnum(String tableName, String typeName) { + this.typeName = typeName; + this.tableName = tableName; + } + + public String getTypeName() { + return typeName; + } + + public String getTableName() { + return tableName; + } + + + public HashMap tableNameMap; + + DeviceDataTableEnum(HashMap tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public HashMap getTableNameMap() { + return tableNameMap; + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 5f73387..b1258a9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -560,13 +560,13 @@ List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (dValue <= 20.0) { - deviceDataExcelDto.setLiquiddata(dValue + "%LEL"); + deviceDataExcelDto.setStrength(dValue + "%LEL"); } else { DecimalFormat df = new DecimalFormat("0.00"); dValue = dValue / 20.0; - deviceDataExcelDto.setLiquiddata(df.format(dValue) + "%VOL"); + deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL"); } } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index ee33ee4..4e439ae 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -36,10 +36,10 @@ * 第三方燃气列表 */ @RequestMapping("/gasdector/list-page") - public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getGasDectorListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -48,17 +48,17 @@ * 第三方燃气导出 */ @RequestMapping("/gasdector/export") - public void getGasDectorExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getGasDectorExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(GasDectorDataDto.class, page.getRecords(), DeviceExportEnum.GASDATA_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } @@ -66,10 +66,10 @@ * 第三方甲烷列表 */ @RequestMapping("/pantilt/list-page") - public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getPantiltDataListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -78,17 +78,17 @@ * 第三方甲烷导出 */ @RequestMapping("/pantilt/export") - public void getPantiltDataExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getPantiltDataExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(PantiltDataDto.class, page.getRecords(), DeviceExportEnum.METHANE_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index cc153cb..dbe1b00 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -48,7 +48,7 @@ } @Cacheable(value = "CONSTANT", key = "'alarmContent-'+#sName") - public int getAlarmContentByName(String sName) { + public Integer getAlarmContentByName(String sName) { return sysDictMapper.getAlarmContentByName(sName); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 41ef398..5dcebf1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -210,7 +211,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); - map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { @@ -368,11 +369,10 @@ , HttpServletResponse httpServletResponse) throws IOException { Page> page = PageFactory.defaultPage(); - page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); + page.setCurrent(1); page.setSearchCount(false); - page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -405,7 +405,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.get("staff").toString()); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java new file mode 100644 index 0000000..8af0e15 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; +import java.util.Map; + +public enum DeviceDataFieldTableEnum { + + TABLE_FIELD(new HashMap() { + { + put("data_dig", "UPTIME AS lastDataTs,timestampdiff(DAY,bds.last_data_ts,now()) AS offlineDays"); + put("data_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gas_dector", "gas_sample_value AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_harmful_gas", "CONCAT(CO, ', ', CH4, ', ', H2S, ', ', O2) AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_hydrant", "0 AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_noise", "ddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_hum", "CONCAT(TEMPERATURE, ', ', HUMIDITY) AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_tube", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover", "descn AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_press", "press AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pantilt", "concentration AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover_loca", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellplus", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_h2s", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pressure", "re_val AS dataValue,devcode AS devcode,'' AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + } + }); + public Map tableNameMap; + + DeviceDataFieldTableEnum(Map tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public Map getTableFieldMap() { + return tableNameMap; + } +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java new file mode 100644 index 0000000..7a33eaf --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java @@ -0,0 +1,81 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; + +/** + * @author cz + * @date 2022-7-15 + * 上传数据总记录数 + */ +public enum DeviceDataTableEnum { + + DATA_DIG("data_dig", "开挖监测仪"), + DATA_GAS("data_gas", "燃气智能监测终端"), + DATA_GASLIQUID("data_gasliquid_gas,data_gasliquid_liquid", "燃气智能监测终端(一体化)"), + DATA_GAS_DECTOR("data_gas_dector", "燃气探测仪"), + DATA_HARMFUL_GAS("data_harmful_gas", "有害气体监测仪"), + DATA_HYDRANT("data_hydrant", "消防栓防盗水监测仪"), + DATA_LIQUID("data_liquid", "液位监测仪"), + DATA_NOISE("data_noise", "噪声记录仪"), + DATA_PANTILT("data_pantilt", "激光甲烷云台"), + DATA_TEMP_HUM("data_temp_hum", "温湿度监测仪"), + DATA_TUBE("data_tube", "管盯"), + DATA_WELLCOVER("data_wellcover", "井盖状态监测仪"), + DATA_TEMP_PRESS("data_temp_press", "压力温度检测仪"), + DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖定位监测仪"), + DATA_WELLPLUS("data_wellplus", "井盖液位一体机"), + DATA_H2S("data_h2s", "硫化氢检测终端"), + DATA_PRESSURE("data_pressure", "压力检测终端"), + DEVICE_TYPE_TABLE(new HashMap() { + { + put(1, DATA_WELLCOVER); + put(2, DATA_LIQUID); + put(3, DATA_HARMFUL_GAS); + put(4, DATA_GAS); + put(5, DATA_TEMP_HUM); + put(6, DATA_DIG); + put(7, DATA_WELLCOVER_LOCA); + put(8, DATA_NOISE); + put(9, DATA_TEMP_PRESS); + put(10, DATA_GASLIQUID); + put(11, DATA_HYDRANT); + put(12, DATA_TUBE); + put(13, DATA_WELLPLUS); + put(14, DATA_H2S); + put(21, DATA_PANTILT); + put(22, DATA_H2S); + put(23, DATA_GAS); + put(24, DATA_TEMP_PRESS); + put(101, DATA_GAS_DECTOR); + } + }); + + String typeName; + String tableName; + + DeviceDataTableEnum(String tableName, String typeName) { + this.typeName = typeName; + this.tableName = tableName; + } + + public String getTypeName() { + return typeName; + } + + public String getTableName() { + return tableName; + } + + + public HashMap tableNameMap; + + DeviceDataTableEnum(HashMap tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public HashMap getTableNameMap() { + return tableNameMap; + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 5f73387..b1258a9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -560,13 +560,13 @@ List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (dValue <= 20.0) { - deviceDataExcelDto.setLiquiddata(dValue + "%LEL"); + deviceDataExcelDto.setStrength(dValue + "%LEL"); } else { DecimalFormat df = new DecimalFormat("0.00"); dValue = dValue / 20.0; - deviceDataExcelDto.setLiquiddata(df.format(dValue) + "%VOL"); + deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL"); } } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index ee33ee4..4e439ae 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -36,10 +36,10 @@ * 第三方燃气列表 */ @RequestMapping("/gasdector/list-page") - public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getGasDectorListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -48,17 +48,17 @@ * 第三方燃气导出 */ @RequestMapping("/gasdector/export") - public void getGasDectorExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getGasDectorExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(GasDectorDataDto.class, page.getRecords(), DeviceExportEnum.GASDATA_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } @@ -66,10 +66,10 @@ * 第三方甲烷列表 */ @RequestMapping("/pantilt/list-page") - public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getPantiltDataListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -78,17 +78,17 @@ * 第三方甲烷导出 */ @RequestMapping("/pantilt/export") - public void getPantiltDataExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getPantiltDataExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(PantiltDataDto.class, page.getRecords(), DeviceExportEnum.METHANE_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 1aaa281..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -519,9 +519,9 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { - deviceDataExcelDto.setLiquiddata("正常水位"); + deviceDataExcelDto.setStrength("正常水位"); } } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index cc153cb..dbe1b00 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -48,7 +48,7 @@ } @Cacheable(value = "CONSTANT", key = "'alarmContent-'+#sName") - public int getAlarmContentByName(String sName) { + public Integer getAlarmContentByName(String sName) { return sysDictMapper.getAlarmContentByName(sName); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 41ef398..5dcebf1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -210,7 +211,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); - map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { @@ -368,11 +369,10 @@ , HttpServletResponse httpServletResponse) throws IOException { Page> page = PageFactory.defaultPage(); - page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); + page.setCurrent(1); page.setSearchCount(false); - page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -405,7 +405,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.get("staff").toString()); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java new file mode 100644 index 0000000..8af0e15 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; +import java.util.Map; + +public enum DeviceDataFieldTableEnum { + + TABLE_FIELD(new HashMap() { + { + put("data_dig", "UPTIME AS lastDataTs,timestampdiff(DAY,bds.last_data_ts,now()) AS offlineDays"); + put("data_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gas_dector", "gas_sample_value AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_harmful_gas", "CONCAT(CO, ', ', CH4, ', ', H2S, ', ', O2) AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_hydrant", "0 AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_noise", "ddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_hum", "CONCAT(TEMPERATURE, ', ', HUMIDITY) AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_tube", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover", "descn AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_press", "press AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pantilt", "concentration AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover_loca", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellplus", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_h2s", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pressure", "re_val AS dataValue,devcode AS devcode,'' AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + } + }); + public Map tableNameMap; + + DeviceDataFieldTableEnum(Map tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public Map getTableFieldMap() { + return tableNameMap; + } +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java new file mode 100644 index 0000000..7a33eaf --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java @@ -0,0 +1,81 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; + +/** + * @author cz + * @date 2022-7-15 + * 上传数据总记录数 + */ +public enum DeviceDataTableEnum { + + DATA_DIG("data_dig", "开挖监测仪"), + DATA_GAS("data_gas", "燃气智能监测终端"), + DATA_GASLIQUID("data_gasliquid_gas,data_gasliquid_liquid", "燃气智能监测终端(一体化)"), + DATA_GAS_DECTOR("data_gas_dector", "燃气探测仪"), + DATA_HARMFUL_GAS("data_harmful_gas", "有害气体监测仪"), + DATA_HYDRANT("data_hydrant", "消防栓防盗水监测仪"), + DATA_LIQUID("data_liquid", "液位监测仪"), + DATA_NOISE("data_noise", "噪声记录仪"), + DATA_PANTILT("data_pantilt", "激光甲烷云台"), + DATA_TEMP_HUM("data_temp_hum", "温湿度监测仪"), + DATA_TUBE("data_tube", "管盯"), + DATA_WELLCOVER("data_wellcover", "井盖状态监测仪"), + DATA_TEMP_PRESS("data_temp_press", "压力温度检测仪"), + DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖定位监测仪"), + DATA_WELLPLUS("data_wellplus", "井盖液位一体机"), + DATA_H2S("data_h2s", "硫化氢检测终端"), + DATA_PRESSURE("data_pressure", "压力检测终端"), + DEVICE_TYPE_TABLE(new HashMap() { + { + put(1, DATA_WELLCOVER); + put(2, DATA_LIQUID); + put(3, DATA_HARMFUL_GAS); + put(4, DATA_GAS); + put(5, DATA_TEMP_HUM); + put(6, DATA_DIG); + put(7, DATA_WELLCOVER_LOCA); + put(8, DATA_NOISE); + put(9, DATA_TEMP_PRESS); + put(10, DATA_GASLIQUID); + put(11, DATA_HYDRANT); + put(12, DATA_TUBE); + put(13, DATA_WELLPLUS); + put(14, DATA_H2S); + put(21, DATA_PANTILT); + put(22, DATA_H2S); + put(23, DATA_GAS); + put(24, DATA_TEMP_PRESS); + put(101, DATA_GAS_DECTOR); + } + }); + + String typeName; + String tableName; + + DeviceDataTableEnum(String tableName, String typeName) { + this.typeName = typeName; + this.tableName = tableName; + } + + public String getTypeName() { + return typeName; + } + + public String getTableName() { + return tableName; + } + + + public HashMap tableNameMap; + + DeviceDataTableEnum(HashMap tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public HashMap getTableNameMap() { + return tableNameMap; + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 5f73387..b1258a9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -560,13 +560,13 @@ List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (dValue <= 20.0) { - deviceDataExcelDto.setLiquiddata(dValue + "%LEL"); + deviceDataExcelDto.setStrength(dValue + "%LEL"); } else { DecimalFormat df = new DecimalFormat("0.00"); dValue = dValue / 20.0; - deviceDataExcelDto.setLiquiddata(df.format(dValue) + "%VOL"); + deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL"); } } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index ee33ee4..4e439ae 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -36,10 +36,10 @@ * 第三方燃气列表 */ @RequestMapping("/gasdector/list-page") - public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getGasDectorListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -48,17 +48,17 @@ * 第三方燃气导出 */ @RequestMapping("/gasdector/export") - public void getGasDectorExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getGasDectorExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(GasDectorDataDto.class, page.getRecords(), DeviceExportEnum.GASDATA_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } @@ -66,10 +66,10 @@ * 第三方甲烷列表 */ @RequestMapping("/pantilt/list-page") - public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getPantiltDataListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -78,17 +78,17 @@ * 第三方甲烷导出 */ @RequestMapping("/pantilt/export") - public void getPantiltDataExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getPantiltDataExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(PantiltDataDto.class, page.getRecords(), DeviceExportEnum.METHANE_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 1aaa281..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -519,9 +519,9 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { - deviceDataExcelDto.setLiquiddata("正常水位"); + deviceDataExcelDto.setStrength("正常水位"); } } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 2b665fa..9959ef3 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -251,8 +251,8 @@ @ResponseBody @Permission @BussinessLog(value = "删除设备信息") - public Object delete(@RequestParam List ids) { - deviceService.deleteByIds(ids); + public Object batchDeletes(@RequestParam List ids) { + deviceService.batchDeletes(ids); return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index cc153cb..dbe1b00 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -48,7 +48,7 @@ } @Cacheable(value = "CONSTANT", key = "'alarmContent-'+#sName") - public int getAlarmContentByName(String sName) { + public Integer getAlarmContentByName(String sName) { return sysDictMapper.getAlarmContentByName(sName); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 41ef398..5dcebf1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -210,7 +211,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); - map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { @@ -368,11 +369,10 @@ , HttpServletResponse httpServletResponse) throws IOException { Page> page = PageFactory.defaultPage(); - page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); + page.setCurrent(1); page.setSearchCount(false); - page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -405,7 +405,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.get("staff").toString()); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java new file mode 100644 index 0000000..8af0e15 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; +import java.util.Map; + +public enum DeviceDataFieldTableEnum { + + TABLE_FIELD(new HashMap() { + { + put("data_dig", "UPTIME AS lastDataTs,timestampdiff(DAY,bds.last_data_ts,now()) AS offlineDays"); + put("data_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gas_dector", "gas_sample_value AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_harmful_gas", "CONCAT(CO, ', ', CH4, ', ', H2S, ', ', O2) AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_hydrant", "0 AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_noise", "ddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_hum", "CONCAT(TEMPERATURE, ', ', HUMIDITY) AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_tube", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover", "descn AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_press", "press AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pantilt", "concentration AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover_loca", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellplus", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_h2s", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pressure", "re_val AS dataValue,devcode AS devcode,'' AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + } + }); + public Map tableNameMap; + + DeviceDataFieldTableEnum(Map tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public Map getTableFieldMap() { + return tableNameMap; + } +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java new file mode 100644 index 0000000..7a33eaf --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java @@ -0,0 +1,81 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; + +/** + * @author cz + * @date 2022-7-15 + * 上传数据总记录数 + */ +public enum DeviceDataTableEnum { + + DATA_DIG("data_dig", "开挖监测仪"), + DATA_GAS("data_gas", "燃气智能监测终端"), + DATA_GASLIQUID("data_gasliquid_gas,data_gasliquid_liquid", "燃气智能监测终端(一体化)"), + DATA_GAS_DECTOR("data_gas_dector", "燃气探测仪"), + DATA_HARMFUL_GAS("data_harmful_gas", "有害气体监测仪"), + DATA_HYDRANT("data_hydrant", "消防栓防盗水监测仪"), + DATA_LIQUID("data_liquid", "液位监测仪"), + DATA_NOISE("data_noise", "噪声记录仪"), + DATA_PANTILT("data_pantilt", "激光甲烷云台"), + DATA_TEMP_HUM("data_temp_hum", "温湿度监测仪"), + DATA_TUBE("data_tube", "管盯"), + DATA_WELLCOVER("data_wellcover", "井盖状态监测仪"), + DATA_TEMP_PRESS("data_temp_press", "压力温度检测仪"), + DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖定位监测仪"), + DATA_WELLPLUS("data_wellplus", "井盖液位一体机"), + DATA_H2S("data_h2s", "硫化氢检测终端"), + DATA_PRESSURE("data_pressure", "压力检测终端"), + DEVICE_TYPE_TABLE(new HashMap() { + { + put(1, DATA_WELLCOVER); + put(2, DATA_LIQUID); + put(3, DATA_HARMFUL_GAS); + put(4, DATA_GAS); + put(5, DATA_TEMP_HUM); + put(6, DATA_DIG); + put(7, DATA_WELLCOVER_LOCA); + put(8, DATA_NOISE); + put(9, DATA_TEMP_PRESS); + put(10, DATA_GASLIQUID); + put(11, DATA_HYDRANT); + put(12, DATA_TUBE); + put(13, DATA_WELLPLUS); + put(14, DATA_H2S); + put(21, DATA_PANTILT); + put(22, DATA_H2S); + put(23, DATA_GAS); + put(24, DATA_TEMP_PRESS); + put(101, DATA_GAS_DECTOR); + } + }); + + String typeName; + String tableName; + + DeviceDataTableEnum(String tableName, String typeName) { + this.typeName = typeName; + this.tableName = tableName; + } + + public String getTypeName() { + return typeName; + } + + public String getTableName() { + return tableName; + } + + + public HashMap tableNameMap; + + DeviceDataTableEnum(HashMap tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public HashMap getTableNameMap() { + return tableNameMap; + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 5f73387..b1258a9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -560,13 +560,13 @@ List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (dValue <= 20.0) { - deviceDataExcelDto.setLiquiddata(dValue + "%LEL"); + deviceDataExcelDto.setStrength(dValue + "%LEL"); } else { DecimalFormat df = new DecimalFormat("0.00"); dValue = dValue / 20.0; - deviceDataExcelDto.setLiquiddata(df.format(dValue) + "%VOL"); + deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL"); } } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index ee33ee4..4e439ae 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -36,10 +36,10 @@ * 第三方燃气列表 */ @RequestMapping("/gasdector/list-page") - public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getGasDectorListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -48,17 +48,17 @@ * 第三方燃气导出 */ @RequestMapping("/gasdector/export") - public void getGasDectorExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getGasDectorExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(GasDectorDataDto.class, page.getRecords(), DeviceExportEnum.GASDATA_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } @@ -66,10 +66,10 @@ * 第三方甲烷列表 */ @RequestMapping("/pantilt/list-page") - public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getPantiltDataListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -78,17 +78,17 @@ * 第三方甲烷导出 */ @RequestMapping("/pantilt/export") - public void getPantiltDataExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getPantiltDataExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(PantiltDataDto.class, page.getRecords(), DeviceExportEnum.METHANE_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 1aaa281..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -519,9 +519,9 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { - deviceDataExcelDto.setLiquiddata("正常水位"); + deviceDataExcelDto.setStrength("正常水位"); } } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 2b665fa..9959ef3 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -251,8 +251,8 @@ @ResponseBody @Permission @BussinessLog(value = "删除设备信息") - public Object delete(@RequestParam List ids) { - deviceService.deleteByIds(ids); + public Object batchDeletes(@RequestParam List ids) { + deviceService.batchDeletes(ids); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index efad32d..1b74128 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -7,6 +7,7 @@ import com.casic.missiles.modular.system.model.Device; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; import java.util.Map; @@ -47,5 +48,6 @@ DeviceDto getDetailById(@Param("id") String id); + Integer logicDelete(@Param("id")Long id,@Param("currentTime") Long currentTime); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index cc153cb..dbe1b00 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -48,7 +48,7 @@ } @Cacheable(value = "CONSTANT", key = "'alarmContent-'+#sName") - public int getAlarmContentByName(String sName) { + public Integer getAlarmContentByName(String sName) { return sysDictMapper.getAlarmContentByName(sName); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 41ef398..5dcebf1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -210,7 +211,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); - map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { @@ -368,11 +369,10 @@ , HttpServletResponse httpServletResponse) throws IOException { Page> page = PageFactory.defaultPage(); - page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); + page.setCurrent(1); page.setSearchCount(false); - page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -405,7 +405,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.get("staff").toString()); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java new file mode 100644 index 0000000..8af0e15 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; +import java.util.Map; + +public enum DeviceDataFieldTableEnum { + + TABLE_FIELD(new HashMap() { + { + put("data_dig", "UPTIME AS lastDataTs,timestampdiff(DAY,bds.last_data_ts,now()) AS offlineDays"); + put("data_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gas_dector", "gas_sample_value AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_harmful_gas", "CONCAT(CO, ', ', CH4, ', ', H2S, ', ', O2) AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_hydrant", "0 AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_noise", "ddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_hum", "CONCAT(TEMPERATURE, ', ', HUMIDITY) AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_tube", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover", "descn AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_press", "press AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pantilt", "concentration AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover_loca", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellplus", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_h2s", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pressure", "re_val AS dataValue,devcode AS devcode,'' AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + } + }); + public Map tableNameMap; + + DeviceDataFieldTableEnum(Map tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public Map getTableFieldMap() { + return tableNameMap; + } +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java new file mode 100644 index 0000000..7a33eaf --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java @@ -0,0 +1,81 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; + +/** + * @author cz + * @date 2022-7-15 + * 上传数据总记录数 + */ +public enum DeviceDataTableEnum { + + DATA_DIG("data_dig", "开挖监测仪"), + DATA_GAS("data_gas", "燃气智能监测终端"), + DATA_GASLIQUID("data_gasliquid_gas,data_gasliquid_liquid", "燃气智能监测终端(一体化)"), + DATA_GAS_DECTOR("data_gas_dector", "燃气探测仪"), + DATA_HARMFUL_GAS("data_harmful_gas", "有害气体监测仪"), + DATA_HYDRANT("data_hydrant", "消防栓防盗水监测仪"), + DATA_LIQUID("data_liquid", "液位监测仪"), + DATA_NOISE("data_noise", "噪声记录仪"), + DATA_PANTILT("data_pantilt", "激光甲烷云台"), + DATA_TEMP_HUM("data_temp_hum", "温湿度监测仪"), + DATA_TUBE("data_tube", "管盯"), + DATA_WELLCOVER("data_wellcover", "井盖状态监测仪"), + DATA_TEMP_PRESS("data_temp_press", "压力温度检测仪"), + DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖定位监测仪"), + DATA_WELLPLUS("data_wellplus", "井盖液位一体机"), + DATA_H2S("data_h2s", "硫化氢检测终端"), + DATA_PRESSURE("data_pressure", "压力检测终端"), + DEVICE_TYPE_TABLE(new HashMap() { + { + put(1, DATA_WELLCOVER); + put(2, DATA_LIQUID); + put(3, DATA_HARMFUL_GAS); + put(4, DATA_GAS); + put(5, DATA_TEMP_HUM); + put(6, DATA_DIG); + put(7, DATA_WELLCOVER_LOCA); + put(8, DATA_NOISE); + put(9, DATA_TEMP_PRESS); + put(10, DATA_GASLIQUID); + put(11, DATA_HYDRANT); + put(12, DATA_TUBE); + put(13, DATA_WELLPLUS); + put(14, DATA_H2S); + put(21, DATA_PANTILT); + put(22, DATA_H2S); + put(23, DATA_GAS); + put(24, DATA_TEMP_PRESS); + put(101, DATA_GAS_DECTOR); + } + }); + + String typeName; + String tableName; + + DeviceDataTableEnum(String tableName, String typeName) { + this.typeName = typeName; + this.tableName = tableName; + } + + public String getTypeName() { + return typeName; + } + + public String getTableName() { + return tableName; + } + + + public HashMap tableNameMap; + + DeviceDataTableEnum(HashMap tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public HashMap getTableNameMap() { + return tableNameMap; + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 5f73387..b1258a9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -560,13 +560,13 @@ List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (dValue <= 20.0) { - deviceDataExcelDto.setLiquiddata(dValue + "%LEL"); + deviceDataExcelDto.setStrength(dValue + "%LEL"); } else { DecimalFormat df = new DecimalFormat("0.00"); dValue = dValue / 20.0; - deviceDataExcelDto.setLiquiddata(df.format(dValue) + "%VOL"); + deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL"); } } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index ee33ee4..4e439ae 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -36,10 +36,10 @@ * 第三方燃气列表 */ @RequestMapping("/gasdector/list-page") - public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getGasDectorListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -48,17 +48,17 @@ * 第三方燃气导出 */ @RequestMapping("/gasdector/export") - public void getGasDectorExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getGasDectorExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(GasDectorDataDto.class, page.getRecords(), DeviceExportEnum.GASDATA_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } @@ -66,10 +66,10 @@ * 第三方甲烷列表 */ @RequestMapping("/pantilt/list-page") - public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getPantiltDataListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -78,17 +78,17 @@ * 第三方甲烷导出 */ @RequestMapping("/pantilt/export") - public void getPantiltDataExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getPantiltDataExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(PantiltDataDto.class, page.getRecords(), DeviceExportEnum.METHANE_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 1aaa281..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -519,9 +519,9 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { - deviceDataExcelDto.setLiquiddata("正常水位"); + deviceDataExcelDto.setStrength("正常水位"); } } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 2b665fa..9959ef3 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -251,8 +251,8 @@ @ResponseBody @Permission @BussinessLog(value = "删除设备信息") - public Object delete(@RequestParam List ids) { - deviceService.deleteByIds(ids); + public Object batchDeletes(@RequestParam List ids) { + deviceService.batchDeletes(ids); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index efad32d..1b74128 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -7,6 +7,7 @@ import com.casic.missiles.modular.system.model.Device; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; import java.util.Map; @@ -47,5 +48,6 @@ DeviceDto getDetailById(@Param("id") String id); + Integer logicDelete(@Param("id")Long id,@Param("currentTime") Long currentTime); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java index 416eea9..ecf0daf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.modular.system.model.DeviceWell; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,7 @@ public interface DeviceWellMapper extends BaseMapper { void updateByDeviceId(Long deviceId, Long wellId); + + Integer logicDelete(@Param("deviceId") Long deviceId,@Param("currentTime") Long currentTime); + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index cc153cb..dbe1b00 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -48,7 +48,7 @@ } @Cacheable(value = "CONSTANT", key = "'alarmContent-'+#sName") - public int getAlarmContentByName(String sName) { + public Integer getAlarmContentByName(String sName) { return sysDictMapper.getAlarmContentByName(sName); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 41ef398..5dcebf1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -210,7 +211,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); - map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { @@ -368,11 +369,10 @@ , HttpServletResponse httpServletResponse) throws IOException { Page> page = PageFactory.defaultPage(); - page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); + page.setCurrent(1); page.setSearchCount(false); - page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -405,7 +405,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.get("staff").toString()); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java new file mode 100644 index 0000000..8af0e15 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; +import java.util.Map; + +public enum DeviceDataFieldTableEnum { + + TABLE_FIELD(new HashMap() { + { + put("data_dig", "UPTIME AS lastDataTs,timestampdiff(DAY,bds.last_data_ts,now()) AS offlineDays"); + put("data_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gas_dector", "gas_sample_value AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_harmful_gas", "CONCAT(CO, ', ', CH4, ', ', H2S, ', ', O2) AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_hydrant", "0 AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_noise", "ddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_hum", "CONCAT(TEMPERATURE, ', ', HUMIDITY) AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_tube", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover", "descn AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_press", "press AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pantilt", "concentration AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover_loca", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellplus", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_h2s", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pressure", "re_val AS dataValue,devcode AS devcode,'' AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + } + }); + public Map tableNameMap; + + DeviceDataFieldTableEnum(Map tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public Map getTableFieldMap() { + return tableNameMap; + } +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java new file mode 100644 index 0000000..7a33eaf --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java @@ -0,0 +1,81 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; + +/** + * @author cz + * @date 2022-7-15 + * 上传数据总记录数 + */ +public enum DeviceDataTableEnum { + + DATA_DIG("data_dig", "开挖监测仪"), + DATA_GAS("data_gas", "燃气智能监测终端"), + DATA_GASLIQUID("data_gasliquid_gas,data_gasliquid_liquid", "燃气智能监测终端(一体化)"), + DATA_GAS_DECTOR("data_gas_dector", "燃气探测仪"), + DATA_HARMFUL_GAS("data_harmful_gas", "有害气体监测仪"), + DATA_HYDRANT("data_hydrant", "消防栓防盗水监测仪"), + DATA_LIQUID("data_liquid", "液位监测仪"), + DATA_NOISE("data_noise", "噪声记录仪"), + DATA_PANTILT("data_pantilt", "激光甲烷云台"), + DATA_TEMP_HUM("data_temp_hum", "温湿度监测仪"), + DATA_TUBE("data_tube", "管盯"), + DATA_WELLCOVER("data_wellcover", "井盖状态监测仪"), + DATA_TEMP_PRESS("data_temp_press", "压力温度检测仪"), + DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖定位监测仪"), + DATA_WELLPLUS("data_wellplus", "井盖液位一体机"), + DATA_H2S("data_h2s", "硫化氢检测终端"), + DATA_PRESSURE("data_pressure", "压力检测终端"), + DEVICE_TYPE_TABLE(new HashMap() { + { + put(1, DATA_WELLCOVER); + put(2, DATA_LIQUID); + put(3, DATA_HARMFUL_GAS); + put(4, DATA_GAS); + put(5, DATA_TEMP_HUM); + put(6, DATA_DIG); + put(7, DATA_WELLCOVER_LOCA); + put(8, DATA_NOISE); + put(9, DATA_TEMP_PRESS); + put(10, DATA_GASLIQUID); + put(11, DATA_HYDRANT); + put(12, DATA_TUBE); + put(13, DATA_WELLPLUS); + put(14, DATA_H2S); + put(21, DATA_PANTILT); + put(22, DATA_H2S); + put(23, DATA_GAS); + put(24, DATA_TEMP_PRESS); + put(101, DATA_GAS_DECTOR); + } + }); + + String typeName; + String tableName; + + DeviceDataTableEnum(String tableName, String typeName) { + this.typeName = typeName; + this.tableName = tableName; + } + + public String getTypeName() { + return typeName; + } + + public String getTableName() { + return tableName; + } + + + public HashMap tableNameMap; + + DeviceDataTableEnum(HashMap tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public HashMap getTableNameMap() { + return tableNameMap; + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 5f73387..b1258a9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -560,13 +560,13 @@ List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (dValue <= 20.0) { - deviceDataExcelDto.setLiquiddata(dValue + "%LEL"); + deviceDataExcelDto.setStrength(dValue + "%LEL"); } else { DecimalFormat df = new DecimalFormat("0.00"); dValue = dValue / 20.0; - deviceDataExcelDto.setLiquiddata(df.format(dValue) + "%VOL"); + deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL"); } } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index ee33ee4..4e439ae 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -36,10 +36,10 @@ * 第三方燃气列表 */ @RequestMapping("/gasdector/list-page") - public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getGasDectorListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -48,17 +48,17 @@ * 第三方燃气导出 */ @RequestMapping("/gasdector/export") - public void getGasDectorExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getGasDectorExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(GasDectorDataDto.class, page.getRecords(), DeviceExportEnum.GASDATA_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } @@ -66,10 +66,10 @@ * 第三方甲烷列表 */ @RequestMapping("/pantilt/list-page") - public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getPantiltDataListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -78,17 +78,17 @@ * 第三方甲烷导出 */ @RequestMapping("/pantilt/export") - public void getPantiltDataExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getPantiltDataExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(PantiltDataDto.class, page.getRecords(), DeviceExportEnum.METHANE_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 1aaa281..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -519,9 +519,9 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { - deviceDataExcelDto.setLiquiddata("正常水位"); + deviceDataExcelDto.setStrength("正常水位"); } } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 2b665fa..9959ef3 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -251,8 +251,8 @@ @ResponseBody @Permission @BussinessLog(value = "删除设备信息") - public Object delete(@RequestParam List ids) { - deviceService.deleteByIds(ids); + public Object batchDeletes(@RequestParam List ids) { + deviceService.batchDeletes(ids); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index efad32d..1b74128 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -7,6 +7,7 @@ import com.casic.missiles.modular.system.model.Device; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; import java.util.Map; @@ -47,5 +48,6 @@ DeviceDto getDetailById(@Param("id") String id); + Integer logicDelete(@Param("id")Long id,@Param("currentTime") Long currentTime); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java index 416eea9..ecf0daf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.modular.system.model.DeviceWell; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,7 @@ public interface DeviceWellMapper extends BaseMapper { void updateByDeviceId(Long deviceId, Long wellId); + + Integer logicDelete(@Param("deviceId") Long deviceId,@Param("currentTime") Long currentTime); + } 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 a4cc371..d9d1be3 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 @@ -218,7 +218,7 @@ SELECT id, devcode, deviceName, - deviceType, + device_type, deviceTypeName, wellId, deptid, @@ -267,20 +267,12 @@ bd.devcode AS devcode, bdt.TYPE_NAME AS deviceTypeName, bd.device_type AS deviceType, - bwi.well_code AS wellCode, - bds.last_data_ts AS lastDataTs, - timestampdiff( - DAY, - bds.last_data_ts, - now()) AS offlineDays - FROM - bus_device_status bds - JOIN bus_device bd ON bds.device_id = bd.id - JOIN bus_device_well bdw ON bdw.device_id = bds.device_id + bwi.well_code AS wellCode + FROM bus_device bd + JOIN bus_device_well bdw ON bdw.device_id = bd.id JOIN bus_well_info bwi ON bwi.ID = bdw.well_id JOIN base_device_type bdt on bdt.ID = bd.DEVICE_TYPE - WHERE - bds.online_State = '0' + WHERE bd.online_state = '0' AND bd.DEVCODE = #{deviceCode} @@ -289,10 +281,31 @@ + + + + update bus_device + set valid=#{currentTime} + where id=#{id} + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index cc153cb..dbe1b00 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -48,7 +48,7 @@ } @Cacheable(value = "CONSTANT", key = "'alarmContent-'+#sName") - public int getAlarmContentByName(String sName) { + public Integer getAlarmContentByName(String sName) { return sysDictMapper.getAlarmContentByName(sName); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 41ef398..5dcebf1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -210,7 +211,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); - map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { @@ -368,11 +369,10 @@ , HttpServletResponse httpServletResponse) throws IOException { Page> page = PageFactory.defaultPage(); - page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); + page.setCurrent(1); page.setSearchCount(false); - page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -405,7 +405,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.get("staff").toString()); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java new file mode 100644 index 0000000..8af0e15 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; +import java.util.Map; + +public enum DeviceDataFieldTableEnum { + + TABLE_FIELD(new HashMap() { + { + put("data_dig", "UPTIME AS lastDataTs,timestampdiff(DAY,bds.last_data_ts,now()) AS offlineDays"); + put("data_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gas_dector", "gas_sample_value AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_harmful_gas", "CONCAT(CO, ', ', CH4, ', ', H2S, ', ', O2) AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_hydrant", "0 AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_noise", "ddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_hum", "CONCAT(TEMPERATURE, ', ', HUMIDITY) AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_tube", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover", "descn AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_press", "press AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pantilt", "concentration AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover_loca", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellplus", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_h2s", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pressure", "re_val AS dataValue,devcode AS devcode,'' AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + } + }); + public Map tableNameMap; + + DeviceDataFieldTableEnum(Map tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public Map getTableFieldMap() { + return tableNameMap; + } +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java new file mode 100644 index 0000000..7a33eaf --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java @@ -0,0 +1,81 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; + +/** + * @author cz + * @date 2022-7-15 + * 上传数据总记录数 + */ +public enum DeviceDataTableEnum { + + DATA_DIG("data_dig", "开挖监测仪"), + DATA_GAS("data_gas", "燃气智能监测终端"), + DATA_GASLIQUID("data_gasliquid_gas,data_gasliquid_liquid", "燃气智能监测终端(一体化)"), + DATA_GAS_DECTOR("data_gas_dector", "燃气探测仪"), + DATA_HARMFUL_GAS("data_harmful_gas", "有害气体监测仪"), + DATA_HYDRANT("data_hydrant", "消防栓防盗水监测仪"), + DATA_LIQUID("data_liquid", "液位监测仪"), + DATA_NOISE("data_noise", "噪声记录仪"), + DATA_PANTILT("data_pantilt", "激光甲烷云台"), + DATA_TEMP_HUM("data_temp_hum", "温湿度监测仪"), + DATA_TUBE("data_tube", "管盯"), + DATA_WELLCOVER("data_wellcover", "井盖状态监测仪"), + DATA_TEMP_PRESS("data_temp_press", "压力温度检测仪"), + DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖定位监测仪"), + DATA_WELLPLUS("data_wellplus", "井盖液位一体机"), + DATA_H2S("data_h2s", "硫化氢检测终端"), + DATA_PRESSURE("data_pressure", "压力检测终端"), + DEVICE_TYPE_TABLE(new HashMap() { + { + put(1, DATA_WELLCOVER); + put(2, DATA_LIQUID); + put(3, DATA_HARMFUL_GAS); + put(4, DATA_GAS); + put(5, DATA_TEMP_HUM); + put(6, DATA_DIG); + put(7, DATA_WELLCOVER_LOCA); + put(8, DATA_NOISE); + put(9, DATA_TEMP_PRESS); + put(10, DATA_GASLIQUID); + put(11, DATA_HYDRANT); + put(12, DATA_TUBE); + put(13, DATA_WELLPLUS); + put(14, DATA_H2S); + put(21, DATA_PANTILT); + put(22, DATA_H2S); + put(23, DATA_GAS); + put(24, DATA_TEMP_PRESS); + put(101, DATA_GAS_DECTOR); + } + }); + + String typeName; + String tableName; + + DeviceDataTableEnum(String tableName, String typeName) { + this.typeName = typeName; + this.tableName = tableName; + } + + public String getTypeName() { + return typeName; + } + + public String getTableName() { + return tableName; + } + + + public HashMap tableNameMap; + + DeviceDataTableEnum(HashMap tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public HashMap getTableNameMap() { + return tableNameMap; + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 5f73387..b1258a9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -560,13 +560,13 @@ List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (dValue <= 20.0) { - deviceDataExcelDto.setLiquiddata(dValue + "%LEL"); + deviceDataExcelDto.setStrength(dValue + "%LEL"); } else { DecimalFormat df = new DecimalFormat("0.00"); dValue = dValue / 20.0; - deviceDataExcelDto.setLiquiddata(df.format(dValue) + "%VOL"); + deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL"); } } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index ee33ee4..4e439ae 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -36,10 +36,10 @@ * 第三方燃气列表 */ @RequestMapping("/gasdector/list-page") - public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getGasDectorListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -48,17 +48,17 @@ * 第三方燃气导出 */ @RequestMapping("/gasdector/export") - public void getGasDectorExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getGasDectorExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(GasDectorDataDto.class, page.getRecords(), DeviceExportEnum.GASDATA_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } @@ -66,10 +66,10 @@ * 第三方甲烷列表 */ @RequestMapping("/pantilt/list-page") - public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getPantiltDataListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -78,17 +78,17 @@ * 第三方甲烷导出 */ @RequestMapping("/pantilt/export") - public void getPantiltDataExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getPantiltDataExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(PantiltDataDto.class, page.getRecords(), DeviceExportEnum.METHANE_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 1aaa281..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -519,9 +519,9 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { - deviceDataExcelDto.setLiquiddata("正常水位"); + deviceDataExcelDto.setStrength("正常水位"); } } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 2b665fa..9959ef3 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -251,8 +251,8 @@ @ResponseBody @Permission @BussinessLog(value = "删除设备信息") - public Object delete(@RequestParam List ids) { - deviceService.deleteByIds(ids); + public Object batchDeletes(@RequestParam List ids) { + deviceService.batchDeletes(ids); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index efad32d..1b74128 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -7,6 +7,7 @@ import com.casic.missiles.modular.system.model.Device; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; import java.util.Map; @@ -47,5 +48,6 @@ DeviceDto getDetailById(@Param("id") String id); + Integer logicDelete(@Param("id")Long id,@Param("currentTime") Long currentTime); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java index 416eea9..ecf0daf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.modular.system.model.DeviceWell; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,7 @@ public interface DeviceWellMapper extends BaseMapper { void updateByDeviceId(Long deviceId, Long wellId); + + Integer logicDelete(@Param("deviceId") Long deviceId,@Param("currentTime") Long currentTime); + } 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 a4cc371..d9d1be3 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 @@ -218,7 +218,7 @@ SELECT id, devcode, deviceName, - deviceType, + device_type, deviceTypeName, wellId, deptid, @@ -267,20 +267,12 @@ bd.devcode AS devcode, bdt.TYPE_NAME AS deviceTypeName, bd.device_type AS deviceType, - bwi.well_code AS wellCode, - bds.last_data_ts AS lastDataTs, - timestampdiff( - DAY, - bds.last_data_ts, - now()) AS offlineDays - FROM - bus_device_status bds - JOIN bus_device bd ON bds.device_id = bd.id - JOIN bus_device_well bdw ON bdw.device_id = bds.device_id + bwi.well_code AS wellCode + FROM bus_device bd + JOIN bus_device_well bdw ON bdw.device_id = bd.id JOIN bus_well_info bwi ON bwi.ID = bdw.well_id JOIN base_device_type bdt on bdt.ID = bd.DEVICE_TYPE - WHERE - bds.online_State = '0' + WHERE bd.online_state = '0' AND bd.DEVCODE = #{deviceCode} @@ -289,10 +281,31 @@ + + + + update bus_device + set valid=#{currentTime} + where id=#{id} + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index 9bd5107..a0767b6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -19,4 +19,10 @@ UPDATE bus_device_well SET WELL_ID = #{wellId} WHERE DEVICE_ID = #{deviceId} + + update bus_device_well + set valid=#{currentTime} + where device_id=#{deviceId} + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index cc153cb..dbe1b00 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -48,7 +48,7 @@ } @Cacheable(value = "CONSTANT", key = "'alarmContent-'+#sName") - public int getAlarmContentByName(String sName) { + public Integer getAlarmContentByName(String sName) { return sysDictMapper.getAlarmContentByName(sName); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 41ef398..5dcebf1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -210,7 +211,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); - map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { @@ -368,11 +369,10 @@ , HttpServletResponse httpServletResponse) throws IOException { Page> page = PageFactory.defaultPage(); - page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); + page.setCurrent(1); page.setSearchCount(false); - page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -405,7 +405,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.get("staff").toString()); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java new file mode 100644 index 0000000..8af0e15 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; +import java.util.Map; + +public enum DeviceDataFieldTableEnum { + + TABLE_FIELD(new HashMap() { + { + put("data_dig", "UPTIME AS lastDataTs,timestampdiff(DAY,bds.last_data_ts,now()) AS offlineDays"); + put("data_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gas_dector", "gas_sample_value AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_harmful_gas", "CONCAT(CO, ', ', CH4, ', ', H2S, ', ', O2) AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_hydrant", "0 AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_noise", "ddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_hum", "CONCAT(TEMPERATURE, ', ', HUMIDITY) AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_tube", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover", "descn AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_press", "press AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pantilt", "concentration AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover_loca", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellplus", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_h2s", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pressure", "re_val AS dataValue,devcode AS devcode,'' AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + } + }); + public Map tableNameMap; + + DeviceDataFieldTableEnum(Map tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public Map getTableFieldMap() { + return tableNameMap; + } +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java new file mode 100644 index 0000000..7a33eaf --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java @@ -0,0 +1,81 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; + +/** + * @author cz + * @date 2022-7-15 + * 上传数据总记录数 + */ +public enum DeviceDataTableEnum { + + DATA_DIG("data_dig", "开挖监测仪"), + DATA_GAS("data_gas", "燃气智能监测终端"), + DATA_GASLIQUID("data_gasliquid_gas,data_gasliquid_liquid", "燃气智能监测终端(一体化)"), + DATA_GAS_DECTOR("data_gas_dector", "燃气探测仪"), + DATA_HARMFUL_GAS("data_harmful_gas", "有害气体监测仪"), + DATA_HYDRANT("data_hydrant", "消防栓防盗水监测仪"), + DATA_LIQUID("data_liquid", "液位监测仪"), + DATA_NOISE("data_noise", "噪声记录仪"), + DATA_PANTILT("data_pantilt", "激光甲烷云台"), + DATA_TEMP_HUM("data_temp_hum", "温湿度监测仪"), + DATA_TUBE("data_tube", "管盯"), + DATA_WELLCOVER("data_wellcover", "井盖状态监测仪"), + DATA_TEMP_PRESS("data_temp_press", "压力温度检测仪"), + DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖定位监测仪"), + DATA_WELLPLUS("data_wellplus", "井盖液位一体机"), + DATA_H2S("data_h2s", "硫化氢检测终端"), + DATA_PRESSURE("data_pressure", "压力检测终端"), + DEVICE_TYPE_TABLE(new HashMap() { + { + put(1, DATA_WELLCOVER); + put(2, DATA_LIQUID); + put(3, DATA_HARMFUL_GAS); + put(4, DATA_GAS); + put(5, DATA_TEMP_HUM); + put(6, DATA_DIG); + put(7, DATA_WELLCOVER_LOCA); + put(8, DATA_NOISE); + put(9, DATA_TEMP_PRESS); + put(10, DATA_GASLIQUID); + put(11, DATA_HYDRANT); + put(12, DATA_TUBE); + put(13, DATA_WELLPLUS); + put(14, DATA_H2S); + put(21, DATA_PANTILT); + put(22, DATA_H2S); + put(23, DATA_GAS); + put(24, DATA_TEMP_PRESS); + put(101, DATA_GAS_DECTOR); + } + }); + + String typeName; + String tableName; + + DeviceDataTableEnum(String tableName, String typeName) { + this.typeName = typeName; + this.tableName = tableName; + } + + public String getTypeName() { + return typeName; + } + + public String getTableName() { + return tableName; + } + + + public HashMap tableNameMap; + + DeviceDataTableEnum(HashMap tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public HashMap getTableNameMap() { + return tableNameMap; + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 5f73387..b1258a9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -560,13 +560,13 @@ List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (dValue <= 20.0) { - deviceDataExcelDto.setLiquiddata(dValue + "%LEL"); + deviceDataExcelDto.setStrength(dValue + "%LEL"); } else { DecimalFormat df = new DecimalFormat("0.00"); dValue = dValue / 20.0; - deviceDataExcelDto.setLiquiddata(df.format(dValue) + "%VOL"); + deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL"); } } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index ee33ee4..4e439ae 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -36,10 +36,10 @@ * 第三方燃气列表 */ @RequestMapping("/gasdector/list-page") - public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getGasDectorListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -48,17 +48,17 @@ * 第三方燃气导出 */ @RequestMapping("/gasdector/export") - public void getGasDectorExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getGasDectorExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(GasDectorDataDto.class, page.getRecords(), DeviceExportEnum.GASDATA_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } @@ -66,10 +66,10 @@ * 第三方甲烷列表 */ @RequestMapping("/pantilt/list-page") - public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getPantiltDataListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -78,17 +78,17 @@ * 第三方甲烷导出 */ @RequestMapping("/pantilt/export") - public void getPantiltDataExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getPantiltDataExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(PantiltDataDto.class, page.getRecords(), DeviceExportEnum.METHANE_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 1aaa281..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -519,9 +519,9 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { - deviceDataExcelDto.setLiquiddata("正常水位"); + deviceDataExcelDto.setStrength("正常水位"); } } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 2b665fa..9959ef3 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -251,8 +251,8 @@ @ResponseBody @Permission @BussinessLog(value = "删除设备信息") - public Object delete(@RequestParam List ids) { - deviceService.deleteByIds(ids); + public Object batchDeletes(@RequestParam List ids) { + deviceService.batchDeletes(ids); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index efad32d..1b74128 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -7,6 +7,7 @@ import com.casic.missiles.modular.system.model.Device; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; import java.util.Map; @@ -47,5 +48,6 @@ DeviceDto getDetailById(@Param("id") String id); + Integer logicDelete(@Param("id")Long id,@Param("currentTime") Long currentTime); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java index 416eea9..ecf0daf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.modular.system.model.DeviceWell; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,7 @@ public interface DeviceWellMapper extends BaseMapper { void updateByDeviceId(Long deviceId, Long wellId); + + Integer logicDelete(@Param("deviceId") Long deviceId,@Param("currentTime") Long currentTime); + } 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 a4cc371..d9d1be3 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 @@ -218,7 +218,7 @@ SELECT id, devcode, deviceName, - deviceType, + device_type, deviceTypeName, wellId, deptid, @@ -267,20 +267,12 @@ bd.devcode AS devcode, bdt.TYPE_NAME AS deviceTypeName, bd.device_type AS deviceType, - bwi.well_code AS wellCode, - bds.last_data_ts AS lastDataTs, - timestampdiff( - DAY, - bds.last_data_ts, - now()) AS offlineDays - FROM - bus_device_status bds - JOIN bus_device bd ON bds.device_id = bd.id - JOIN bus_device_well bdw ON bdw.device_id = bds.device_id + bwi.well_code AS wellCode + FROM bus_device bd + JOIN bus_device_well bdw ON bdw.device_id = bd.id JOIN bus_well_info bwi ON bwi.ID = bdw.well_id JOIN base_device_type bdt on bdt.ID = bd.DEVICE_TYPE - WHERE - bds.online_State = '0' + WHERE bd.online_state = '0' AND bd.DEVCODE = #{deviceCode} @@ -289,10 +281,31 @@ + + + + update bus_device + set valid=#{currentTime} + where id=#{id} + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index 9bd5107..a0767b6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -19,4 +19,10 @@ UPDATE bus_device_well SET WELL_ID = #{wellId} WHERE DEVICE_ID = #{deviceId} + + update bus_device_well + set valid=#{currentTime} + where device_id=#{deviceId} + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java index e51bb6d..2ef2881 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java @@ -15,6 +15,9 @@ void updateByDeviceId(Long deviceId, Long concId); + public DeviceConcentrator getDeviceConcentratorBydevId(Long devId); + void deleteByDeviceId(Long id); + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index cc153cb..dbe1b00 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -48,7 +48,7 @@ } @Cacheable(value = "CONSTANT", key = "'alarmContent-'+#sName") - public int getAlarmContentByName(String sName) { + public Integer getAlarmContentByName(String sName) { return sysDictMapper.getAlarmContentByName(sName); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 41ef398..5dcebf1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -210,7 +211,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); - map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { @@ -368,11 +369,10 @@ , HttpServletResponse httpServletResponse) throws IOException { Page> page = PageFactory.defaultPage(); - page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); + page.setCurrent(1); page.setSearchCount(false); - page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -405,7 +405,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.get("staff").toString()); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java new file mode 100644 index 0000000..8af0e15 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; +import java.util.Map; + +public enum DeviceDataFieldTableEnum { + + TABLE_FIELD(new HashMap() { + { + put("data_dig", "UPTIME AS lastDataTs,timestampdiff(DAY,bds.last_data_ts,now()) AS offlineDays"); + put("data_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gas_dector", "gas_sample_value AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_harmful_gas", "CONCAT(CO, ', ', CH4, ', ', H2S, ', ', O2) AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_hydrant", "0 AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_noise", "ddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_hum", "CONCAT(TEMPERATURE, ', ', HUMIDITY) AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_tube", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover", "descn AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_press", "press AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pantilt", "concentration AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover_loca", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellplus", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_h2s", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pressure", "re_val AS dataValue,devcode AS devcode,'' AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + } + }); + public Map tableNameMap; + + DeviceDataFieldTableEnum(Map tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public Map getTableFieldMap() { + return tableNameMap; + } +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java new file mode 100644 index 0000000..7a33eaf --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java @@ -0,0 +1,81 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; + +/** + * @author cz + * @date 2022-7-15 + * 上传数据总记录数 + */ +public enum DeviceDataTableEnum { + + DATA_DIG("data_dig", "开挖监测仪"), + DATA_GAS("data_gas", "燃气智能监测终端"), + DATA_GASLIQUID("data_gasliquid_gas,data_gasliquid_liquid", "燃气智能监测终端(一体化)"), + DATA_GAS_DECTOR("data_gas_dector", "燃气探测仪"), + DATA_HARMFUL_GAS("data_harmful_gas", "有害气体监测仪"), + DATA_HYDRANT("data_hydrant", "消防栓防盗水监测仪"), + DATA_LIQUID("data_liquid", "液位监测仪"), + DATA_NOISE("data_noise", "噪声记录仪"), + DATA_PANTILT("data_pantilt", "激光甲烷云台"), + DATA_TEMP_HUM("data_temp_hum", "温湿度监测仪"), + DATA_TUBE("data_tube", "管盯"), + DATA_WELLCOVER("data_wellcover", "井盖状态监测仪"), + DATA_TEMP_PRESS("data_temp_press", "压力温度检测仪"), + DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖定位监测仪"), + DATA_WELLPLUS("data_wellplus", "井盖液位一体机"), + DATA_H2S("data_h2s", "硫化氢检测终端"), + DATA_PRESSURE("data_pressure", "压力检测终端"), + DEVICE_TYPE_TABLE(new HashMap() { + { + put(1, DATA_WELLCOVER); + put(2, DATA_LIQUID); + put(3, DATA_HARMFUL_GAS); + put(4, DATA_GAS); + put(5, DATA_TEMP_HUM); + put(6, DATA_DIG); + put(7, DATA_WELLCOVER_LOCA); + put(8, DATA_NOISE); + put(9, DATA_TEMP_PRESS); + put(10, DATA_GASLIQUID); + put(11, DATA_HYDRANT); + put(12, DATA_TUBE); + put(13, DATA_WELLPLUS); + put(14, DATA_H2S); + put(21, DATA_PANTILT); + put(22, DATA_H2S); + put(23, DATA_GAS); + put(24, DATA_TEMP_PRESS); + put(101, DATA_GAS_DECTOR); + } + }); + + String typeName; + String tableName; + + DeviceDataTableEnum(String tableName, String typeName) { + this.typeName = typeName; + this.tableName = tableName; + } + + public String getTypeName() { + return typeName; + } + + public String getTableName() { + return tableName; + } + + + public HashMap tableNameMap; + + DeviceDataTableEnum(HashMap tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public HashMap getTableNameMap() { + return tableNameMap; + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 5f73387..b1258a9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -560,13 +560,13 @@ List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (dValue <= 20.0) { - deviceDataExcelDto.setLiquiddata(dValue + "%LEL"); + deviceDataExcelDto.setStrength(dValue + "%LEL"); } else { DecimalFormat df = new DecimalFormat("0.00"); dValue = dValue / 20.0; - deviceDataExcelDto.setLiquiddata(df.format(dValue) + "%VOL"); + deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL"); } } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index ee33ee4..4e439ae 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -36,10 +36,10 @@ * 第三方燃气列表 */ @RequestMapping("/gasdector/list-page") - public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getGasDectorListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -48,17 +48,17 @@ * 第三方燃气导出 */ @RequestMapping("/gasdector/export") - public void getGasDectorExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getGasDectorExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(GasDectorDataDto.class, page.getRecords(), DeviceExportEnum.GASDATA_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } @@ -66,10 +66,10 @@ * 第三方甲烷列表 */ @RequestMapping("/pantilt/list-page") - public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getPantiltDataListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -78,17 +78,17 @@ * 第三方甲烷导出 */ @RequestMapping("/pantilt/export") - public void getPantiltDataExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getPantiltDataExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(PantiltDataDto.class, page.getRecords(), DeviceExportEnum.METHANE_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 1aaa281..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -519,9 +519,9 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { - deviceDataExcelDto.setLiquiddata("正常水位"); + deviceDataExcelDto.setStrength("正常水位"); } } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 2b665fa..9959ef3 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -251,8 +251,8 @@ @ResponseBody @Permission @BussinessLog(value = "删除设备信息") - public Object delete(@RequestParam List ids) { - deviceService.deleteByIds(ids); + public Object batchDeletes(@RequestParam List ids) { + deviceService.batchDeletes(ids); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index efad32d..1b74128 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -7,6 +7,7 @@ import com.casic.missiles.modular.system.model.Device; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; import java.util.Map; @@ -47,5 +48,6 @@ DeviceDto getDetailById(@Param("id") String id); + Integer logicDelete(@Param("id")Long id,@Param("currentTime") Long currentTime); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java index 416eea9..ecf0daf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.modular.system.model.DeviceWell; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,7 @@ public interface DeviceWellMapper extends BaseMapper { void updateByDeviceId(Long deviceId, Long wellId); + + Integer logicDelete(@Param("deviceId") Long deviceId,@Param("currentTime") Long currentTime); + } 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 a4cc371..d9d1be3 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 @@ -218,7 +218,7 @@ SELECT id, devcode, deviceName, - deviceType, + device_type, deviceTypeName, wellId, deptid, @@ -267,20 +267,12 @@ bd.devcode AS devcode, bdt.TYPE_NAME AS deviceTypeName, bd.device_type AS deviceType, - bwi.well_code AS wellCode, - bds.last_data_ts AS lastDataTs, - timestampdiff( - DAY, - bds.last_data_ts, - now()) AS offlineDays - FROM - bus_device_status bds - JOIN bus_device bd ON bds.device_id = bd.id - JOIN bus_device_well bdw ON bdw.device_id = bds.device_id + bwi.well_code AS wellCode + FROM bus_device bd + JOIN bus_device_well bdw ON bdw.device_id = bd.id JOIN bus_well_info bwi ON bwi.ID = bdw.well_id JOIN base_device_type bdt on bdt.ID = bd.DEVICE_TYPE - WHERE - bds.online_State = '0' + WHERE bd.online_state = '0' AND bd.DEVCODE = #{deviceCode} @@ -289,10 +281,31 @@ + + + + update bus_device + set valid=#{currentTime} + where id=#{id} + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index 9bd5107..a0767b6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -19,4 +19,10 @@ UPDATE bus_device_well SET WELL_ID = #{wellId} WHERE DEVICE_ID = #{deviceId} + + update bus_device_well + set valid=#{currentTime} + where device_id=#{deviceId} + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java index e51bb6d..2ef2881 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java @@ -15,6 +15,9 @@ void updateByDeviceId(Long deviceId, Long concId); + public DeviceConcentrator getDeviceConcentratorBydevId(Long devId); + void deleteByDeviceId(Long id); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 53f9528..6fc2835 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -65,7 +65,7 @@ List addDeviceBatch(List results); - void deleteByIds(List ids); + void batchDeletes(List ids); ResponseData addDevice(Device device); ResponseData offlineListPage(DataScope dataScope, Page> page, diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index cc153cb..dbe1b00 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -48,7 +48,7 @@ } @Cacheable(value = "CONSTANT", key = "'alarmContent-'+#sName") - public int getAlarmContentByName(String sName) { + public Integer getAlarmContentByName(String sName) { return sysDictMapper.getAlarmContentByName(sName); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 41ef398..5dcebf1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -210,7 +211,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); - map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { @@ -368,11 +369,10 @@ , HttpServletResponse httpServletResponse) throws IOException { Page> page = PageFactory.defaultPage(); - page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); + page.setCurrent(1); page.setSearchCount(false); - page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -405,7 +405,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.get("staff").toString()); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java new file mode 100644 index 0000000..8af0e15 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; +import java.util.Map; + +public enum DeviceDataFieldTableEnum { + + TABLE_FIELD(new HashMap() { + { + put("data_dig", "UPTIME AS lastDataTs,timestampdiff(DAY,bds.last_data_ts,now()) AS offlineDays"); + put("data_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gas_dector", "gas_sample_value AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_harmful_gas", "CONCAT(CO, ', ', CH4, ', ', H2S, ', ', O2) AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_hydrant", "0 AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_noise", "ddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_hum", "CONCAT(TEMPERATURE, ', ', HUMIDITY) AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_tube", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover", "descn AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_press", "press AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pantilt", "concentration AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover_loca", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellplus", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_h2s", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pressure", "re_val AS dataValue,devcode AS devcode,'' AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + } + }); + public Map tableNameMap; + + DeviceDataFieldTableEnum(Map tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public Map getTableFieldMap() { + return tableNameMap; + } +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java new file mode 100644 index 0000000..7a33eaf --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java @@ -0,0 +1,81 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; + +/** + * @author cz + * @date 2022-7-15 + * 上传数据总记录数 + */ +public enum DeviceDataTableEnum { + + DATA_DIG("data_dig", "开挖监测仪"), + DATA_GAS("data_gas", "燃气智能监测终端"), + DATA_GASLIQUID("data_gasliquid_gas,data_gasliquid_liquid", "燃气智能监测终端(一体化)"), + DATA_GAS_DECTOR("data_gas_dector", "燃气探测仪"), + DATA_HARMFUL_GAS("data_harmful_gas", "有害气体监测仪"), + DATA_HYDRANT("data_hydrant", "消防栓防盗水监测仪"), + DATA_LIQUID("data_liquid", "液位监测仪"), + DATA_NOISE("data_noise", "噪声记录仪"), + DATA_PANTILT("data_pantilt", "激光甲烷云台"), + DATA_TEMP_HUM("data_temp_hum", "温湿度监测仪"), + DATA_TUBE("data_tube", "管盯"), + DATA_WELLCOVER("data_wellcover", "井盖状态监测仪"), + DATA_TEMP_PRESS("data_temp_press", "压力温度检测仪"), + DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖定位监测仪"), + DATA_WELLPLUS("data_wellplus", "井盖液位一体机"), + DATA_H2S("data_h2s", "硫化氢检测终端"), + DATA_PRESSURE("data_pressure", "压力检测终端"), + DEVICE_TYPE_TABLE(new HashMap() { + { + put(1, DATA_WELLCOVER); + put(2, DATA_LIQUID); + put(3, DATA_HARMFUL_GAS); + put(4, DATA_GAS); + put(5, DATA_TEMP_HUM); + put(6, DATA_DIG); + put(7, DATA_WELLCOVER_LOCA); + put(8, DATA_NOISE); + put(9, DATA_TEMP_PRESS); + put(10, DATA_GASLIQUID); + put(11, DATA_HYDRANT); + put(12, DATA_TUBE); + put(13, DATA_WELLPLUS); + put(14, DATA_H2S); + put(21, DATA_PANTILT); + put(22, DATA_H2S); + put(23, DATA_GAS); + put(24, DATA_TEMP_PRESS); + put(101, DATA_GAS_DECTOR); + } + }); + + String typeName; + String tableName; + + DeviceDataTableEnum(String tableName, String typeName) { + this.typeName = typeName; + this.tableName = tableName; + } + + public String getTypeName() { + return typeName; + } + + public String getTableName() { + return tableName; + } + + + public HashMap tableNameMap; + + DeviceDataTableEnum(HashMap tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public HashMap getTableNameMap() { + return tableNameMap; + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 5f73387..b1258a9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -560,13 +560,13 @@ List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (dValue <= 20.0) { - deviceDataExcelDto.setLiquiddata(dValue + "%LEL"); + deviceDataExcelDto.setStrength(dValue + "%LEL"); } else { DecimalFormat df = new DecimalFormat("0.00"); dValue = dValue / 20.0; - deviceDataExcelDto.setLiquiddata(df.format(dValue) + "%VOL"); + deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL"); } } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index ee33ee4..4e439ae 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -36,10 +36,10 @@ * 第三方燃气列表 */ @RequestMapping("/gasdector/list-page") - public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getGasDectorListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -48,17 +48,17 @@ * 第三方燃气导出 */ @RequestMapping("/gasdector/export") - public void getGasDectorExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getGasDectorExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(GasDectorDataDto.class, page.getRecords(), DeviceExportEnum.GASDATA_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } @@ -66,10 +66,10 @@ * 第三方甲烷列表 */ @RequestMapping("/pantilt/list-page") - public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getPantiltDataListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -78,17 +78,17 @@ * 第三方甲烷导出 */ @RequestMapping("/pantilt/export") - public void getPantiltDataExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getPantiltDataExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(PantiltDataDto.class, page.getRecords(), DeviceExportEnum.METHANE_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 1aaa281..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -519,9 +519,9 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { - deviceDataExcelDto.setLiquiddata("正常水位"); + deviceDataExcelDto.setStrength("正常水位"); } } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 2b665fa..9959ef3 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -251,8 +251,8 @@ @ResponseBody @Permission @BussinessLog(value = "删除设备信息") - public Object delete(@RequestParam List ids) { - deviceService.deleteByIds(ids); + public Object batchDeletes(@RequestParam List ids) { + deviceService.batchDeletes(ids); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index efad32d..1b74128 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -7,6 +7,7 @@ import com.casic.missiles.modular.system.model.Device; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; import java.util.Map; @@ -47,5 +48,6 @@ DeviceDto getDetailById(@Param("id") String id); + Integer logicDelete(@Param("id")Long id,@Param("currentTime") Long currentTime); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java index 416eea9..ecf0daf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.modular.system.model.DeviceWell; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,7 @@ public interface DeviceWellMapper extends BaseMapper { void updateByDeviceId(Long deviceId, Long wellId); + + Integer logicDelete(@Param("deviceId") Long deviceId,@Param("currentTime") Long currentTime); + } 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 a4cc371..d9d1be3 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 @@ -218,7 +218,7 @@ SELECT id, devcode, deviceName, - deviceType, + device_type, deviceTypeName, wellId, deptid, @@ -267,20 +267,12 @@ bd.devcode AS devcode, bdt.TYPE_NAME AS deviceTypeName, bd.device_type AS deviceType, - bwi.well_code AS wellCode, - bds.last_data_ts AS lastDataTs, - timestampdiff( - DAY, - bds.last_data_ts, - now()) AS offlineDays - FROM - bus_device_status bds - JOIN bus_device bd ON bds.device_id = bd.id - JOIN bus_device_well bdw ON bdw.device_id = bds.device_id + bwi.well_code AS wellCode + FROM bus_device bd + JOIN bus_device_well bdw ON bdw.device_id = bd.id JOIN bus_well_info bwi ON bwi.ID = bdw.well_id JOIN base_device_type bdt on bdt.ID = bd.DEVICE_TYPE - WHERE - bds.online_State = '0' + WHERE bd.online_state = '0' AND bd.DEVCODE = #{deviceCode} @@ -289,10 +281,31 @@ + + + + update bus_device + set valid=#{currentTime} + where id=#{id} + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index 9bd5107..a0767b6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -19,4 +19,10 @@ UPDATE bus_device_well SET WELL_ID = #{wellId} WHERE DEVICE_ID = #{deviceId} + + update bus_device_well + set valid=#{currentTime} + where device_id=#{deviceId} + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java index e51bb6d..2ef2881 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java @@ -15,6 +15,9 @@ void updateByDeviceId(Long deviceId, Long concId); + public DeviceConcentrator getDeviceConcentratorBydevId(Long devId); + void deleteByDeviceId(Long id); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 53f9528..6fc2835 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -65,7 +65,7 @@ List addDeviceBatch(List results); - void deleteByIds(List ids); + void batchDeletes(List ids); ResponseData addDevice(Device device); ResponseData offlineListPage(DataScope dataScope, Page> page, diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java index 2ac0fe7..c5669fd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java @@ -16,5 +16,5 @@ void updateByDeviceId(Long deviceId, Long wellId); DeviceWell getDeviceWellByDevId(Long devId); - void deleteByDeviceId(Long id); + void logicDelete(Long id); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index cc153cb..dbe1b00 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -48,7 +48,7 @@ } @Cacheable(value = "CONSTANT", key = "'alarmContent-'+#sName") - public int getAlarmContentByName(String sName) { + public Integer getAlarmContentByName(String sName) { return sysDictMapper.getAlarmContentByName(sName); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 41ef398..5dcebf1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -210,7 +211,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); - map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { @@ -368,11 +369,10 @@ , HttpServletResponse httpServletResponse) throws IOException { Page> page = PageFactory.defaultPage(); - page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); + page.setCurrent(1); page.setSearchCount(false); - page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -405,7 +405,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.get("staff").toString()); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java new file mode 100644 index 0000000..8af0e15 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; +import java.util.Map; + +public enum DeviceDataFieldTableEnum { + + TABLE_FIELD(new HashMap() { + { + put("data_dig", "UPTIME AS lastDataTs,timestampdiff(DAY,bds.last_data_ts,now()) AS offlineDays"); + put("data_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gas_dector", "gas_sample_value AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_harmful_gas", "CONCAT(CO, ', ', CH4, ', ', H2S, ', ', O2) AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_hydrant", "0 AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_noise", "ddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_hum", "CONCAT(TEMPERATURE, ', ', HUMIDITY) AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_tube", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover", "descn AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_press", "press AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pantilt", "concentration AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover_loca", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellplus", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_h2s", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pressure", "re_val AS dataValue,devcode AS devcode,'' AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + } + }); + public Map tableNameMap; + + DeviceDataFieldTableEnum(Map tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public Map getTableFieldMap() { + return tableNameMap; + } +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java new file mode 100644 index 0000000..7a33eaf --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java @@ -0,0 +1,81 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; + +/** + * @author cz + * @date 2022-7-15 + * 上传数据总记录数 + */ +public enum DeviceDataTableEnum { + + DATA_DIG("data_dig", "开挖监测仪"), + DATA_GAS("data_gas", "燃气智能监测终端"), + DATA_GASLIQUID("data_gasliquid_gas,data_gasliquid_liquid", "燃气智能监测终端(一体化)"), + DATA_GAS_DECTOR("data_gas_dector", "燃气探测仪"), + DATA_HARMFUL_GAS("data_harmful_gas", "有害气体监测仪"), + DATA_HYDRANT("data_hydrant", "消防栓防盗水监测仪"), + DATA_LIQUID("data_liquid", "液位监测仪"), + DATA_NOISE("data_noise", "噪声记录仪"), + DATA_PANTILT("data_pantilt", "激光甲烷云台"), + DATA_TEMP_HUM("data_temp_hum", "温湿度监测仪"), + DATA_TUBE("data_tube", "管盯"), + DATA_WELLCOVER("data_wellcover", "井盖状态监测仪"), + DATA_TEMP_PRESS("data_temp_press", "压力温度检测仪"), + DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖定位监测仪"), + DATA_WELLPLUS("data_wellplus", "井盖液位一体机"), + DATA_H2S("data_h2s", "硫化氢检测终端"), + DATA_PRESSURE("data_pressure", "压力检测终端"), + DEVICE_TYPE_TABLE(new HashMap() { + { + put(1, DATA_WELLCOVER); + put(2, DATA_LIQUID); + put(3, DATA_HARMFUL_GAS); + put(4, DATA_GAS); + put(5, DATA_TEMP_HUM); + put(6, DATA_DIG); + put(7, DATA_WELLCOVER_LOCA); + put(8, DATA_NOISE); + put(9, DATA_TEMP_PRESS); + put(10, DATA_GASLIQUID); + put(11, DATA_HYDRANT); + put(12, DATA_TUBE); + put(13, DATA_WELLPLUS); + put(14, DATA_H2S); + put(21, DATA_PANTILT); + put(22, DATA_H2S); + put(23, DATA_GAS); + put(24, DATA_TEMP_PRESS); + put(101, DATA_GAS_DECTOR); + } + }); + + String typeName; + String tableName; + + DeviceDataTableEnum(String tableName, String typeName) { + this.typeName = typeName; + this.tableName = tableName; + } + + public String getTypeName() { + return typeName; + } + + public String getTableName() { + return tableName; + } + + + public HashMap tableNameMap; + + DeviceDataTableEnum(HashMap tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public HashMap getTableNameMap() { + return tableNameMap; + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 5f73387..b1258a9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -560,13 +560,13 @@ List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (dValue <= 20.0) { - deviceDataExcelDto.setLiquiddata(dValue + "%LEL"); + deviceDataExcelDto.setStrength(dValue + "%LEL"); } else { DecimalFormat df = new DecimalFormat("0.00"); dValue = dValue / 20.0; - deviceDataExcelDto.setLiquiddata(df.format(dValue) + "%VOL"); + deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL"); } } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index ee33ee4..4e439ae 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -36,10 +36,10 @@ * 第三方燃气列表 */ @RequestMapping("/gasdector/list-page") - public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getGasDectorListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -48,17 +48,17 @@ * 第三方燃气导出 */ @RequestMapping("/gasdector/export") - public void getGasDectorExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getGasDectorExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(GasDectorDataDto.class, page.getRecords(), DeviceExportEnum.GASDATA_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } @@ -66,10 +66,10 @@ * 第三方甲烷列表 */ @RequestMapping("/pantilt/list-page") - public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getPantiltDataListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -78,17 +78,17 @@ * 第三方甲烷导出 */ @RequestMapping("/pantilt/export") - public void getPantiltDataExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getPantiltDataExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(PantiltDataDto.class, page.getRecords(), DeviceExportEnum.METHANE_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 1aaa281..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -519,9 +519,9 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { - deviceDataExcelDto.setLiquiddata("正常水位"); + deviceDataExcelDto.setStrength("正常水位"); } } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 2b665fa..9959ef3 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -251,8 +251,8 @@ @ResponseBody @Permission @BussinessLog(value = "删除设备信息") - public Object delete(@RequestParam List ids) { - deviceService.deleteByIds(ids); + public Object batchDeletes(@RequestParam List ids) { + deviceService.batchDeletes(ids); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index efad32d..1b74128 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -7,6 +7,7 @@ import com.casic.missiles.modular.system.model.Device; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; import java.util.Map; @@ -47,5 +48,6 @@ DeviceDto getDetailById(@Param("id") String id); + Integer logicDelete(@Param("id")Long id,@Param("currentTime") Long currentTime); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java index 416eea9..ecf0daf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.modular.system.model.DeviceWell; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,7 @@ public interface DeviceWellMapper extends BaseMapper { void updateByDeviceId(Long deviceId, Long wellId); + + Integer logicDelete(@Param("deviceId") Long deviceId,@Param("currentTime") Long currentTime); + } 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 a4cc371..d9d1be3 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 @@ -218,7 +218,7 @@ SELECT id, devcode, deviceName, - deviceType, + device_type, deviceTypeName, wellId, deptid, @@ -267,20 +267,12 @@ bd.devcode AS devcode, bdt.TYPE_NAME AS deviceTypeName, bd.device_type AS deviceType, - bwi.well_code AS wellCode, - bds.last_data_ts AS lastDataTs, - timestampdiff( - DAY, - bds.last_data_ts, - now()) AS offlineDays - FROM - bus_device_status bds - JOIN bus_device bd ON bds.device_id = bd.id - JOIN bus_device_well bdw ON bdw.device_id = bds.device_id + bwi.well_code AS wellCode + FROM bus_device bd + JOIN bus_device_well bdw ON bdw.device_id = bd.id JOIN bus_well_info bwi ON bwi.ID = bdw.well_id JOIN base_device_type bdt on bdt.ID = bd.DEVICE_TYPE - WHERE - bds.online_State = '0' + WHERE bd.online_state = '0' AND bd.DEVCODE = #{deviceCode} @@ -289,10 +281,31 @@ + + + + update bus_device + set valid=#{currentTime} + where id=#{id} + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index 9bd5107..a0767b6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -19,4 +19,10 @@ UPDATE bus_device_well SET WELL_ID = #{wellId} WHERE DEVICE_ID = #{deviceId} + + update bus_device_well + set valid=#{currentTime} + where device_id=#{deviceId} + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java index e51bb6d..2ef2881 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java @@ -15,6 +15,9 @@ void updateByDeviceId(Long deviceId, Long concId); + public DeviceConcentrator getDeviceConcentratorBydevId(Long devId); + void deleteByDeviceId(Long id); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 53f9528..6fc2835 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -65,7 +65,7 @@ List addDeviceBatch(List results); - void deleteByIds(List ids); + void batchDeletes(List ids); ResponseData addDevice(Device device); ResponseData offlineListPage(DataScope dataScope, Page> page, diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java index 2ac0fe7..c5669fd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java @@ -16,5 +16,5 @@ void updateByDeviceId(Long deviceId, Long wellId); DeviceWell getDeviceWellByDevId(Long devId); - void deleteByDeviceId(Long id); + void logicDelete(Long id); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index d32e3b7..a07df56 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -3,11 +3,9 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.core.common.constant.Const; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.exception.ServiceException; @@ -152,7 +150,7 @@ throw gunsException; } if (!deviceWell.getWellId().equals(wellDto.getWellId())) { - deviceWellService.deleteByDeviceId(entity.getId()); + deviceWellService.logicDelete(entity.getId()); deviceWellService.save(createDeviceWell(entity.getId(), wellDto.getWellId())); } } @@ -194,7 +192,7 @@ public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) { List deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page, Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType), Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline); deviceDtoList.forEach( - deviceDto ->deviceDto.setOnlineState(ObjectUtils.isEmpty(deviceDto.getOnlineState())||deviceDto.getOnlineState().equals("0") ? "0" : "1") + deviceDto -> deviceDto.setOnlineState(ObjectUtils.isEmpty(deviceDto.getOnlineState()) || deviceDto.getOnlineState().equals("0") ? "0" : "1") ); return deviceDtoList; } @@ -334,18 +332,27 @@ @Override - public void deleteByIds(List ids) { + public void batchDeletes(List ids) { + Long currentTime = new Date().getTime(); if (CollectionUtil.isNotEmpty(ids)) { ids.forEach(id -> { - this.baseMapper.deleteById(id); + this.logicDelete(id); //删除井设备关联关系 - deviceWellService.deleteByDeviceId(id); + deviceWellService.logicDelete(id); //删除设备集中器关联 deviceConcentratorService.deleteByDeviceId(id); }); } } + /** + * 设备删除有效值设置为当前时间戳 + * @param id + */ + private void logicDelete(Long id){ + this.baseMapper.logicDelete(id,new Date().getTime()); + } + @Override public ResponseData offlineListPage(DataScope dataScope, Page> page, String deviceCode, String deviceType) { @@ -406,4 +413,5 @@ public List getDeviceInWellInfo(Long id) { return this.baseMapper.getDeviceInWellInfo(id); } + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index cc153cb..dbe1b00 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -48,7 +48,7 @@ } @Cacheable(value = "CONSTANT", key = "'alarmContent-'+#sName") - public int getAlarmContentByName(String sName) { + public Integer getAlarmContentByName(String sName) { return sysDictMapper.getAlarmContentByName(sName); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 41ef398..5dcebf1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -210,7 +211,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); - map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { @@ -368,11 +369,10 @@ , HttpServletResponse httpServletResponse) throws IOException { Page> page = PageFactory.defaultPage(); - page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); + page.setCurrent(1); page.setSearchCount(false); - page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -405,7 +405,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.get("staff").toString()); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java new file mode 100644 index 0000000..8af0e15 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; +import java.util.Map; + +public enum DeviceDataFieldTableEnum { + + TABLE_FIELD(new HashMap() { + { + put("data_dig", "UPTIME AS lastDataTs,timestampdiff(DAY,bds.last_data_ts,now()) AS offlineDays"); + put("data_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gas_dector", "gas_sample_value AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_harmful_gas", "CONCAT(CO, ', ', CH4, ', ', H2S, ', ', O2) AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_hydrant", "0 AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_noise", "ddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_hum", "CONCAT(TEMPERATURE, ', ', HUMIDITY) AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_tube", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover", "descn AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_press", "press AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pantilt", "concentration AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover_loca", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellplus", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_h2s", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pressure", "re_val AS dataValue,devcode AS devcode,'' AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + } + }); + public Map tableNameMap; + + DeviceDataFieldTableEnum(Map tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public Map getTableFieldMap() { + return tableNameMap; + } +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java new file mode 100644 index 0000000..7a33eaf --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java @@ -0,0 +1,81 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; + +/** + * @author cz + * @date 2022-7-15 + * 上传数据总记录数 + */ +public enum DeviceDataTableEnum { + + DATA_DIG("data_dig", "开挖监测仪"), + DATA_GAS("data_gas", "燃气智能监测终端"), + DATA_GASLIQUID("data_gasliquid_gas,data_gasliquid_liquid", "燃气智能监测终端(一体化)"), + DATA_GAS_DECTOR("data_gas_dector", "燃气探测仪"), + DATA_HARMFUL_GAS("data_harmful_gas", "有害气体监测仪"), + DATA_HYDRANT("data_hydrant", "消防栓防盗水监测仪"), + DATA_LIQUID("data_liquid", "液位监测仪"), + DATA_NOISE("data_noise", "噪声记录仪"), + DATA_PANTILT("data_pantilt", "激光甲烷云台"), + DATA_TEMP_HUM("data_temp_hum", "温湿度监测仪"), + DATA_TUBE("data_tube", "管盯"), + DATA_WELLCOVER("data_wellcover", "井盖状态监测仪"), + DATA_TEMP_PRESS("data_temp_press", "压力温度检测仪"), + DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖定位监测仪"), + DATA_WELLPLUS("data_wellplus", "井盖液位一体机"), + DATA_H2S("data_h2s", "硫化氢检测终端"), + DATA_PRESSURE("data_pressure", "压力检测终端"), + DEVICE_TYPE_TABLE(new HashMap() { + { + put(1, DATA_WELLCOVER); + put(2, DATA_LIQUID); + put(3, DATA_HARMFUL_GAS); + put(4, DATA_GAS); + put(5, DATA_TEMP_HUM); + put(6, DATA_DIG); + put(7, DATA_WELLCOVER_LOCA); + put(8, DATA_NOISE); + put(9, DATA_TEMP_PRESS); + put(10, DATA_GASLIQUID); + put(11, DATA_HYDRANT); + put(12, DATA_TUBE); + put(13, DATA_WELLPLUS); + put(14, DATA_H2S); + put(21, DATA_PANTILT); + put(22, DATA_H2S); + put(23, DATA_GAS); + put(24, DATA_TEMP_PRESS); + put(101, DATA_GAS_DECTOR); + } + }); + + String typeName; + String tableName; + + DeviceDataTableEnum(String tableName, String typeName) { + this.typeName = typeName; + this.tableName = tableName; + } + + public String getTypeName() { + return typeName; + } + + public String getTableName() { + return tableName; + } + + + public HashMap tableNameMap; + + DeviceDataTableEnum(HashMap tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public HashMap getTableNameMap() { + return tableNameMap; + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 5f73387..b1258a9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -560,13 +560,13 @@ List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (dValue <= 20.0) { - deviceDataExcelDto.setLiquiddata(dValue + "%LEL"); + deviceDataExcelDto.setStrength(dValue + "%LEL"); } else { DecimalFormat df = new DecimalFormat("0.00"); dValue = dValue / 20.0; - deviceDataExcelDto.setLiquiddata(df.format(dValue) + "%VOL"); + deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL"); } } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index ee33ee4..4e439ae 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -36,10 +36,10 @@ * 第三方燃气列表 */ @RequestMapping("/gasdector/list-page") - public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getGasDectorListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -48,17 +48,17 @@ * 第三方燃气导出 */ @RequestMapping("/gasdector/export") - public void getGasDectorExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getGasDectorExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(GasDectorDataDto.class, page.getRecords(), DeviceExportEnum.GASDATA_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } @@ -66,10 +66,10 @@ * 第三方甲烷列表 */ @RequestMapping("/pantilt/list-page") - public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getPantiltDataListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -78,17 +78,17 @@ * 第三方甲烷导出 */ @RequestMapping("/pantilt/export") - public void getPantiltDataExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getPantiltDataExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(PantiltDataDto.class, page.getRecords(), DeviceExportEnum.METHANE_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 1aaa281..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -519,9 +519,9 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { - deviceDataExcelDto.setLiquiddata("正常水位"); + deviceDataExcelDto.setStrength("正常水位"); } } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 2b665fa..9959ef3 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -251,8 +251,8 @@ @ResponseBody @Permission @BussinessLog(value = "删除设备信息") - public Object delete(@RequestParam List ids) { - deviceService.deleteByIds(ids); + public Object batchDeletes(@RequestParam List ids) { + deviceService.batchDeletes(ids); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index efad32d..1b74128 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -7,6 +7,7 @@ import com.casic.missiles.modular.system.model.Device; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; import java.util.Map; @@ -47,5 +48,6 @@ DeviceDto getDetailById(@Param("id") String id); + Integer logicDelete(@Param("id")Long id,@Param("currentTime") Long currentTime); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java index 416eea9..ecf0daf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.modular.system.model.DeviceWell; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,7 @@ public interface DeviceWellMapper extends BaseMapper { void updateByDeviceId(Long deviceId, Long wellId); + + Integer logicDelete(@Param("deviceId") Long deviceId,@Param("currentTime") Long currentTime); + } 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 a4cc371..d9d1be3 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 @@ -218,7 +218,7 @@ SELECT id, devcode, deviceName, - deviceType, + device_type, deviceTypeName, wellId, deptid, @@ -267,20 +267,12 @@ bd.devcode AS devcode, bdt.TYPE_NAME AS deviceTypeName, bd.device_type AS deviceType, - bwi.well_code AS wellCode, - bds.last_data_ts AS lastDataTs, - timestampdiff( - DAY, - bds.last_data_ts, - now()) AS offlineDays - FROM - bus_device_status bds - JOIN bus_device bd ON bds.device_id = bd.id - JOIN bus_device_well bdw ON bdw.device_id = bds.device_id + bwi.well_code AS wellCode + FROM bus_device bd + JOIN bus_device_well bdw ON bdw.device_id = bd.id JOIN bus_well_info bwi ON bwi.ID = bdw.well_id JOIN base_device_type bdt on bdt.ID = bd.DEVICE_TYPE - WHERE - bds.online_State = '0' + WHERE bd.online_state = '0' AND bd.DEVCODE = #{deviceCode} @@ -289,10 +281,31 @@ + + + + update bus_device + set valid=#{currentTime} + where id=#{id} + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index 9bd5107..a0767b6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -19,4 +19,10 @@ UPDATE bus_device_well SET WELL_ID = #{wellId} WHERE DEVICE_ID = #{deviceId} + + update bus_device_well + set valid=#{currentTime} + where device_id=#{deviceId} + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java index e51bb6d..2ef2881 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java @@ -15,6 +15,9 @@ void updateByDeviceId(Long deviceId, Long concId); + public DeviceConcentrator getDeviceConcentratorBydevId(Long devId); + void deleteByDeviceId(Long id); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 53f9528..6fc2835 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -65,7 +65,7 @@ List addDeviceBatch(List results); - void deleteByIds(List ids); + void batchDeletes(List ids); ResponseData addDevice(Device device); ResponseData offlineListPage(DataScope dataScope, Page> page, diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java index 2ac0fe7..c5669fd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java @@ -16,5 +16,5 @@ void updateByDeviceId(Long deviceId, Long wellId); DeviceWell getDeviceWellByDevId(Long devId); - void deleteByDeviceId(Long id); + void logicDelete(Long id); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index d32e3b7..a07df56 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -3,11 +3,9 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.core.common.constant.Const; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.exception.ServiceException; @@ -152,7 +150,7 @@ throw gunsException; } if (!deviceWell.getWellId().equals(wellDto.getWellId())) { - deviceWellService.deleteByDeviceId(entity.getId()); + deviceWellService.logicDelete(entity.getId()); deviceWellService.save(createDeviceWell(entity.getId(), wellDto.getWellId())); } } @@ -194,7 +192,7 @@ public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) { List deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page, Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType), Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline); deviceDtoList.forEach( - deviceDto ->deviceDto.setOnlineState(ObjectUtils.isEmpty(deviceDto.getOnlineState())||deviceDto.getOnlineState().equals("0") ? "0" : "1") + deviceDto -> deviceDto.setOnlineState(ObjectUtils.isEmpty(deviceDto.getOnlineState()) || deviceDto.getOnlineState().equals("0") ? "0" : "1") ); return deviceDtoList; } @@ -334,18 +332,27 @@ @Override - public void deleteByIds(List ids) { + public void batchDeletes(List ids) { + Long currentTime = new Date().getTime(); if (CollectionUtil.isNotEmpty(ids)) { ids.forEach(id -> { - this.baseMapper.deleteById(id); + this.logicDelete(id); //删除井设备关联关系 - deviceWellService.deleteByDeviceId(id); + deviceWellService.logicDelete(id); //删除设备集中器关联 deviceConcentratorService.deleteByDeviceId(id); }); } } + /** + * 设备删除有效值设置为当前时间戳 + * @param id + */ + private void logicDelete(Long id){ + this.baseMapper.logicDelete(id,new Date().getTime()); + } + @Override public ResponseData offlineListPage(DataScope dataScope, Page> page, String deviceCode, String deviceType) { @@ -406,4 +413,5 @@ public List getDeviceInWellInfo(Long id) { return this.baseMapper.getDeviceInWellInfo(id); } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceWellServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceWellServiceImpl.java index 0b750bc..c19cffb 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceWellServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceWellServiceImpl.java @@ -5,8 +5,11 @@ import com.casic.missiles.modular.system.dao.DeviceWellMapper; import com.casic.missiles.modular.system.model.DeviceWell; import com.casic.missiles.modular.system.service.IDeviceWellService; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; +import java.util.Date; + /** *

* 设备闸井关联表 服务实现类 @@ -27,12 +30,11 @@ } @Override - public void deleteByDeviceId(Long id) { + public void logicDelete(Long id) { QueryWrapper del = new QueryWrapper<>(); del.eq("DEVICE_ID", id); - this.baseMapper.delete(del); + this.baseMapper.logicDelete(id,new Date().getTime()); } - @Override public void updateByDeviceId(Long deviceId, Long wellId) { this.baseMapper.updateByDeviceId(deviceId, wellId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index cc153cb..dbe1b00 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -48,7 +48,7 @@ } @Cacheable(value = "CONSTANT", key = "'alarmContent-'+#sName") - public int getAlarmContentByName(String sName) { + public Integer getAlarmContentByName(String sName) { return sysDictMapper.getAlarmContentByName(sName); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 41ef398..5dcebf1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -210,7 +211,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); - map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { @@ -368,11 +369,10 @@ , HttpServletResponse httpServletResponse) throws IOException { Page> page = PageFactory.defaultPage(); - page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); + page.setCurrent(1); page.setSearchCount(false); - page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -405,7 +405,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.get("staff").toString()); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java new file mode 100644 index 0000000..8af0e15 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; +import java.util.Map; + +public enum DeviceDataFieldTableEnum { + + TABLE_FIELD(new HashMap() { + { + put("data_dig", "UPTIME AS lastDataTs,timestampdiff(DAY,bds.last_data_ts,now()) AS offlineDays"); + put("data_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gas_dector", "gas_sample_value AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_harmful_gas", "CONCAT(CO, ', ', CH4, ', ', H2S, ', ', O2) AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_hydrant", "0 AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_noise", "ddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_hum", "CONCAT(TEMPERATURE, ', ', HUMIDITY) AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_tube", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover", "descn AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_press", "press AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pantilt", "concentration AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover_loca", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellplus", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_h2s", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pressure", "re_val AS dataValue,devcode AS devcode,'' AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + } + }); + public Map tableNameMap; + + DeviceDataFieldTableEnum(Map tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public Map getTableFieldMap() { + return tableNameMap; + } +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java new file mode 100644 index 0000000..7a33eaf --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java @@ -0,0 +1,81 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; + +/** + * @author cz + * @date 2022-7-15 + * 上传数据总记录数 + */ +public enum DeviceDataTableEnum { + + DATA_DIG("data_dig", "开挖监测仪"), + DATA_GAS("data_gas", "燃气智能监测终端"), + DATA_GASLIQUID("data_gasliquid_gas,data_gasliquid_liquid", "燃气智能监测终端(一体化)"), + DATA_GAS_DECTOR("data_gas_dector", "燃气探测仪"), + DATA_HARMFUL_GAS("data_harmful_gas", "有害气体监测仪"), + DATA_HYDRANT("data_hydrant", "消防栓防盗水监测仪"), + DATA_LIQUID("data_liquid", "液位监测仪"), + DATA_NOISE("data_noise", "噪声记录仪"), + DATA_PANTILT("data_pantilt", "激光甲烷云台"), + DATA_TEMP_HUM("data_temp_hum", "温湿度监测仪"), + DATA_TUBE("data_tube", "管盯"), + DATA_WELLCOVER("data_wellcover", "井盖状态监测仪"), + DATA_TEMP_PRESS("data_temp_press", "压力温度检测仪"), + DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖定位监测仪"), + DATA_WELLPLUS("data_wellplus", "井盖液位一体机"), + DATA_H2S("data_h2s", "硫化氢检测终端"), + DATA_PRESSURE("data_pressure", "压力检测终端"), + DEVICE_TYPE_TABLE(new HashMap() { + { + put(1, DATA_WELLCOVER); + put(2, DATA_LIQUID); + put(3, DATA_HARMFUL_GAS); + put(4, DATA_GAS); + put(5, DATA_TEMP_HUM); + put(6, DATA_DIG); + put(7, DATA_WELLCOVER_LOCA); + put(8, DATA_NOISE); + put(9, DATA_TEMP_PRESS); + put(10, DATA_GASLIQUID); + put(11, DATA_HYDRANT); + put(12, DATA_TUBE); + put(13, DATA_WELLPLUS); + put(14, DATA_H2S); + put(21, DATA_PANTILT); + put(22, DATA_H2S); + put(23, DATA_GAS); + put(24, DATA_TEMP_PRESS); + put(101, DATA_GAS_DECTOR); + } + }); + + String typeName; + String tableName; + + DeviceDataTableEnum(String tableName, String typeName) { + this.typeName = typeName; + this.tableName = tableName; + } + + public String getTypeName() { + return typeName; + } + + public String getTableName() { + return tableName; + } + + + public HashMap tableNameMap; + + DeviceDataTableEnum(HashMap tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public HashMap getTableNameMap() { + return tableNameMap; + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 5f73387..b1258a9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -560,13 +560,13 @@ List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (dValue <= 20.0) { - deviceDataExcelDto.setLiquiddata(dValue + "%LEL"); + deviceDataExcelDto.setStrength(dValue + "%LEL"); } else { DecimalFormat df = new DecimalFormat("0.00"); dValue = dValue / 20.0; - deviceDataExcelDto.setLiquiddata(df.format(dValue) + "%VOL"); + deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL"); } } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index ee33ee4..4e439ae 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -36,10 +36,10 @@ * 第三方燃气列表 */ @RequestMapping("/gasdector/list-page") - public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getGasDectorListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -48,17 +48,17 @@ * 第三方燃气导出 */ @RequestMapping("/gasdector/export") - public void getGasDectorExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getGasDectorExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(GasDectorDataDto.class, page.getRecords(), DeviceExportEnum.GASDATA_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } @@ -66,10 +66,10 @@ * 第三方甲烷列表 */ @RequestMapping("/pantilt/list-page") - public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getPantiltDataListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -78,17 +78,17 @@ * 第三方甲烷导出 */ @RequestMapping("/pantilt/export") - public void getPantiltDataExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getPantiltDataExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(PantiltDataDto.class, page.getRecords(), DeviceExportEnum.METHANE_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 1aaa281..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -519,9 +519,9 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { - deviceDataExcelDto.setLiquiddata("正常水位"); + deviceDataExcelDto.setStrength("正常水位"); } } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 2b665fa..9959ef3 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -251,8 +251,8 @@ @ResponseBody @Permission @BussinessLog(value = "删除设备信息") - public Object delete(@RequestParam List ids) { - deviceService.deleteByIds(ids); + public Object batchDeletes(@RequestParam List ids) { + deviceService.batchDeletes(ids); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index efad32d..1b74128 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -7,6 +7,7 @@ import com.casic.missiles.modular.system.model.Device; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; import java.util.Map; @@ -47,5 +48,6 @@ DeviceDto getDetailById(@Param("id") String id); + Integer logicDelete(@Param("id")Long id,@Param("currentTime") Long currentTime); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java index 416eea9..ecf0daf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.modular.system.model.DeviceWell; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,7 @@ public interface DeviceWellMapper extends BaseMapper { void updateByDeviceId(Long deviceId, Long wellId); + + Integer logicDelete(@Param("deviceId") Long deviceId,@Param("currentTime") Long currentTime); + } 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 a4cc371..d9d1be3 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 @@ -218,7 +218,7 @@ SELECT id, devcode, deviceName, - deviceType, + device_type, deviceTypeName, wellId, deptid, @@ -267,20 +267,12 @@ bd.devcode AS devcode, bdt.TYPE_NAME AS deviceTypeName, bd.device_type AS deviceType, - bwi.well_code AS wellCode, - bds.last_data_ts AS lastDataTs, - timestampdiff( - DAY, - bds.last_data_ts, - now()) AS offlineDays - FROM - bus_device_status bds - JOIN bus_device bd ON bds.device_id = bd.id - JOIN bus_device_well bdw ON bdw.device_id = bds.device_id + bwi.well_code AS wellCode + FROM bus_device bd + JOIN bus_device_well bdw ON bdw.device_id = bd.id JOIN bus_well_info bwi ON bwi.ID = bdw.well_id JOIN base_device_type bdt on bdt.ID = bd.DEVICE_TYPE - WHERE - bds.online_State = '0' + WHERE bd.online_state = '0' AND bd.DEVCODE = #{deviceCode} @@ -289,10 +281,31 @@ + + + + update bus_device + set valid=#{currentTime} + where id=#{id} + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index 9bd5107..a0767b6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -19,4 +19,10 @@ UPDATE bus_device_well SET WELL_ID = #{wellId} WHERE DEVICE_ID = #{deviceId} + + update bus_device_well + set valid=#{currentTime} + where device_id=#{deviceId} + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java index e51bb6d..2ef2881 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java @@ -15,6 +15,9 @@ void updateByDeviceId(Long deviceId, Long concId); + public DeviceConcentrator getDeviceConcentratorBydevId(Long devId); + void deleteByDeviceId(Long id); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 53f9528..6fc2835 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -65,7 +65,7 @@ List addDeviceBatch(List results); - void deleteByIds(List ids); + void batchDeletes(List ids); ResponseData addDevice(Device device); ResponseData offlineListPage(DataScope dataScope, Page> page, diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java index 2ac0fe7..c5669fd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java @@ -16,5 +16,5 @@ void updateByDeviceId(Long deviceId, Long wellId); DeviceWell getDeviceWellByDevId(Long devId); - void deleteByDeviceId(Long id); + void logicDelete(Long id); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index d32e3b7..a07df56 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -3,11 +3,9 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.core.common.constant.Const; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.exception.ServiceException; @@ -152,7 +150,7 @@ throw gunsException; } if (!deviceWell.getWellId().equals(wellDto.getWellId())) { - deviceWellService.deleteByDeviceId(entity.getId()); + deviceWellService.logicDelete(entity.getId()); deviceWellService.save(createDeviceWell(entity.getId(), wellDto.getWellId())); } } @@ -194,7 +192,7 @@ public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) { List deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page, Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType), Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline); deviceDtoList.forEach( - deviceDto ->deviceDto.setOnlineState(ObjectUtils.isEmpty(deviceDto.getOnlineState())||deviceDto.getOnlineState().equals("0") ? "0" : "1") + deviceDto -> deviceDto.setOnlineState(ObjectUtils.isEmpty(deviceDto.getOnlineState()) || deviceDto.getOnlineState().equals("0") ? "0" : "1") ); return deviceDtoList; } @@ -334,18 +332,27 @@ @Override - public void deleteByIds(List ids) { + public void batchDeletes(List ids) { + Long currentTime = new Date().getTime(); if (CollectionUtil.isNotEmpty(ids)) { ids.forEach(id -> { - this.baseMapper.deleteById(id); + this.logicDelete(id); //删除井设备关联关系 - deviceWellService.deleteByDeviceId(id); + deviceWellService.logicDelete(id); //删除设备集中器关联 deviceConcentratorService.deleteByDeviceId(id); }); } } + /** + * 设备删除有效值设置为当前时间戳 + * @param id + */ + private void logicDelete(Long id){ + this.baseMapper.logicDelete(id,new Date().getTime()); + } + @Override public ResponseData offlineListPage(DataScope dataScope, Page> page, String deviceCode, String deviceType) { @@ -406,4 +413,5 @@ public List getDeviceInWellInfo(Long id) { return this.baseMapper.getDeviceInWellInfo(id); } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceWellServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceWellServiceImpl.java index 0b750bc..c19cffb 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceWellServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceWellServiceImpl.java @@ -5,8 +5,11 @@ import com.casic.missiles.modular.system.dao.DeviceWellMapper; import com.casic.missiles.modular.system.model.DeviceWell; import com.casic.missiles.modular.system.service.IDeviceWellService; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; +import java.util.Date; + /** *

* 设备闸井关联表 服务实现类 @@ -27,12 +30,11 @@ } @Override - public void deleteByDeviceId(Long id) { + public void logicDelete(Long id) { QueryWrapper del = new QueryWrapper<>(); del.eq("DEVICE_ID", id); - this.baseMapper.delete(del); + this.baseMapper.logicDelete(id,new Date().getTime()); } - @Override public void updateByDeviceId(Long deviceId, Long wellId) { this.baseMapper.updateByDeviceId(deviceId, wellId); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java index 40d4c87..c67a350 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java @@ -51,6 +51,6 @@ @ExcelProperty("电量") private String cell; @ExcelProperty("设备数据值") - private String liquiddata; + private String strength; private String logtime; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index cc153cb..dbe1b00 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -48,7 +48,7 @@ } @Cacheable(value = "CONSTANT", key = "'alarmContent-'+#sName") - public int getAlarmContentByName(String sName) { + public Integer getAlarmContentByName(String sName) { return sysDictMapper.getAlarmContentByName(sName); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 41ef398..5dcebf1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -210,7 +211,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); - map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { @@ -368,11 +369,10 @@ , HttpServletResponse httpServletResponse) throws IOException { Page> page = PageFactory.defaultPage(); - page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); + page.setCurrent(1); page.setSearchCount(false); - page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -405,7 +405,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.get("staff").toString()); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")?alarmExp.get("handleJobPerson").toString():"-"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java new file mode 100644 index 0000000..8af0e15 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; +import java.util.Map; + +public enum DeviceDataFieldTableEnum { + + TABLE_FIELD(new HashMap() { + { + put("data_dig", "UPTIME AS lastDataTs,timestampdiff(DAY,bds.last_data_ts,now()) AS offlineDays"); + put("data_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_gas", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gasliquid_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_gas_dector", "gas_sample_value AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_harmful_gas", "CONCAT(CO, ', ', CH4, ', ', H2S, ', ', O2) AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_hydrant", "0 AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_liquid", "liquiddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_noise", "ddata AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_hum", "CONCAT(TEMPERATURE, ', ', HUMIDITY) AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_tube", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover", "descn AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_temp_press", "press AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pantilt", "concentration AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellcover_loca", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_wellplus", "0 AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_h2s", "strength AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + put("data_pressure", "re_val AS dataValue,devcode AS devcode,'' AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime"); + } + }); + public Map tableNameMap; + + DeviceDataFieldTableEnum(Map tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public Map getTableFieldMap() { + return tableNameMap; + } +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java new file mode 100644 index 0000000..7a33eaf --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataTableEnum.java @@ -0,0 +1,81 @@ +package com.casic.missiles.modular.system.util; + +import java.util.HashMap; + +/** + * @author cz + * @date 2022-7-15 + * 上传数据总记录数 + */ +public enum DeviceDataTableEnum { + + DATA_DIG("data_dig", "开挖监测仪"), + DATA_GAS("data_gas", "燃气智能监测终端"), + DATA_GASLIQUID("data_gasliquid_gas,data_gasliquid_liquid", "燃气智能监测终端(一体化)"), + DATA_GAS_DECTOR("data_gas_dector", "燃气探测仪"), + DATA_HARMFUL_GAS("data_harmful_gas", "有害气体监测仪"), + DATA_HYDRANT("data_hydrant", "消防栓防盗水监测仪"), + DATA_LIQUID("data_liquid", "液位监测仪"), + DATA_NOISE("data_noise", "噪声记录仪"), + DATA_PANTILT("data_pantilt", "激光甲烷云台"), + DATA_TEMP_HUM("data_temp_hum", "温湿度监测仪"), + DATA_TUBE("data_tube", "管盯"), + DATA_WELLCOVER("data_wellcover", "井盖状态监测仪"), + DATA_TEMP_PRESS("data_temp_press", "压力温度检测仪"), + DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖定位监测仪"), + DATA_WELLPLUS("data_wellplus", "井盖液位一体机"), + DATA_H2S("data_h2s", "硫化氢检测终端"), + DATA_PRESSURE("data_pressure", "压力检测终端"), + DEVICE_TYPE_TABLE(new HashMap() { + { + put(1, DATA_WELLCOVER); + put(2, DATA_LIQUID); + put(3, DATA_HARMFUL_GAS); + put(4, DATA_GAS); + put(5, DATA_TEMP_HUM); + put(6, DATA_DIG); + put(7, DATA_WELLCOVER_LOCA); + put(8, DATA_NOISE); + put(9, DATA_TEMP_PRESS); + put(10, DATA_GASLIQUID); + put(11, DATA_HYDRANT); + put(12, DATA_TUBE); + put(13, DATA_WELLPLUS); + put(14, DATA_H2S); + put(21, DATA_PANTILT); + put(22, DATA_H2S); + put(23, DATA_GAS); + put(24, DATA_TEMP_PRESS); + put(101, DATA_GAS_DECTOR); + } + }); + + String typeName; + String tableName; + + DeviceDataTableEnum(String tableName, String typeName) { + this.typeName = typeName; + this.tableName = tableName; + } + + public String getTypeName() { + return typeName; + } + + public String getTableName() { + return tableName; + } + + + public HashMap tableNameMap; + + DeviceDataTableEnum(HashMap tableNameMap) { + this.tableNameMap = tableNameMap; + } + + public HashMap getTableNameMap() { + return tableNameMap; + } + + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 5f73387..b1258a9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -560,13 +560,13 @@ List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (dValue <= 20.0) { - deviceDataExcelDto.setLiquiddata(dValue + "%LEL"); + deviceDataExcelDto.setStrength(dValue + "%LEL"); } else { DecimalFormat df = new DecimalFormat("0.00"); dValue = dValue / 20.0; - deviceDataExcelDto.setLiquiddata(df.format(dValue) + "%VOL"); + deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL"); } } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index ee33ee4..4e439ae 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -36,10 +36,10 @@ * 第三方燃气列表 */ @RequestMapping("/gasdector/list-page") - public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getGasDectorListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -48,17 +48,17 @@ * 第三方燃气导出 */ @RequestMapping("/gasdector/export") - public void getGasDectorExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getGasDectorExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(GasDectorDataDto.class, page.getRecords(), DeviceExportEnum.GASDATA_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方燃气数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } @@ -66,10 +66,10 @@ * 第三方甲烷列表 */ @RequestMapping("/pantilt/list-page") - public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) { + public Object getPantiltDataListPage(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + ResponseData responseData = thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); responseData.setData(super.packForBT(page)); return responseData; } @@ -78,17 +78,17 @@ * 第三方甲烷导出 */ @RequestMapping("/pantilt/export") - public void getPantiltDataExport(String keyWords, String endTime, String beginTime, String deptid) { + public void getPantiltDataExport(String keywords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords); + thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keywords); try { super.exportExcel(PantiltDataDto.class, page.getRecords(), DeviceExportEnum.METHANE_EXPORT.getFileName()); } catch (IOException iex) { - log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keyWords, dataScope, iex); + log.error("主题，第三方甲烷数据导出异常,关键字{}，部门编号{},异常信息{}", keywords, dataScope, iex); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 1aaa281..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -519,9 +519,9 @@ deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid()))); // setCompany(map); if ("liquid".equals(sensorType)) { - float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getLiquiddata()) ? "0" : deviceDataExcelDto.getLiquiddata()); + float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength()); if (liquiddata <= 0) { - deviceDataExcelDto.setLiquiddata("正常水位"); + deviceDataExcelDto.setStrength("正常水位"); } } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 2b665fa..9959ef3 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -251,8 +251,8 @@ @ResponseBody @Permission @BussinessLog(value = "删除设备信息") - public Object delete(@RequestParam List ids) { - deviceService.deleteByIds(ids); + public Object batchDeletes(@RequestParam List ids) { + deviceService.batchDeletes(ids); return ResponseData.success(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index efad32d..1b74128 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -7,6 +7,7 @@ import com.casic.missiles.modular.system.model.Device; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; import java.util.Map; @@ -47,5 +48,6 @@ DeviceDto getDetailById(@Param("id") String id); + Integer logicDelete(@Param("id")Long id,@Param("currentTime") Long currentTime); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java index 416eea9..ecf0daf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceWellMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.modular.system.model.DeviceWell; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,7 @@ public interface DeviceWellMapper extends BaseMapper { void updateByDeviceId(Long deviceId, Long wellId); + + Integer logicDelete(@Param("deviceId") Long deviceId,@Param("currentTime") Long currentTime); + } 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 a4cc371..d9d1be3 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 @@ -218,7 +218,7 @@ SELECT id, devcode, deviceName, - deviceType, + device_type, deviceTypeName, wellId, deptid, @@ -267,20 +267,12 @@ bd.devcode AS devcode, bdt.TYPE_NAME AS deviceTypeName, bd.device_type AS deviceType, - bwi.well_code AS wellCode, - bds.last_data_ts AS lastDataTs, - timestampdiff( - DAY, - bds.last_data_ts, - now()) AS offlineDays - FROM - bus_device_status bds - JOIN bus_device bd ON bds.device_id = bd.id - JOIN bus_device_well bdw ON bdw.device_id = bds.device_id + bwi.well_code AS wellCode + FROM bus_device bd + JOIN bus_device_well bdw ON bdw.device_id = bd.id JOIN bus_well_info bwi ON bwi.ID = bdw.well_id JOIN base_device_type bdt on bdt.ID = bd.DEVICE_TYPE - WHERE - bds.online_State = '0' + WHERE bd.online_state = '0' AND bd.DEVCODE = #{deviceCode} @@ -289,10 +281,31 @@ + + + + update bus_device + set valid=#{currentTime} + where id=#{id} + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index 9bd5107..a0767b6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -19,4 +19,10 @@ UPDATE bus_device_well SET WELL_ID = #{wellId} WHERE DEVICE_ID = #{deviceId} + + update bus_device_well + set valid=#{currentTime} + where device_id=#{deviceId} + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java index e51bb6d..2ef2881 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceConcentratorService.java @@ -15,6 +15,9 @@ void updateByDeviceId(Long deviceId, Long concId); + public DeviceConcentrator getDeviceConcentratorBydevId(Long devId); + void deleteByDeviceId(Long id); + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 53f9528..6fc2835 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -65,7 +65,7 @@ List addDeviceBatch(List results); - void deleteByIds(List ids); + void batchDeletes(List ids); ResponseData addDevice(Device device); ResponseData offlineListPage(DataScope dataScope, Page> page, diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java index 2ac0fe7..c5669fd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java @@ -16,5 +16,5 @@ void updateByDeviceId(Long deviceId, Long wellId); DeviceWell getDeviceWellByDevId(Long devId); - void deleteByDeviceId(Long id); + void logicDelete(Long id); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index d32e3b7..a07df56 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -3,11 +3,9 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.casic.missiles.core.common.constant.Const; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.exception.ServiceException; @@ -152,7 +150,7 @@ throw gunsException; } if (!deviceWell.getWellId().equals(wellDto.getWellId())) { - deviceWellService.deleteByDeviceId(entity.getId()); + deviceWellService.logicDelete(entity.getId()); deviceWellService.save(createDeviceWell(entity.getId(), wellDto.getWellId())); } } @@ -194,7 +192,7 @@ public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) { List deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page, Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType), Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline); deviceDtoList.forEach( - deviceDto ->deviceDto.setOnlineState(ObjectUtils.isEmpty(deviceDto.getOnlineState())||deviceDto.getOnlineState().equals("0") ? "0" : "1") + deviceDto -> deviceDto.setOnlineState(ObjectUtils.isEmpty(deviceDto.getOnlineState()) || deviceDto.getOnlineState().equals("0") ? "0" : "1") ); return deviceDtoList; } @@ -334,18 +332,27 @@ @Override - public void deleteByIds(List ids) { + public void batchDeletes(List ids) { + Long currentTime = new Date().getTime(); if (CollectionUtil.isNotEmpty(ids)) { ids.forEach(id -> { - this.baseMapper.deleteById(id); + this.logicDelete(id); //删除井设备关联关系 - deviceWellService.deleteByDeviceId(id); + deviceWellService.logicDelete(id); //删除设备集中器关联 deviceConcentratorService.deleteByDeviceId(id); }); } } + /** + * 设备删除有效值设置为当前时间戳 + * @param id + */ + private void logicDelete(Long id){ + this.baseMapper.logicDelete(id,new Date().getTime()); + } + @Override public ResponseData offlineListPage(DataScope dataScope, Page> page, String deviceCode, String deviceType) { @@ -406,4 +413,5 @@ public List getDeviceInWellInfo(Long id) { return this.baseMapper.getDeviceInWellInfo(id); } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceWellServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceWellServiceImpl.java index 0b750bc..c19cffb 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceWellServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceWellServiceImpl.java @@ -5,8 +5,11 @@ import com.casic.missiles.modular.system.dao.DeviceWellMapper; import com.casic.missiles.modular.system.model.DeviceWell; import com.casic.missiles.modular.system.service.IDeviceWellService; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; +import java.util.Date; + /** *

* 设备闸井关联表 服务实现类 @@ -27,12 +30,11 @@ } @Override - public void deleteByDeviceId(Long id) { + public void logicDelete(Long id) { QueryWrapper del = new QueryWrapper<>(); del.eq("DEVICE_ID", id); - this.baseMapper.delete(del); + this.baseMapper.logicDelete(id,new Date().getTime()); } - @Override public void updateByDeviceId(Long deviceId, Long wellId) { this.baseMapper.updateByDeviceId(deviceId, wellId); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java index 40d4c87..c67a350 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java @@ -51,6 +51,6 @@ @ExcelProperty("电量") private String cell; @ExcelProperty("设备数据值") - private String liquiddata; + private String strength; private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java index 3eaebd9..a669e3d 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -73,7 +73,6 @@ /** * 是否有效 */ - @TableLogic(value = "1",delval = "0") @TableField("VALID") private String valid; /**