diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index df59231..70193fa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -129,15 +129,12 @@ alarmObj.put("areaFullName", deviceService.getAreaFullNameById(alarmObj.get("area").toString()) + "/" + alarmObj.get("position")); alarmObj.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmObj.get("alarmType").toString())); }); - FileInputStream fileInputStream = null; if (ToolUtil.isEmpty(alarmExpList)) { fileInputStream = new FileInputStream(templatePath+"/alarmRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath+"/alarmRecTemplate.xlsx"); } - - try { httpServletResponse.setContentType("application/octet-stream"); httpServletResponse.addHeader("Content-Disposition", " attachment;filename="+"alarmRecord.xlsx" ); @@ -231,10 +228,8 @@ @RequestParam(value = "endTime",required = false) String endTime, @RequestParam(value = "areaId",required = false) String areaId){ Map retMap = new HashMap<>(); - if (areaId.indexOf("00") > 0) areaId = areaId.substring(0, areaId.indexOf("00")); - //根据查询条件查询alarm_record记录 DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index df59231..70193fa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -129,15 +129,12 @@ alarmObj.put("areaFullName", deviceService.getAreaFullNameById(alarmObj.get("area").toString()) + "/" + alarmObj.get("position")); alarmObj.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmObj.get("alarmType").toString())); }); - FileInputStream fileInputStream = null; if (ToolUtil.isEmpty(alarmExpList)) { fileInputStream = new FileInputStream(templatePath+"/alarmRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath+"/alarmRecTemplate.xlsx"); } - - try { httpServletResponse.setContentType("application/octet-stream"); httpServletResponse.addHeader("Content-Disposition", " attachment;filename="+"alarmRecord.xlsx" ); @@ -231,10 +228,8 @@ @RequestParam(value = "endTime",required = false) String endTime, @RequestParam(value = "areaId",required = false) String areaId){ Map retMap = new HashMap<>(); - if (areaId.indexOf("00") > 0) areaId = areaId.substring(0, areaId.indexOf("00")); - //根据查询条件查询alarm_record记录 DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 811f023..8d9d258 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -29,7 +29,7 @@ Integer insertAlarmRecord(AlarmRecords alarmRec); - Boolean isOldAlarmRecord(String devCode,String MsgContent); + String isOldAlarmRecord(String devCode,String MsgContent); Integer updateOldAlarmRecord(String devCode,String MsgContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index df59231..70193fa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -129,15 +129,12 @@ alarmObj.put("areaFullName", deviceService.getAreaFullNameById(alarmObj.get("area").toString()) + "/" + alarmObj.get("position")); alarmObj.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmObj.get("alarmType").toString())); }); - FileInputStream fileInputStream = null; if (ToolUtil.isEmpty(alarmExpList)) { fileInputStream = new FileInputStream(templatePath+"/alarmRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath+"/alarmRecTemplate.xlsx"); } - - try { httpServletResponse.setContentType("application/octet-stream"); httpServletResponse.addHeader("Content-Disposition", " attachment;filename="+"alarmRecord.xlsx" ); @@ -231,10 +228,8 @@ @RequestParam(value = "endTime",required = false) String endTime, @RequestParam(value = "areaId",required = false) String areaId){ Map retMap = new HashMap<>(); - if (areaId.indexOf("00") > 0) areaId = areaId.substring(0, areaId.indexOf("00")); - //根据查询条件查询alarm_record记录 DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 811f023..8d9d258 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -29,7 +29,7 @@ Integer insertAlarmRecord(AlarmRecords alarmRec); - Boolean isOldAlarmRecord(String devCode,String MsgContent); + String isOldAlarmRecord(String devCode,String MsgContent); Integer updateOldAlarmRecord(String devCode,String MsgContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 60fa41a..9d4e4a2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -49,7 +49,8 @@ @Override public boolean cancelAlarm(long id, String jobStatus, String handleMessage, long personId) { - return this.baseMapper.cancelAlarm(id, jobStatus, handleMessage, personId); + this.baseMapper.cancelJob(id, jobStatus, handleMessage, personId); + return this.baseMapper.cancelAlarm(id); } @Override @@ -63,14 +64,12 @@ return this.baseMapper.insert(alarmRec); } - public Boolean isOldAlarmRecord(String devCode, String MsgContent) { - if (this.baseMapper.isOldAlarmRecord(devCode, MsgContent) == null) { - return false; - } - return true; + public String isOldAlarmRecord(String devCode, String MsgContent) { + return this.baseMapper.isOldAlarmRecord(devCode, MsgContent); + } public Integer updateOldAlarmRecord(String devCode, String MsgContent) { - return this.baseMapper.updateOldAlarmRecord(devCode, MsgContent); + return this.baseMapper.updateOldAlarmRecord(devCode, MsgContent); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index df59231..70193fa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -129,15 +129,12 @@ alarmObj.put("areaFullName", deviceService.getAreaFullNameById(alarmObj.get("area").toString()) + "/" + alarmObj.get("position")); alarmObj.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmObj.get("alarmType").toString())); }); - FileInputStream fileInputStream = null; if (ToolUtil.isEmpty(alarmExpList)) { fileInputStream = new FileInputStream(templatePath+"/alarmRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath+"/alarmRecTemplate.xlsx"); } - - try { httpServletResponse.setContentType("application/octet-stream"); httpServletResponse.addHeader("Content-Disposition", " attachment;filename="+"alarmRecord.xlsx" ); @@ -231,10 +228,8 @@ @RequestParam(value = "endTime",required = false) String endTime, @RequestParam(value = "areaId",required = false) String areaId){ Map retMap = new HashMap<>(); - if (areaId.indexOf("00") > 0) areaId = areaId.substring(0, areaId.indexOf("00")); - //根据查询条件查询alarm_record记录 DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 811f023..8d9d258 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -29,7 +29,7 @@ Integer insertAlarmRecord(AlarmRecords alarmRec); - Boolean isOldAlarmRecord(String devCode,String MsgContent); + String isOldAlarmRecord(String devCode,String MsgContent); Integer updateOldAlarmRecord(String devCode,String MsgContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 60fa41a..9d4e4a2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -49,7 +49,8 @@ @Override public boolean cancelAlarm(long id, String jobStatus, String handleMessage, long personId) { - return this.baseMapper.cancelAlarm(id, jobStatus, handleMessage, personId); + this.baseMapper.cancelJob(id, jobStatus, handleMessage, personId); + return this.baseMapper.cancelAlarm(id); } @Override @@ -63,14 +64,12 @@ return this.baseMapper.insert(alarmRec); } - public Boolean isOldAlarmRecord(String devCode, String MsgContent) { - if (this.baseMapper.isOldAlarmRecord(devCode, MsgContent) == null) { - return false; - } - return true; + public String isOldAlarmRecord(String devCode, String MsgContent) { + return this.baseMapper.isOldAlarmRecord(devCode, MsgContent); + } public Integer updateOldAlarmRecord(String devCode, String MsgContent) { - return this.baseMapper.updateOldAlarmRecord(devCode, MsgContent); + return this.baseMapper.updateOldAlarmRecord(devCode, MsgContent); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java index b3f23d5..6b60c4a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java @@ -10,6 +10,7 @@ import com.casic.missiles.modular.system.service.IDeviceService; import com.casic.missiles.modular.system.service.IGasFlowDataService; import lombok.extern.java.Log; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; @@ -122,13 +123,14 @@ alarmRecord.setAlarmTime(Calendar.getInstance().getTime()); alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用气量超阈值报警"); - if (alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用气量超阈值报警")) { - alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用气量超阈值报警"); + String jobId = alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { + alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(gasFlowAddr, wellDto.getWellCode(), "SLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); } - alarmRecordsService.insertAlarmRecord(alarmRecord); // 向前端推送报警 } else { @@ -147,8 +149,10 @@ alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用气量超阈值预警"); alarmRecord.setAlarmMessage("日用水量超阈值预警"); - if (alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用水量超阈值预警")) { - alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用水量超阈值预警"); + String jobId = alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { + alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(gasFlowAddr, wellDto.getWellCode(), "SLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index df59231..70193fa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -129,15 +129,12 @@ alarmObj.put("areaFullName", deviceService.getAreaFullNameById(alarmObj.get("area").toString()) + "/" + alarmObj.get("position")); alarmObj.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmObj.get("alarmType").toString())); }); - FileInputStream fileInputStream = null; if (ToolUtil.isEmpty(alarmExpList)) { fileInputStream = new FileInputStream(templatePath+"/alarmRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath+"/alarmRecTemplate.xlsx"); } - - try { httpServletResponse.setContentType("application/octet-stream"); httpServletResponse.addHeader("Content-Disposition", " attachment;filename="+"alarmRecord.xlsx" ); @@ -231,10 +228,8 @@ @RequestParam(value = "endTime",required = false) String endTime, @RequestParam(value = "areaId",required = false) String areaId){ Map retMap = new HashMap<>(); - if (areaId.indexOf("00") > 0) areaId = areaId.substring(0, areaId.indexOf("00")); - //根据查询条件查询alarm_record记录 DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 811f023..8d9d258 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -29,7 +29,7 @@ Integer insertAlarmRecord(AlarmRecords alarmRec); - Boolean isOldAlarmRecord(String devCode,String MsgContent); + String isOldAlarmRecord(String devCode,String MsgContent); Integer updateOldAlarmRecord(String devCode,String MsgContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 60fa41a..9d4e4a2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -49,7 +49,8 @@ @Override public boolean cancelAlarm(long id, String jobStatus, String handleMessage, long personId) { - return this.baseMapper.cancelAlarm(id, jobStatus, handleMessage, personId); + this.baseMapper.cancelJob(id, jobStatus, handleMessage, personId); + return this.baseMapper.cancelAlarm(id); } @Override @@ -63,14 +64,12 @@ return this.baseMapper.insert(alarmRec); } - public Boolean isOldAlarmRecord(String devCode, String MsgContent) { - if (this.baseMapper.isOldAlarmRecord(devCode, MsgContent) == null) { - return false; - } - return true; + public String isOldAlarmRecord(String devCode, String MsgContent) { + return this.baseMapper.isOldAlarmRecord(devCode, MsgContent); + } public Integer updateOldAlarmRecord(String devCode, String MsgContent) { - return this.baseMapper.updateOldAlarmRecord(devCode, MsgContent); + return this.baseMapper.updateOldAlarmRecord(devCode, MsgContent); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java index b3f23d5..6b60c4a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java @@ -10,6 +10,7 @@ import com.casic.missiles.modular.system.service.IDeviceService; import com.casic.missiles.modular.system.service.IGasFlowDataService; import lombok.extern.java.Log; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; @@ -122,13 +123,14 @@ alarmRecord.setAlarmTime(Calendar.getInstance().getTime()); alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用气量超阈值报警"); - if (alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用气量超阈值报警")) { - alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用气量超阈值报警"); + String jobId = alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { + alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(gasFlowAddr, wellDto.getWellCode(), "SLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); } - alarmRecordsService.insertAlarmRecord(alarmRecord); // 向前端推送报警 } else { @@ -147,8 +149,10 @@ alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用气量超阈值预警"); alarmRecord.setAlarmMessage("日用水量超阈值预警"); - if (alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用水量超阈值预警")) { - alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用水量超阈值预警"); + String jobId = alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { + alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(gasFlowAddr, wellDto.getWellCode(), "SLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java index 200f5d2..7677a87 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java @@ -10,6 +10,7 @@ import com.casic.missiles.modular.system.service.IDeviceService; import com.casic.missiles.modular.system.service.IWaterMeterDataService; import lombok.extern.java.Log; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; @@ -99,8 +100,8 @@ dataWaterMeter.setLogtime(Calendar.getInstance().getTime()); // 保存到数据库 同时计算日/月用水量 - double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter); - +// double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter); + double flowAccToday=100; // 判断是否报警/预警 AlarmRule alarmRule = alarmRuleService.selectAlarmRuleByDev(meterAddr, "1"); // 报警 AlarmRule alarmRuleWarn = alarmRuleService.selectAlarmRuleByDev(meterAddr, "2"); // 预警 @@ -117,8 +118,10 @@ alarmRecord.setAlarmTime(Calendar.getInstance().getTime()); alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用水量超阈值报警"); - if (alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值报警")) { + String jobId=alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { alarmRecordsService.updateOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(meterAddr, wellDto.getWellCode(), "QLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); @@ -139,8 +142,10 @@ alarmRecord.setAlarmTime(Calendar.getInstance().getTime()); alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用水量超阈值预警"); - if (alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值预警")) { - alarmRecordsService.updateOldAlarmRecord(meterAddr, "日用水量超阈值预警"); + String jobId=alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { + alarmRecordsService.updateOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(meterAddr, wellDto.getWellCode(), "QLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index df59231..70193fa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -129,15 +129,12 @@ alarmObj.put("areaFullName", deviceService.getAreaFullNameById(alarmObj.get("area").toString()) + "/" + alarmObj.get("position")); alarmObj.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmObj.get("alarmType").toString())); }); - FileInputStream fileInputStream = null; if (ToolUtil.isEmpty(alarmExpList)) { fileInputStream = new FileInputStream(templatePath+"/alarmRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath+"/alarmRecTemplate.xlsx"); } - - try { httpServletResponse.setContentType("application/octet-stream"); httpServletResponse.addHeader("Content-Disposition", " attachment;filename="+"alarmRecord.xlsx" ); @@ -231,10 +228,8 @@ @RequestParam(value = "endTime",required = false) String endTime, @RequestParam(value = "areaId",required = false) String areaId){ Map retMap = new HashMap<>(); - if (areaId.indexOf("00") > 0) areaId = areaId.substring(0, areaId.indexOf("00")); - //根据查询条件查询alarm_record记录 DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 811f023..8d9d258 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -29,7 +29,7 @@ Integer insertAlarmRecord(AlarmRecords alarmRec); - Boolean isOldAlarmRecord(String devCode,String MsgContent); + String isOldAlarmRecord(String devCode,String MsgContent); Integer updateOldAlarmRecord(String devCode,String MsgContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 60fa41a..9d4e4a2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -49,7 +49,8 @@ @Override public boolean cancelAlarm(long id, String jobStatus, String handleMessage, long personId) { - return this.baseMapper.cancelAlarm(id, jobStatus, handleMessage, personId); + this.baseMapper.cancelJob(id, jobStatus, handleMessage, personId); + return this.baseMapper.cancelAlarm(id); } @Override @@ -63,14 +64,12 @@ return this.baseMapper.insert(alarmRec); } - public Boolean isOldAlarmRecord(String devCode, String MsgContent) { - if (this.baseMapper.isOldAlarmRecord(devCode, MsgContent) == null) { - return false; - } - return true; + public String isOldAlarmRecord(String devCode, String MsgContent) { + return this.baseMapper.isOldAlarmRecord(devCode, MsgContent); + } public Integer updateOldAlarmRecord(String devCode, String MsgContent) { - return this.baseMapper.updateOldAlarmRecord(devCode, MsgContent); + return this.baseMapper.updateOldAlarmRecord(devCode, MsgContent); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java index b3f23d5..6b60c4a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java @@ -10,6 +10,7 @@ import com.casic.missiles.modular.system.service.IDeviceService; import com.casic.missiles.modular.system.service.IGasFlowDataService; import lombok.extern.java.Log; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; @@ -122,13 +123,14 @@ alarmRecord.setAlarmTime(Calendar.getInstance().getTime()); alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用气量超阈值报警"); - if (alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用气量超阈值报警")) { - alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用气量超阈值报警"); + String jobId = alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { + alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(gasFlowAddr, wellDto.getWellCode(), "SLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); } - alarmRecordsService.insertAlarmRecord(alarmRecord); // 向前端推送报警 } else { @@ -147,8 +149,10 @@ alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用气量超阈值预警"); alarmRecord.setAlarmMessage("日用水量超阈值预警"); - if (alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用水量超阈值预警")) { - alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用水量超阈值预警"); + String jobId = alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { + alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(gasFlowAddr, wellDto.getWellCode(), "SLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java index 200f5d2..7677a87 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java @@ -10,6 +10,7 @@ import com.casic.missiles.modular.system.service.IDeviceService; import com.casic.missiles.modular.system.service.IWaterMeterDataService; import lombok.extern.java.Log; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; @@ -99,8 +100,8 @@ dataWaterMeter.setLogtime(Calendar.getInstance().getTime()); // 保存到数据库 同时计算日/月用水量 - double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter); - +// double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter); + double flowAccToday=100; // 判断是否报警/预警 AlarmRule alarmRule = alarmRuleService.selectAlarmRuleByDev(meterAddr, "1"); // 报警 AlarmRule alarmRuleWarn = alarmRuleService.selectAlarmRuleByDev(meterAddr, "2"); // 预警 @@ -117,8 +118,10 @@ alarmRecord.setAlarmTime(Calendar.getInstance().getTime()); alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用水量超阈值报警"); - if (alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值报警")) { + String jobId=alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { alarmRecordsService.updateOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(meterAddr, wellDto.getWellCode(), "QLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); @@ -139,8 +142,10 @@ alarmRecord.setAlarmTime(Calendar.getInstance().getTime()); alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用水量超阈值预警"); - if (alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值预警")) { - alarmRecordsService.updateOldAlarmRecord(meterAddr, "日用水量超阈值预警"); + String jobId=alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { + alarmRecordsService.updateOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(meterAddr, wellDto.getWellCode(), "QLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java index d4c6a8b..8096ba2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -23,7 +23,10 @@ List alarmListNoPage(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("areaId") String areaId); - boolean cancelAlarm(@Param("id") long id, @Param("jobStatus") String jobStatus, @Param("handleMessage") String handleMessage, @Param("personId") long personId); + boolean cancelAlarm(@Param("id") long id); + + boolean cancelJob(@Param("id") long id, @Param("jobStatus") String jobStatus, @Param("handleMessage") String handleMessage, @Param("personId") long personId); + boolean cancelAlarmById(@Param("id") long id); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index df59231..70193fa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -129,15 +129,12 @@ alarmObj.put("areaFullName", deviceService.getAreaFullNameById(alarmObj.get("area").toString()) + "/" + alarmObj.get("position")); alarmObj.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmObj.get("alarmType").toString())); }); - FileInputStream fileInputStream = null; if (ToolUtil.isEmpty(alarmExpList)) { fileInputStream = new FileInputStream(templatePath+"/alarmRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath+"/alarmRecTemplate.xlsx"); } - - try { httpServletResponse.setContentType("application/octet-stream"); httpServletResponse.addHeader("Content-Disposition", " attachment;filename="+"alarmRecord.xlsx" ); @@ -231,10 +228,8 @@ @RequestParam(value = "endTime",required = false) String endTime, @RequestParam(value = "areaId",required = false) String areaId){ Map retMap = new HashMap<>(); - if (areaId.indexOf("00") > 0) areaId = areaId.substring(0, areaId.indexOf("00")); - //根据查询条件查询alarm_record记录 DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 811f023..8d9d258 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -29,7 +29,7 @@ Integer insertAlarmRecord(AlarmRecords alarmRec); - Boolean isOldAlarmRecord(String devCode,String MsgContent); + String isOldAlarmRecord(String devCode,String MsgContent); Integer updateOldAlarmRecord(String devCode,String MsgContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 60fa41a..9d4e4a2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -49,7 +49,8 @@ @Override public boolean cancelAlarm(long id, String jobStatus, String handleMessage, long personId) { - return this.baseMapper.cancelAlarm(id, jobStatus, handleMessage, personId); + this.baseMapper.cancelJob(id, jobStatus, handleMessage, personId); + return this.baseMapper.cancelAlarm(id); } @Override @@ -63,14 +64,12 @@ return this.baseMapper.insert(alarmRec); } - public Boolean isOldAlarmRecord(String devCode, String MsgContent) { - if (this.baseMapper.isOldAlarmRecord(devCode, MsgContent) == null) { - return false; - } - return true; + public String isOldAlarmRecord(String devCode, String MsgContent) { + return this.baseMapper.isOldAlarmRecord(devCode, MsgContent); + } public Integer updateOldAlarmRecord(String devCode, String MsgContent) { - return this.baseMapper.updateOldAlarmRecord(devCode, MsgContent); + return this.baseMapper.updateOldAlarmRecord(devCode, MsgContent); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java index b3f23d5..6b60c4a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java @@ -10,6 +10,7 @@ import com.casic.missiles.modular.system.service.IDeviceService; import com.casic.missiles.modular.system.service.IGasFlowDataService; import lombok.extern.java.Log; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; @@ -122,13 +123,14 @@ alarmRecord.setAlarmTime(Calendar.getInstance().getTime()); alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用气量超阈值报警"); - if (alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用气量超阈值报警")) { - alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用气量超阈值报警"); + String jobId = alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { + alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(gasFlowAddr, wellDto.getWellCode(), "SLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); } - alarmRecordsService.insertAlarmRecord(alarmRecord); // 向前端推送报警 } else { @@ -147,8 +149,10 @@ alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用气量超阈值预警"); alarmRecord.setAlarmMessage("日用水量超阈值预警"); - if (alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用水量超阈值预警")) { - alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用水量超阈值预警"); + String jobId = alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { + alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(gasFlowAddr, wellDto.getWellCode(), "SLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java index 200f5d2..7677a87 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java @@ -10,6 +10,7 @@ import com.casic.missiles.modular.system.service.IDeviceService; import com.casic.missiles.modular.system.service.IWaterMeterDataService; import lombok.extern.java.Log; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; @@ -99,8 +100,8 @@ dataWaterMeter.setLogtime(Calendar.getInstance().getTime()); // 保存到数据库 同时计算日/月用水量 - double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter); - +// double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter); + double flowAccToday=100; // 判断是否报警/预警 AlarmRule alarmRule = alarmRuleService.selectAlarmRuleByDev(meterAddr, "1"); // 报警 AlarmRule alarmRuleWarn = alarmRuleService.selectAlarmRuleByDev(meterAddr, "2"); // 预警 @@ -117,8 +118,10 @@ alarmRecord.setAlarmTime(Calendar.getInstance().getTime()); alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用水量超阈值报警"); - if (alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值报警")) { + String jobId=alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { alarmRecordsService.updateOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(meterAddr, wellDto.getWellCode(), "QLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); @@ -139,8 +142,10 @@ alarmRecord.setAlarmTime(Calendar.getInstance().getTime()); alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用水量超阈值预警"); - if (alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值预警")) { - alarmRecordsService.updateOldAlarmRecord(meterAddr, "日用水量超阈值预警"); + String jobId=alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { + alarmRecordsService.updateOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(meterAddr, wellDto.getWellCode(), "QLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java index d4c6a8b..8096ba2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -23,7 +23,10 @@ List alarmListNoPage(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("areaId") String areaId); - boolean cancelAlarm(@Param("id") long id, @Param("jobStatus") String jobStatus, @Param("handleMessage") String handleMessage, @Param("personId") long personId); + boolean cancelAlarm(@Param("id") long id); + + boolean cancelJob(@Param("id") long id, @Param("jobStatus") String jobStatus, @Param("handleMessage") String handleMessage, @Param("personId") long personId); + boolean cancelAlarmById(@Param("id") long id); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index 1314078..48886ca 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -756,7 +756,6 @@ SELECT MAX(jobcode) FROM alarm_job WHERE JOBCODE like '${jobcode}%' - GROUP BY DEVCODE diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index df59231..70193fa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -129,15 +129,12 @@ alarmObj.put("areaFullName", deviceService.getAreaFullNameById(alarmObj.get("area").toString()) + "/" + alarmObj.get("position")); alarmObj.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmObj.get("alarmType").toString())); }); - FileInputStream fileInputStream = null; if (ToolUtil.isEmpty(alarmExpList)) { fileInputStream = new FileInputStream(templatePath+"/alarmRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath+"/alarmRecTemplate.xlsx"); } - - try { httpServletResponse.setContentType("application/octet-stream"); httpServletResponse.addHeader("Content-Disposition", " attachment;filename="+"alarmRecord.xlsx" ); @@ -231,10 +228,8 @@ @RequestParam(value = "endTime",required = false) String endTime, @RequestParam(value = "areaId",required = false) String areaId){ Map retMap = new HashMap<>(); - if (areaId.indexOf("00") > 0) areaId = areaId.substring(0, areaId.indexOf("00")); - //根据查询条件查询alarm_record记录 DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 811f023..8d9d258 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -29,7 +29,7 @@ Integer insertAlarmRecord(AlarmRecords alarmRec); - Boolean isOldAlarmRecord(String devCode,String MsgContent); + String isOldAlarmRecord(String devCode,String MsgContent); Integer updateOldAlarmRecord(String devCode,String MsgContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 60fa41a..9d4e4a2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -49,7 +49,8 @@ @Override public boolean cancelAlarm(long id, String jobStatus, String handleMessage, long personId) { - return this.baseMapper.cancelAlarm(id, jobStatus, handleMessage, personId); + this.baseMapper.cancelJob(id, jobStatus, handleMessage, personId); + return this.baseMapper.cancelAlarm(id); } @Override @@ -63,14 +64,12 @@ return this.baseMapper.insert(alarmRec); } - public Boolean isOldAlarmRecord(String devCode, String MsgContent) { - if (this.baseMapper.isOldAlarmRecord(devCode, MsgContent) == null) { - return false; - } - return true; + public String isOldAlarmRecord(String devCode, String MsgContent) { + return this.baseMapper.isOldAlarmRecord(devCode, MsgContent); + } public Integer updateOldAlarmRecord(String devCode, String MsgContent) { - return this.baseMapper.updateOldAlarmRecord(devCode, MsgContent); + return this.baseMapper.updateOldAlarmRecord(devCode, MsgContent); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java index b3f23d5..6b60c4a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java @@ -10,6 +10,7 @@ import com.casic.missiles.modular.system.service.IDeviceService; import com.casic.missiles.modular.system.service.IGasFlowDataService; import lombok.extern.java.Log; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; @@ -122,13 +123,14 @@ alarmRecord.setAlarmTime(Calendar.getInstance().getTime()); alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用气量超阈值报警"); - if (alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用气量超阈值报警")) { - alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用气量超阈值报警"); + String jobId = alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { + alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(gasFlowAddr, wellDto.getWellCode(), "SLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); } - alarmRecordsService.insertAlarmRecord(alarmRecord); // 向前端推送报警 } else { @@ -147,8 +149,10 @@ alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用气量超阈值预警"); alarmRecord.setAlarmMessage("日用水量超阈值预警"); - if (alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用水量超阈值预警")) { - alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用水量超阈值预警"); + String jobId = alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { + alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(gasFlowAddr, wellDto.getWellCode(), "SLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java index 200f5d2..7677a87 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java @@ -10,6 +10,7 @@ import com.casic.missiles.modular.system.service.IDeviceService; import com.casic.missiles.modular.system.service.IWaterMeterDataService; import lombok.extern.java.Log; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; @@ -99,8 +100,8 @@ dataWaterMeter.setLogtime(Calendar.getInstance().getTime()); // 保存到数据库 同时计算日/月用水量 - double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter); - +// double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter); + double flowAccToday=100; // 判断是否报警/预警 AlarmRule alarmRule = alarmRuleService.selectAlarmRuleByDev(meterAddr, "1"); // 报警 AlarmRule alarmRuleWarn = alarmRuleService.selectAlarmRuleByDev(meterAddr, "2"); // 预警 @@ -117,8 +118,10 @@ alarmRecord.setAlarmTime(Calendar.getInstance().getTime()); alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用水量超阈值报警"); - if (alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值报警")) { + String jobId=alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { alarmRecordsService.updateOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(meterAddr, wellDto.getWellCode(), "QLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); @@ -139,8 +142,10 @@ alarmRecord.setAlarmTime(Calendar.getInstance().getTime()); alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用水量超阈值预警"); - if (alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值预警")) { - alarmRecordsService.updateOldAlarmRecord(meterAddr, "日用水量超阈值预警"); + String jobId=alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { + alarmRecordsService.updateOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(meterAddr, wellDto.getWellCode(), "QLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java index d4c6a8b..8096ba2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -23,7 +23,10 @@ List alarmListNoPage(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("areaId") String areaId); - boolean cancelAlarm(@Param("id") long id, @Param("jobStatus") String jobStatus, @Param("handleMessage") String handleMessage, @Param("personId") long personId); + boolean cancelAlarm(@Param("id") long id); + + boolean cancelJob(@Param("id") long id, @Param("jobStatus") String jobStatus, @Param("handleMessage") String handleMessage, @Param("personId") long personId); + boolean cancelAlarmById(@Param("id") long id); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index 1314078..48886ca 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -756,7 +756,6 @@ SELECT MAX(jobcode) FROM alarm_job WHERE JOBCODE like '${jobcode}%' - GROUP BY DEVCODE diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 7d03010..d275ff7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -111,15 +111,19 @@ + UPDATE alarm_records + SET status = 2 + WHERE ID = #{id} + + + UPDATE alarm_job aj, alarm_records ar - + SET aj.job_status = #{jobStatus} , aj.handle_job_person = #{personId}, aj.job_belong_to = #{personId}, aj.handle_job_time = now(), - aj.handle_message = #{handleMessage}, - ar.status = 2 - + aj.handle_message = #{handleMessage} WHERE aj.ID = ar.job_id AND ar.ID = #{id} @@ -142,7 +146,7 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 7d03010..d275ff7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -111,15 +111,19 @@ + UPDATE alarm_records + SET status = 2 + WHERE ID = #{id} + + + UPDATE alarm_job aj, alarm_records ar - + SET aj.job_status = #{jobStatus} , aj.handle_job_person = #{personId}, aj.job_belong_to = #{personId}, aj.handle_job_time = now(), - aj.handle_message = #{handleMessage}, - ar.status = 2 - + aj.handle_message = #{handleMessage} WHERE aj.ID = ar.job_id AND ar.ID = #{id} @@ -142,7 +146,7 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index df59231..70193fa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -129,15 +129,12 @@ alarmObj.put("areaFullName", deviceService.getAreaFullNameById(alarmObj.get("area").toString()) + "/" + alarmObj.get("position")); alarmObj.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmObj.get("alarmType").toString())); }); - FileInputStream fileInputStream = null; if (ToolUtil.isEmpty(alarmExpList)) { fileInputStream = new FileInputStream(templatePath+"/alarmRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath+"/alarmRecTemplate.xlsx"); } - - try { httpServletResponse.setContentType("application/octet-stream"); httpServletResponse.addHeader("Content-Disposition", " attachment;filename="+"alarmRecord.xlsx" ); @@ -231,10 +228,8 @@ @RequestParam(value = "endTime",required = false) String endTime, @RequestParam(value = "areaId",required = false) String areaId){ Map retMap = new HashMap<>(); - if (areaId.indexOf("00") > 0) areaId = areaId.substring(0, areaId.indexOf("00")); - //根据查询条件查询alarm_record记录 DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 811f023..8d9d258 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -29,7 +29,7 @@ Integer insertAlarmRecord(AlarmRecords alarmRec); - Boolean isOldAlarmRecord(String devCode,String MsgContent); + String isOldAlarmRecord(String devCode,String MsgContent); Integer updateOldAlarmRecord(String devCode,String MsgContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 60fa41a..9d4e4a2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -49,7 +49,8 @@ @Override public boolean cancelAlarm(long id, String jobStatus, String handleMessage, long personId) { - return this.baseMapper.cancelAlarm(id, jobStatus, handleMessage, personId); + this.baseMapper.cancelJob(id, jobStatus, handleMessage, personId); + return this.baseMapper.cancelAlarm(id); } @Override @@ -63,14 +64,12 @@ return this.baseMapper.insert(alarmRec); } - public Boolean isOldAlarmRecord(String devCode, String MsgContent) { - if (this.baseMapper.isOldAlarmRecord(devCode, MsgContent) == null) { - return false; - } - return true; + public String isOldAlarmRecord(String devCode, String MsgContent) { + return this.baseMapper.isOldAlarmRecord(devCode, MsgContent); + } public Integer updateOldAlarmRecord(String devCode, String MsgContent) { - return this.baseMapper.updateOldAlarmRecord(devCode, MsgContent); + return this.baseMapper.updateOldAlarmRecord(devCode, MsgContent); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java index b3f23d5..6b60c4a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java @@ -10,6 +10,7 @@ import com.casic.missiles.modular.system.service.IDeviceService; import com.casic.missiles.modular.system.service.IGasFlowDataService; import lombok.extern.java.Log; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; @@ -122,13 +123,14 @@ alarmRecord.setAlarmTime(Calendar.getInstance().getTime()); alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用气量超阈值报警"); - if (alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用气量超阈值报警")) { - alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用气量超阈值报警"); + String jobId = alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { + alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(gasFlowAddr, wellDto.getWellCode(), "SLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); } - alarmRecordsService.insertAlarmRecord(alarmRecord); // 向前端推送报警 } else { @@ -147,8 +149,10 @@ alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用气量超阈值预警"); alarmRecord.setAlarmMessage("日用水量超阈值预警"); - if (alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用水量超阈值预警")) { - alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用水量超阈值预警"); + String jobId = alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { + alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(gasFlowAddr, wellDto.getWellCode(), "SLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java index 200f5d2..7677a87 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java @@ -10,6 +10,7 @@ import com.casic.missiles.modular.system.service.IDeviceService; import com.casic.missiles.modular.system.service.IWaterMeterDataService; import lombok.extern.java.Log; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; @@ -99,8 +100,8 @@ dataWaterMeter.setLogtime(Calendar.getInstance().getTime()); // 保存到数据库 同时计算日/月用水量 - double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter); - +// double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter); + double flowAccToday=100; // 判断是否报警/预警 AlarmRule alarmRule = alarmRuleService.selectAlarmRuleByDev(meterAddr, "1"); // 报警 AlarmRule alarmRuleWarn = alarmRuleService.selectAlarmRuleByDev(meterAddr, "2"); // 预警 @@ -117,8 +118,10 @@ alarmRecord.setAlarmTime(Calendar.getInstance().getTime()); alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用水量超阈值报警"); - if (alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值报警")) { + String jobId=alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { alarmRecordsService.updateOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(meterAddr, wellDto.getWellCode(), "QLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); @@ -139,8 +142,10 @@ alarmRecord.setAlarmTime(Calendar.getInstance().getTime()); alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用水量超阈值预警"); - if (alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值预警")) { - alarmRecordsService.updateOldAlarmRecord(meterAddr, "日用水量超阈值预警"); + String jobId=alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { + alarmRecordsService.updateOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(meterAddr, wellDto.getWellCode(), "QLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java index d4c6a8b..8096ba2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -23,7 +23,10 @@ List alarmListNoPage(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("areaId") String areaId); - boolean cancelAlarm(@Param("id") long id, @Param("jobStatus") String jobStatus, @Param("handleMessage") String handleMessage, @Param("personId") long personId); + boolean cancelAlarm(@Param("id") long id); + + boolean cancelJob(@Param("id") long id, @Param("jobStatus") String jobStatus, @Param("handleMessage") String handleMessage, @Param("personId") long personId); + boolean cancelAlarmById(@Param("id") long id); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index 1314078..48886ca 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -756,7 +756,6 @@ SELECT MAX(jobcode) FROM alarm_job WHERE JOBCODE like '${jobcode}%' - GROUP BY DEVCODE diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 7d03010..d275ff7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -111,15 +111,19 @@ + UPDATE alarm_records + SET status = 2 + WHERE ID = #{id} + + + UPDATE alarm_job aj, alarm_records ar - + SET aj.job_status = #{jobStatus} , aj.handle_job_person = #{personId}, aj.job_belong_to = #{personId}, aj.handle_job_time = now(), - aj.handle_message = #{handleMessage}, - ar.status = 2 - + aj.handle_message = #{handleMessage} WHERE aj.ID = ar.job_id AND ar.ID = #{id} @@ -142,7 +146,7 @@ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml index fe49033..4015909 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml @@ -28,9 +28,14 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index df59231..70193fa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -129,15 +129,12 @@ alarmObj.put("areaFullName", deviceService.getAreaFullNameById(alarmObj.get("area").toString()) + "/" + alarmObj.get("position")); alarmObj.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmObj.get("alarmType").toString())); }); - FileInputStream fileInputStream = null; if (ToolUtil.isEmpty(alarmExpList)) { fileInputStream = new FileInputStream(templatePath+"/alarmRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath+"/alarmRecTemplate.xlsx"); } - - try { httpServletResponse.setContentType("application/octet-stream"); httpServletResponse.addHeader("Content-Disposition", " attachment;filename="+"alarmRecord.xlsx" ); @@ -231,10 +228,8 @@ @RequestParam(value = "endTime",required = false) String endTime, @RequestParam(value = "areaId",required = false) String areaId){ Map retMap = new HashMap<>(); - if (areaId.indexOf("00") > 0) areaId = areaId.substring(0, areaId.indexOf("00")); - //根据查询条件查询alarm_record记录 DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 811f023..8d9d258 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -29,7 +29,7 @@ Integer insertAlarmRecord(AlarmRecords alarmRec); - Boolean isOldAlarmRecord(String devCode,String MsgContent); + String isOldAlarmRecord(String devCode,String MsgContent); Integer updateOldAlarmRecord(String devCode,String MsgContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 60fa41a..9d4e4a2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -49,7 +49,8 @@ @Override public boolean cancelAlarm(long id, String jobStatus, String handleMessage, long personId) { - return this.baseMapper.cancelAlarm(id, jobStatus, handleMessage, personId); + this.baseMapper.cancelJob(id, jobStatus, handleMessage, personId); + return this.baseMapper.cancelAlarm(id); } @Override @@ -63,14 +64,12 @@ return this.baseMapper.insert(alarmRec); } - public Boolean isOldAlarmRecord(String devCode, String MsgContent) { - if (this.baseMapper.isOldAlarmRecord(devCode, MsgContent) == null) { - return false; - } - return true; + public String isOldAlarmRecord(String devCode, String MsgContent) { + return this.baseMapper.isOldAlarmRecord(devCode, MsgContent); + } public Integer updateOldAlarmRecord(String devCode, String MsgContent) { - return this.baseMapper.updateOldAlarmRecord(devCode, MsgContent); + return this.baseMapper.updateOldAlarmRecord(devCode, MsgContent); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java index b3f23d5..6b60c4a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java @@ -10,6 +10,7 @@ import com.casic.missiles.modular.system.service.IDeviceService; import com.casic.missiles.modular.system.service.IGasFlowDataService; import lombok.extern.java.Log; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; @@ -122,13 +123,14 @@ alarmRecord.setAlarmTime(Calendar.getInstance().getTime()); alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用气量超阈值报警"); - if (alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用气量超阈值报警")) { - alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用气量超阈值报警"); + String jobId = alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { + alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(gasFlowAddr, wellDto.getWellCode(), "SLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); } - alarmRecordsService.insertAlarmRecord(alarmRecord); // 向前端推送报警 } else { @@ -147,8 +149,10 @@ alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用气量超阈值预警"); alarmRecord.setAlarmMessage("日用水量超阈值预警"); - if (alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用水量超阈值预警")) { - alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用水量超阈值预警"); + String jobId = alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { + alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(gasFlowAddr, wellDto.getWellCode(), "SLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java index 200f5d2..7677a87 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java @@ -10,6 +10,7 @@ import com.casic.missiles.modular.system.service.IDeviceService; import com.casic.missiles.modular.system.service.IWaterMeterDataService; import lombok.extern.java.Log; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; @@ -99,8 +100,8 @@ dataWaterMeter.setLogtime(Calendar.getInstance().getTime()); // 保存到数据库 同时计算日/月用水量 - double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter); - +// double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter); + double flowAccToday=100; // 判断是否报警/预警 AlarmRule alarmRule = alarmRuleService.selectAlarmRuleByDev(meterAddr, "1"); // 报警 AlarmRule alarmRuleWarn = alarmRuleService.selectAlarmRuleByDev(meterAddr, "2"); // 预警 @@ -117,8 +118,10 @@ alarmRecord.setAlarmTime(Calendar.getInstance().getTime()); alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用水量超阈值报警"); - if (alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值报警")) { + String jobId=alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { alarmRecordsService.updateOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(meterAddr, wellDto.getWellCode(), "QLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); @@ -139,8 +142,10 @@ alarmRecord.setAlarmTime(Calendar.getInstance().getTime()); alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用水量超阈值预警"); - if (alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值预警")) { - alarmRecordsService.updateOldAlarmRecord(meterAddr, "日用水量超阈值预警"); + String jobId=alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { + alarmRecordsService.updateOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(meterAddr, wellDto.getWellCode(), "QLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java index d4c6a8b..8096ba2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -23,7 +23,10 @@ List alarmListNoPage(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("areaId") String areaId); - boolean cancelAlarm(@Param("id") long id, @Param("jobStatus") String jobStatus, @Param("handleMessage") String handleMessage, @Param("personId") long personId); + boolean cancelAlarm(@Param("id") long id); + + boolean cancelJob(@Param("id") long id, @Param("jobStatus") String jobStatus, @Param("handleMessage") String handleMessage, @Param("personId") long personId); + boolean cancelAlarmById(@Param("id") long id); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index 1314078..48886ca 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -756,7 +756,6 @@ SELECT MAX(jobcode) FROM alarm_job WHERE JOBCODE like '${jobcode}%' - GROUP BY DEVCODE diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 7d03010..d275ff7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -111,15 +111,19 @@ + UPDATE alarm_records + SET status = 2 + WHERE ID = #{id} + + + UPDATE alarm_job aj, alarm_records ar - + SET aj.job_status = #{jobStatus} , aj.handle_job_person = #{personId}, aj.job_belong_to = #{personId}, aj.handle_job_time = now(), - aj.handle_message = #{handleMessage}, - ar.status = 2 - + aj.handle_message = #{handleMessage} WHERE aj.ID = ar.job_id AND ar.ID = #{id} @@ -142,7 +146,7 @@ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml index fe49033..4015909 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml @@ -28,9 +28,14 @@ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java index 3ecf751..16d03e1 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java @@ -36,8 +36,7 @@ @Override @Transactional public double saveGasFlowData(DataGasFlow dataGasFlow) { - // 1. 保存原始记录 - this.baseMapper.insert(dataGasFlow); + // 用于返回的日用气量 double totalFlowDayRet = 0.0; @@ -53,9 +52,10 @@ gasFlowMonth.setWellCode(dataGasFlow.getWellCode()); gasFlowMonth.setDevcode(dataGasFlow.getDevcode()); gasFlowMonth.setMonth(sdfDate.format(dataGasFlow.getUptime()).substring(0, 7)); - // 2. 查询上一个最近的日用气量记录 Map lastDayAcc = this.selectLatestDayAccByDevice(dataGasFlow.getDevcode(), sdfDate.format(dataGasFlow.getUptime())); + // 1. 保存原始记录 + this.baseMapper.insert(dataGasFlow); if (null != lastDayAcc) { Calendar today = Calendar.getInstance(); today.setTime(dataGasFlow.getUptime()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index df59231..70193fa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -129,15 +129,12 @@ alarmObj.put("areaFullName", deviceService.getAreaFullNameById(alarmObj.get("area").toString()) + "/" + alarmObj.get("position")); alarmObj.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmObj.get("alarmType").toString())); }); - FileInputStream fileInputStream = null; if (ToolUtil.isEmpty(alarmExpList)) { fileInputStream = new FileInputStream(templatePath+"/alarmRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath+"/alarmRecTemplate.xlsx"); } - - try { httpServletResponse.setContentType("application/octet-stream"); httpServletResponse.addHeader("Content-Disposition", " attachment;filename="+"alarmRecord.xlsx" ); @@ -231,10 +228,8 @@ @RequestParam(value = "endTime",required = false) String endTime, @RequestParam(value = "areaId",required = false) String areaId){ Map retMap = new HashMap<>(); - if (areaId.indexOf("00") > 0) areaId = areaId.substring(0, areaId.indexOf("00")); - //根据查询条件查询alarm_record记录 DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 811f023..8d9d258 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -29,7 +29,7 @@ Integer insertAlarmRecord(AlarmRecords alarmRec); - Boolean isOldAlarmRecord(String devCode,String MsgContent); + String isOldAlarmRecord(String devCode,String MsgContent); Integer updateOldAlarmRecord(String devCode,String MsgContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 60fa41a..9d4e4a2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -49,7 +49,8 @@ @Override public boolean cancelAlarm(long id, String jobStatus, String handleMessage, long personId) { - return this.baseMapper.cancelAlarm(id, jobStatus, handleMessage, personId); + this.baseMapper.cancelJob(id, jobStatus, handleMessage, personId); + return this.baseMapper.cancelAlarm(id); } @Override @@ -63,14 +64,12 @@ return this.baseMapper.insert(alarmRec); } - public Boolean isOldAlarmRecord(String devCode, String MsgContent) { - if (this.baseMapper.isOldAlarmRecord(devCode, MsgContent) == null) { - return false; - } - return true; + public String isOldAlarmRecord(String devCode, String MsgContent) { + return this.baseMapper.isOldAlarmRecord(devCode, MsgContent); + } public Integer updateOldAlarmRecord(String devCode, String MsgContent) { - return this.baseMapper.updateOldAlarmRecord(devCode, MsgContent); + return this.baseMapper.updateOldAlarmRecord(devCode, MsgContent); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java index b3f23d5..6b60c4a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java @@ -10,6 +10,7 @@ import com.casic.missiles.modular.system.service.IDeviceService; import com.casic.missiles.modular.system.service.IGasFlowDataService; import lombok.extern.java.Log; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; @@ -122,13 +123,14 @@ alarmRecord.setAlarmTime(Calendar.getInstance().getTime()); alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用气量超阈值报警"); - if (alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用气量超阈值报警")) { - alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用气量超阈值报警"); + String jobId = alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { + alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(gasFlowAddr, wellDto.getWellCode(), "SLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); } - alarmRecordsService.insertAlarmRecord(alarmRecord); // 向前端推送报警 } else { @@ -147,8 +149,10 @@ alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用气量超阈值预警"); alarmRecord.setAlarmMessage("日用水量超阈值预警"); - if (alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用水量超阈值预警")) { - alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用水量超阈值预警"); + String jobId = alarmRecordsService.isOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { + alarmRecordsService.updateOldAlarmRecord(gasFlowAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(gasFlowAddr, wellDto.getWellCode(), "SLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java index 200f5d2..7677a87 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java @@ -10,6 +10,7 @@ import com.casic.missiles.modular.system.service.IDeviceService; import com.casic.missiles.modular.system.service.IWaterMeterDataService; import lombok.extern.java.Log; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; @@ -99,8 +100,8 @@ dataWaterMeter.setLogtime(Calendar.getInstance().getTime()); // 保存到数据库 同时计算日/月用水量 - double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter); - +// double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter); + double flowAccToday=100; // 判断是否报警/预警 AlarmRule alarmRule = alarmRuleService.selectAlarmRuleByDev(meterAddr, "1"); // 报警 AlarmRule alarmRuleWarn = alarmRuleService.selectAlarmRuleByDev(meterAddr, "2"); // 预警 @@ -117,8 +118,10 @@ alarmRecord.setAlarmTime(Calendar.getInstance().getTime()); alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用水量超阈值报警"); - if (alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值报警")) { + String jobId=alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { alarmRecordsService.updateOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(meterAddr, wellDto.getWellCode(), "QLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); @@ -139,8 +142,10 @@ alarmRecord.setAlarmTime(Calendar.getInstance().getTime()); alarmRecord.setStatus("1"); alarmRecord.setAlarmMessage("日用水量超阈值预警"); - if (alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值预警")) { - alarmRecordsService.updateOldAlarmRecord(meterAddr, "日用水量超阈值预警"); + String jobId=alarmRecordsService.isOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + if (!StringUtils.isEmpty(jobId)) { + alarmRecordsService.updateOldAlarmRecord(meterAddr, "日用水量超阈值报警"); + alarmRecord.setAlarmMessage(jobId); } else { AlarmJob alarmJob = alarmJobService.saveData(meterAddr, wellDto.getWellCode(), "QLCX", "1"); alarmRecord.setJobId(alarmJob.getId()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java index d4c6a8b..8096ba2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -23,7 +23,10 @@ List alarmListNoPage(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("areaId") String areaId); - boolean cancelAlarm(@Param("id") long id, @Param("jobStatus") String jobStatus, @Param("handleMessage") String handleMessage, @Param("personId") long personId); + boolean cancelAlarm(@Param("id") long id); + + boolean cancelJob(@Param("id") long id, @Param("jobStatus") String jobStatus, @Param("handleMessage") String handleMessage, @Param("personId") long personId); + boolean cancelAlarmById(@Param("id") long id); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index 1314078..48886ca 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -756,7 +756,6 @@ SELECT MAX(jobcode) FROM alarm_job WHERE JOBCODE like '${jobcode}%' - GROUP BY DEVCODE diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 7d03010..d275ff7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -111,15 +111,19 @@ + UPDATE alarm_records + SET status = 2 + WHERE ID = #{id} + + + UPDATE alarm_job aj, alarm_records ar - + SET aj.job_status = #{jobStatus} , aj.handle_job_person = #{personId}, aj.job_belong_to = #{personId}, aj.handle_job_time = now(), - aj.handle_message = #{handleMessage}, - ar.status = 2 - + aj.handle_message = #{handleMessage} WHERE aj.ID = ar.job_id AND ar.ID = #{id} @@ -142,7 +146,7 @@ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml index fe49033..4015909 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml @@ -28,9 +28,14 @@ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java index 3ecf751..16d03e1 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java @@ -36,8 +36,7 @@ @Override @Transactional public double saveGasFlowData(DataGasFlow dataGasFlow) { - // 1. 保存原始记录 - this.baseMapper.insert(dataGasFlow); + // 用于返回的日用气量 double totalFlowDayRet = 0.0; @@ -53,9 +52,10 @@ gasFlowMonth.setWellCode(dataGasFlow.getWellCode()); gasFlowMonth.setDevcode(dataGasFlow.getDevcode()); gasFlowMonth.setMonth(sdfDate.format(dataGasFlow.getUptime()).substring(0, 7)); - // 2. 查询上一个最近的日用气量记录 Map lastDayAcc = this.selectLatestDayAccByDevice(dataGasFlow.getDevcode(), sdfDate.format(dataGasFlow.getUptime())); + // 1. 保存原始记录 + this.baseMapper.insert(dataGasFlow); if (null != lastDayAcc) { Calendar today = Calendar.getInstance(); today.setTime(dataGasFlow.getUptime()); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/WaterMeterDataServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/WaterMeterDataServiceImpl.java index 91171ff..17366ce 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/WaterMeterDataServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/WaterMeterDataServiceImpl.java @@ -31,8 +31,7 @@ @Transactional public double saveWaterMeterData(DataWaterMeter dataWaterMeter) { dataWaterMeter.setPressure(Double.valueOf(df2.format(RandomUtils.nextDouble(0.14, 0.3)))); - // 1. 保存原始记录 - this.baseMapper.insert(dataWaterMeter); + // 用于返回的日用水量 double flowAccDayRet = 0.0; // 日用水量 @@ -47,16 +46,17 @@ waterMeterMonth.put("month", sdfDate.format(dataWaterMeter.getUptime()).substring(0, 7)); // 2. 查询上一个最近的日用水量记录 Map lastDayAcc = this.selectLatestDayAccByDevice(dataWaterMeter.getDevcode(), sdfDate.format(dataWaterMeter.getUptime())); + // 1. 保存原始记录 + this.baseMapper.insert(dataWaterMeter); Calendar lastDay = Calendar.getInstance(); - waterMeterDay.put("date", sdfDate.format(lastDay.getTime())); - waterMeterMonth.put("month", sdfDate.format(lastDay.getTime()).substring(0, 7)); - log.debug("-----------时间2" + lastDay.getTimeInMillis()); if (null != lastDayAcc) { try { - lastDay.setTime(sdfDate.parse(lastDayAcc.get("DATE").toString())); + lastDay.setTime(sdfDate.parse(lastDayAcc.get("uptime").toString())); } catch (Exception ex) { log.error("主题:水表列表展示，日期转换出错，异常信息{}", ex); } + waterMeterDay.put("date", sdfDate.format(lastDay.getTime())); + waterMeterMonth.put("month", sdfDate.format(lastDay.getTime()).substring(0, 7)); Calendar today = Calendar.getInstance(); today.setTime(dataWaterMeter.getUptime()); today.set(Calendar.HOUR, 0); @@ -147,7 +147,7 @@ waterMeterDay.put("flowAccDate", df2.format(avgFlowAccDay)); lastDay.add(Calendar.DATE, 1); waterMeterDay.put("date", sdfDate.format(lastDay.getTime())); - this.baseMapper.insertDataWatermeterDay(waterMeterDay); + this.baseMapper.insertDataWatermeterDay(waterMeterDay); waterMeterMonth.put("month", sdfDate.format(lastDay.getTime()).substring(0, 7)); if (lastDay.get(Calendar.DATE) == 1) { // 是每月的第一天 则新增月用水量