diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index c36298d..daf3952 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -5,7 +5,7 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter; //tomcat启动无需配置 -//@Configuration +@Configuration public class WebSocketConfig { /** * 注入ServerEndpointExporter， diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index c36298d..daf3952 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -5,7 +5,7 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter; //tomcat启动无需配置 -//@Configuration +@Configuration public class WebSocketConfig { /** * 注入ServerEndpointExporter， diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index fbbeeff..01e6f9a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -91,19 +91,19 @@ retObj.put("cancel", alarmJobService.countByDataScope(dataScope, alarmType, "4", beginTime, endTime)); } else { //app角色 - Integer beforeGet = alarmJobService.countByResponse("1", "0", currentUser.getDeptId(), beginTime, endTime); + Long beforeGet = alarmJobService.countByResponse("1", "0", currentUser.getDeptId(), beginTime, endTime); retObj.put("beforeGet", beforeGet); - Integer myBeforeConfirm = alarmJobService.countByUser("1", "1", currentUser.getId(), beginTime, endTime); - Integer myInHandle = alarmJobService.countByUser("1", "2", currentUser.getId(), beginTime, endTime); - Integer myOver = alarmJobService.countByUser("1", "3", currentUser.getId(), beginTime, endTime); - Integer myCancel = alarmJobService.countByUser("1", "4", currentUser.getId(), beginTime, endTime); + Long myBeforeConfirm = alarmJobService.countByUser("1", "1", currentUser.getId(), beginTime, endTime); + Long myInHandle = alarmJobService.countByUser("1", "2", currentUser.getId(), beginTime, endTime); + Long myOver = alarmJobService.countByUser("1", "3", currentUser.getId(), beginTime, endTime); + Long myCancel = alarmJobService.countByUser("1", "4", currentUser.getId(), beginTime, endTime); if (currentUser.getRoleTips().contains(sLeader)) { - Integer beforeConfirm = alarmJobService.countByResponse("1", "1", currentUser.getDeptId(), beginTime, endTime); - Integer inHandle = alarmJobService.countByResponse("1", "2", currentUser.getDeptId(), beginTime, endTime); - Integer over = alarmJobService.countByResponse("1", "3", currentUser.getDeptId(), beginTime, endTime); - Integer cancel = alarmJobService.countByResponse("1", "4", currentUser.getDeptId(), beginTime, endTime); + Long beforeConfirm = alarmJobService.countByResponse("1", "1", currentUser.getDeptId(), beginTime, endTime); + Long inHandle = alarmJobService.countByResponse("1", "2", currentUser.getDeptId(), beginTime, endTime); + Long over = alarmJobService.countByResponse("1", "3", currentUser.getDeptId(), beginTime, endTime); + Long cancel = alarmJobService.countByResponse("1", "4", currentUser.getDeptId(), beginTime, endTime); retObj.put("beforeConfirm", myBeforeConfirm + "/" + beforeConfirm); retObj.put("inHandle", myInHandle + "/" + inHandle); diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index c36298d..daf3952 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -5,7 +5,7 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter; //tomcat启动无需配置 -//@Configuration +@Configuration public class WebSocketConfig { /** * 注入ServerEndpointExporter， diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index fbbeeff..01e6f9a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -91,19 +91,19 @@ retObj.put("cancel", alarmJobService.countByDataScope(dataScope, alarmType, "4", beginTime, endTime)); } else { //app角色 - Integer beforeGet = alarmJobService.countByResponse("1", "0", currentUser.getDeptId(), beginTime, endTime); + Long beforeGet = alarmJobService.countByResponse("1", "0", currentUser.getDeptId(), beginTime, endTime); retObj.put("beforeGet", beforeGet); - Integer myBeforeConfirm = alarmJobService.countByUser("1", "1", currentUser.getId(), beginTime, endTime); - Integer myInHandle = alarmJobService.countByUser("1", "2", currentUser.getId(), beginTime, endTime); - Integer myOver = alarmJobService.countByUser("1", "3", currentUser.getId(), beginTime, endTime); - Integer myCancel = alarmJobService.countByUser("1", "4", currentUser.getId(), beginTime, endTime); + Long myBeforeConfirm = alarmJobService.countByUser("1", "1", currentUser.getId(), beginTime, endTime); + Long myInHandle = alarmJobService.countByUser("1", "2", currentUser.getId(), beginTime, endTime); + Long myOver = alarmJobService.countByUser("1", "3", currentUser.getId(), beginTime, endTime); + Long myCancel = alarmJobService.countByUser("1", "4", currentUser.getId(), beginTime, endTime); if (currentUser.getRoleTips().contains(sLeader)) { - Integer beforeConfirm = alarmJobService.countByResponse("1", "1", currentUser.getDeptId(), beginTime, endTime); - Integer inHandle = alarmJobService.countByResponse("1", "2", currentUser.getDeptId(), beginTime, endTime); - Integer over = alarmJobService.countByResponse("1", "3", currentUser.getDeptId(), beginTime, endTime); - Integer cancel = alarmJobService.countByResponse("1", "4", currentUser.getDeptId(), beginTime, endTime); + Long beforeConfirm = alarmJobService.countByResponse("1", "1", currentUser.getDeptId(), beginTime, endTime); + Long inHandle = alarmJobService.countByResponse("1", "2", currentUser.getDeptId(), beginTime, endTime); + Long over = alarmJobService.countByResponse("1", "3", currentUser.getDeptId(), beginTime, endTime); + Long cancel = alarmJobService.countByResponse("1", "4", currentUser.getDeptId(), beginTime, endTime); retObj.put("beforeConfirm", myBeforeConfirm + "/" + beforeConfirm); retObj.put("inHandle", myInHandle + "/" + inHandle); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index d4db8ce..66d7431 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -50,8 +50,8 @@ boolean checkPcRole(List roleTips); Integer countByDataScope(DataScope dataScope,String alarmType, String jobStatus,String beginTime,String endTime); - Integer countByResponse(String alarmType,String jobStatus,Long deptId,String beginTime,String endTime); - Integer countByUser(String alarmType,String jobStatus,Long userId,String beginTime,String endTime); + Long countByResponse(String alarmType,String jobStatus,Long deptId,String beginTime,String endTime); + Long countByUser(String alarmType,String jobStatus,Long userId,String beginTime,String endTime); void updateSinkJob(String id,String msg,String wellCode); List selectUserByWellCode(String wellCode); diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index c36298d..daf3952 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -5,7 +5,7 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter; //tomcat启动无需配置 -//@Configuration +@Configuration public class WebSocketConfig { /** * 注入ServerEndpointExporter， diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index fbbeeff..01e6f9a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -91,19 +91,19 @@ retObj.put("cancel", alarmJobService.countByDataScope(dataScope, alarmType, "4", beginTime, endTime)); } else { //app角色 - Integer beforeGet = alarmJobService.countByResponse("1", "0", currentUser.getDeptId(), beginTime, endTime); + Long beforeGet = alarmJobService.countByResponse("1", "0", currentUser.getDeptId(), beginTime, endTime); retObj.put("beforeGet", beforeGet); - Integer myBeforeConfirm = alarmJobService.countByUser("1", "1", currentUser.getId(), beginTime, endTime); - Integer myInHandle = alarmJobService.countByUser("1", "2", currentUser.getId(), beginTime, endTime); - Integer myOver = alarmJobService.countByUser("1", "3", currentUser.getId(), beginTime, endTime); - Integer myCancel = alarmJobService.countByUser("1", "4", currentUser.getId(), beginTime, endTime); + Long myBeforeConfirm = alarmJobService.countByUser("1", "1", currentUser.getId(), beginTime, endTime); + Long myInHandle = alarmJobService.countByUser("1", "2", currentUser.getId(), beginTime, endTime); + Long myOver = alarmJobService.countByUser("1", "3", currentUser.getId(), beginTime, endTime); + Long myCancel = alarmJobService.countByUser("1", "4", currentUser.getId(), beginTime, endTime); if (currentUser.getRoleTips().contains(sLeader)) { - Integer beforeConfirm = alarmJobService.countByResponse("1", "1", currentUser.getDeptId(), beginTime, endTime); - Integer inHandle = alarmJobService.countByResponse("1", "2", currentUser.getDeptId(), beginTime, endTime); - Integer over = alarmJobService.countByResponse("1", "3", currentUser.getDeptId(), beginTime, endTime); - Integer cancel = alarmJobService.countByResponse("1", "4", currentUser.getDeptId(), beginTime, endTime); + Long beforeConfirm = alarmJobService.countByResponse("1", "1", currentUser.getDeptId(), beginTime, endTime); + Long inHandle = alarmJobService.countByResponse("1", "2", currentUser.getDeptId(), beginTime, endTime); + Long over = alarmJobService.countByResponse("1", "3", currentUser.getDeptId(), beginTime, endTime); + Long cancel = alarmJobService.countByResponse("1", "4", currentUser.getDeptId(), beginTime, endTime); retObj.put("beforeConfirm", myBeforeConfirm + "/" + beforeConfirm); retObj.put("inHandle", myInHandle + "/" + inHandle); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index d4db8ce..66d7431 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -50,8 +50,8 @@ boolean checkPcRole(List roleTips); Integer countByDataScope(DataScope dataScope,String alarmType, String jobStatus,String beginTime,String endTime); - Integer countByResponse(String alarmType,String jobStatus,Long deptId,String beginTime,String endTime); - Integer countByUser(String alarmType,String jobStatus,Long userId,String beginTime,String endTime); + Long countByResponse(String alarmType,String jobStatus,Long deptId,String beginTime,String endTime); + Long countByUser(String alarmType,String jobStatus,Long userId,String beginTime,String endTime); void updateSinkJob(String id,String msg,String wellCode); List selectUserByWellCode(String wellCode); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index 4ad0f2a..a360887 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -249,12 +249,12 @@ } @Override - public Integer countByResponse(String alarmType, String jobStatus, Long deptId, String beginTime, String endTime) { + public Long countByResponse(String alarmType, String jobStatus, Long deptId, String beginTime, String endTime) { return this.baseMapper.countByResponse(alarmType, jobStatus, deptId, beginTime, endTime); } @Override - public Integer countByUser(String alarmType, String jobStatus, Long userId, String beginTime, String endTime) { + public Long countByUser(String alarmType, String jobStatus, Long userId, String beginTime, String endTime) { return this.baseMapper.countByUser(alarmType, jobStatus, userId, beginTime, endTime); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index c36298d..daf3952 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -5,7 +5,7 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter; //tomcat启动无需配置 -//@Configuration +@Configuration public class WebSocketConfig { /** * 注入ServerEndpointExporter， diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index fbbeeff..01e6f9a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -91,19 +91,19 @@ retObj.put("cancel", alarmJobService.countByDataScope(dataScope, alarmType, "4", beginTime, endTime)); } else { //app角色 - Integer beforeGet = alarmJobService.countByResponse("1", "0", currentUser.getDeptId(), beginTime, endTime); + Long beforeGet = alarmJobService.countByResponse("1", "0", currentUser.getDeptId(), beginTime, endTime); retObj.put("beforeGet", beforeGet); - Integer myBeforeConfirm = alarmJobService.countByUser("1", "1", currentUser.getId(), beginTime, endTime); - Integer myInHandle = alarmJobService.countByUser("1", "2", currentUser.getId(), beginTime, endTime); - Integer myOver = alarmJobService.countByUser("1", "3", currentUser.getId(), beginTime, endTime); - Integer myCancel = alarmJobService.countByUser("1", "4", currentUser.getId(), beginTime, endTime); + Long myBeforeConfirm = alarmJobService.countByUser("1", "1", currentUser.getId(), beginTime, endTime); + Long myInHandle = alarmJobService.countByUser("1", "2", currentUser.getId(), beginTime, endTime); + Long myOver = alarmJobService.countByUser("1", "3", currentUser.getId(), beginTime, endTime); + Long myCancel = alarmJobService.countByUser("1", "4", currentUser.getId(), beginTime, endTime); if (currentUser.getRoleTips().contains(sLeader)) { - Integer beforeConfirm = alarmJobService.countByResponse("1", "1", currentUser.getDeptId(), beginTime, endTime); - Integer inHandle = alarmJobService.countByResponse("1", "2", currentUser.getDeptId(), beginTime, endTime); - Integer over = alarmJobService.countByResponse("1", "3", currentUser.getDeptId(), beginTime, endTime); - Integer cancel = alarmJobService.countByResponse("1", "4", currentUser.getDeptId(), beginTime, endTime); + Long beforeConfirm = alarmJobService.countByResponse("1", "1", currentUser.getDeptId(), beginTime, endTime); + Long inHandle = alarmJobService.countByResponse("1", "2", currentUser.getDeptId(), beginTime, endTime); + Long over = alarmJobService.countByResponse("1", "3", currentUser.getDeptId(), beginTime, endTime); + Long cancel = alarmJobService.countByResponse("1", "4", currentUser.getDeptId(), beginTime, endTime); retObj.put("beforeConfirm", myBeforeConfirm + "/" + beforeConfirm); retObj.put("inHandle", myInHandle + "/" + inHandle); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index d4db8ce..66d7431 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -50,8 +50,8 @@ boolean checkPcRole(List roleTips); Integer countByDataScope(DataScope dataScope,String alarmType, String jobStatus,String beginTime,String endTime); - Integer countByResponse(String alarmType,String jobStatus,Long deptId,String beginTime,String endTime); - Integer countByUser(String alarmType,String jobStatus,Long userId,String beginTime,String endTime); + Long countByResponse(String alarmType,String jobStatus,Long deptId,String beginTime,String endTime); + Long countByUser(String alarmType,String jobStatus,Long userId,String beginTime,String endTime); void updateSinkJob(String id,String msg,String wellCode); List selectUserByWellCode(String wellCode); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index 4ad0f2a..a360887 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -249,12 +249,12 @@ } @Override - public Integer countByResponse(String alarmType, String jobStatus, Long deptId, String beginTime, String endTime) { + public Long countByResponse(String alarmType, String jobStatus, Long deptId, String beginTime, String endTime) { return this.baseMapper.countByResponse(alarmType, jobStatus, deptId, beginTime, endTime); } @Override - public Integer countByUser(String alarmType, String jobStatus, Long userId, String beginTime, String endTime) { + public Long countByUser(String alarmType, String jobStatus, Long userId, String beginTime, String endTime) { return this.baseMapper.countByUser(alarmType, jobStatus, userId, beginTime, endTime); } 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 fb74560..efddf31 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 @@ -7,9 +7,11 @@ import com.casic.missiles.core.util.DateUtil; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.dao.AlarmRecordsMapper; import com.casic.missiles.modular.system.dto.AlarmRecordDTO; +import com.casic.missiles.modular.system.model.AlarmJob; import com.casic.missiles.modular.system.model.AlarmRecords; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,7 +35,8 @@ private ICommonPermissionService permissionService; @Resource AlarmRecordsMapper alarmRecordsMapper; - + @Resource + IAlarmJobService alarmJobService; @Override public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope, String deptId, String alarmLevel,String wellName) { String sContent = null; @@ -94,6 +97,18 @@ @Override public boolean cancelAlarm(long id, String jobStatus, String handleMessage, long personId) { + AlarmRecords alarmRecords = this.selectById(id); + if(alarmRecords!=null&&ToolUtil.isNotEmpty(alarmRecords.getJobId())){ + AlarmJob alarmJob= alarmJobService.selectById(alarmRecords.getJobId()); + if(ToolUtil.isNotEmpty(alarmJob)&&alarmJob.getJobStatus()!="3"){ + alarmJob.setJobStatus("3"); + alarmJob.setHandleJobTime(new Date()); + alarmJob.setHandleJobPerson(personId); + alarmJob.setJobBelongTo(personId); + alarmJob.setHandleMessage(handleMessage); + alarmJobService.updateById(alarmJob); + } + } return this.baseMapper.cancelAlarm(id, jobStatus, handleMessage, personId); } @@ -128,6 +143,7 @@ } else if ("1".equals(alarmRecordDTO.getStatus())) {//未消警，计算时长 //同步相差8小时时间 Calendar now = Calendar.getInstance(); + now.add(Calendar.HOUR_OF_DAY,8); now.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai")); alarmRecordDTO.setAlarmDuration(getTimeDifference(alarmRecordDTO.getAlarmTimeDate(), now.getTime())); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index c36298d..daf3952 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -5,7 +5,7 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter; //tomcat启动无需配置 -//@Configuration +@Configuration public class WebSocketConfig { /** * 注入ServerEndpointExporter， diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index fbbeeff..01e6f9a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -91,19 +91,19 @@ retObj.put("cancel", alarmJobService.countByDataScope(dataScope, alarmType, "4", beginTime, endTime)); } else { //app角色 - Integer beforeGet = alarmJobService.countByResponse("1", "0", currentUser.getDeptId(), beginTime, endTime); + Long beforeGet = alarmJobService.countByResponse("1", "0", currentUser.getDeptId(), beginTime, endTime); retObj.put("beforeGet", beforeGet); - Integer myBeforeConfirm = alarmJobService.countByUser("1", "1", currentUser.getId(), beginTime, endTime); - Integer myInHandle = alarmJobService.countByUser("1", "2", currentUser.getId(), beginTime, endTime); - Integer myOver = alarmJobService.countByUser("1", "3", currentUser.getId(), beginTime, endTime); - Integer myCancel = alarmJobService.countByUser("1", "4", currentUser.getId(), beginTime, endTime); + Long myBeforeConfirm = alarmJobService.countByUser("1", "1", currentUser.getId(), beginTime, endTime); + Long myInHandle = alarmJobService.countByUser("1", "2", currentUser.getId(), beginTime, endTime); + Long myOver = alarmJobService.countByUser("1", "3", currentUser.getId(), beginTime, endTime); + Long myCancel = alarmJobService.countByUser("1", "4", currentUser.getId(), beginTime, endTime); if (currentUser.getRoleTips().contains(sLeader)) { - Integer beforeConfirm = alarmJobService.countByResponse("1", "1", currentUser.getDeptId(), beginTime, endTime); - Integer inHandle = alarmJobService.countByResponse("1", "2", currentUser.getDeptId(), beginTime, endTime); - Integer over = alarmJobService.countByResponse("1", "3", currentUser.getDeptId(), beginTime, endTime); - Integer cancel = alarmJobService.countByResponse("1", "4", currentUser.getDeptId(), beginTime, endTime); + Long beforeConfirm = alarmJobService.countByResponse("1", "1", currentUser.getDeptId(), beginTime, endTime); + Long inHandle = alarmJobService.countByResponse("1", "2", currentUser.getDeptId(), beginTime, endTime); + Long over = alarmJobService.countByResponse("1", "3", currentUser.getDeptId(), beginTime, endTime); + Long cancel = alarmJobService.countByResponse("1", "4", currentUser.getDeptId(), beginTime, endTime); retObj.put("beforeConfirm", myBeforeConfirm + "/" + beforeConfirm); retObj.put("inHandle", myInHandle + "/" + inHandle); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index d4db8ce..66d7431 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -50,8 +50,8 @@ boolean checkPcRole(List roleTips); Integer countByDataScope(DataScope dataScope,String alarmType, String jobStatus,String beginTime,String endTime); - Integer countByResponse(String alarmType,String jobStatus,Long deptId,String beginTime,String endTime); - Integer countByUser(String alarmType,String jobStatus,Long userId,String beginTime,String endTime); + Long countByResponse(String alarmType,String jobStatus,Long deptId,String beginTime,String endTime); + Long countByUser(String alarmType,String jobStatus,Long userId,String beginTime,String endTime); void updateSinkJob(String id,String msg,String wellCode); List selectUserByWellCode(String wellCode); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index 4ad0f2a..a360887 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -249,12 +249,12 @@ } @Override - public Integer countByResponse(String alarmType, String jobStatus, Long deptId, String beginTime, String endTime) { + public Long countByResponse(String alarmType, String jobStatus, Long deptId, String beginTime, String endTime) { return this.baseMapper.countByResponse(alarmType, jobStatus, deptId, beginTime, endTime); } @Override - public Integer countByUser(String alarmType, String jobStatus, Long userId, String beginTime, String endTime) { + public Long countByUser(String alarmType, String jobStatus, Long userId, String beginTime, String endTime) { return this.baseMapper.countByUser(alarmType, jobStatus, userId, beginTime, endTime); } 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 fb74560..efddf31 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 @@ -7,9 +7,11 @@ import com.casic.missiles.core.util.DateUtil; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.dao.AlarmRecordsMapper; import com.casic.missiles.modular.system.dto.AlarmRecordDTO; +import com.casic.missiles.modular.system.model.AlarmJob; import com.casic.missiles.modular.system.model.AlarmRecords; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,7 +35,8 @@ private ICommonPermissionService permissionService; @Resource AlarmRecordsMapper alarmRecordsMapper; - + @Resource + IAlarmJobService alarmJobService; @Override public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope, String deptId, String alarmLevel,String wellName) { String sContent = null; @@ -94,6 +97,18 @@ @Override public boolean cancelAlarm(long id, String jobStatus, String handleMessage, long personId) { + AlarmRecords alarmRecords = this.selectById(id); + if(alarmRecords!=null&&ToolUtil.isNotEmpty(alarmRecords.getJobId())){ + AlarmJob alarmJob= alarmJobService.selectById(alarmRecords.getJobId()); + if(ToolUtil.isNotEmpty(alarmJob)&&alarmJob.getJobStatus()!="3"){ + alarmJob.setJobStatus("3"); + alarmJob.setHandleJobTime(new Date()); + alarmJob.setHandleJobPerson(personId); + alarmJob.setJobBelongTo(personId); + alarmJob.setHandleMessage(handleMessage); + alarmJobService.updateById(alarmJob); + } + } return this.baseMapper.cancelAlarm(id, jobStatus, handleMessage, personId); } @@ -128,6 +143,7 @@ } else if ("1".equals(alarmRecordDTO.getStatus())) {//未消警，计算时长 //同步相差8小时时间 Calendar now = Calendar.getInstance(); + now.add(Calendar.HOUR_OF_DAY,8); now.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai")); alarmRecordDTO.setAlarmDuration(getTimeDifference(alarmRecordDTO.getAlarmTimeDate(), now.getTime())); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index f38bb32..ad88d5b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -53,8 +53,8 @@ boolean handleJob(@Param("id") int id,@Param("personId") long personId); List> countByDataScope(@Param("dataScope") DataScope dataScope,@Param("alarmType")String alarmType,@Param("jobStatus")String jobStatus,@Param("beginTime")String beginTime,@Param("endTime")String endTime); - Integer countByResponse(@Param("alarmType")String alarmType,@Param("jobStatus")String jobStatus,@Param("deptId") Long deptId,@Param("beginTime")String beginTime,@Param("endTime")String endTime); - Integer countByUser(@Param("alarmType")String alarmType,@Param("jobStatus")String jobStatus,@Param("userId") Long userId,@Param("beginTime")String beginTime,@Param("endTime")String endTime); + Long countByResponse(@Param("alarmType")String alarmType,@Param("jobStatus")String jobStatus,@Param("deptId") Long deptId,@Param("beginTime")String beginTime,@Param("endTime")String endTime); + Long countByUser(@Param("alarmType")String alarmType,@Param("jobStatus")String jobStatus,@Param("userId") Long userId,@Param("beginTime")String beginTime,@Param("endTime")String endTime); String selectClientIdByUser(@Param("userId") Long userId); List selectUserByWellCode(@Param("wellCode") String wellCode); diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index c36298d..daf3952 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -5,7 +5,7 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter; //tomcat启动无需配置 -//@Configuration +@Configuration public class WebSocketConfig { /** * 注入ServerEndpointExporter， diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index fbbeeff..01e6f9a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -91,19 +91,19 @@ retObj.put("cancel", alarmJobService.countByDataScope(dataScope, alarmType, "4", beginTime, endTime)); } else { //app角色 - Integer beforeGet = alarmJobService.countByResponse("1", "0", currentUser.getDeptId(), beginTime, endTime); + Long beforeGet = alarmJobService.countByResponse("1", "0", currentUser.getDeptId(), beginTime, endTime); retObj.put("beforeGet", beforeGet); - Integer myBeforeConfirm = alarmJobService.countByUser("1", "1", currentUser.getId(), beginTime, endTime); - Integer myInHandle = alarmJobService.countByUser("1", "2", currentUser.getId(), beginTime, endTime); - Integer myOver = alarmJobService.countByUser("1", "3", currentUser.getId(), beginTime, endTime); - Integer myCancel = alarmJobService.countByUser("1", "4", currentUser.getId(), beginTime, endTime); + Long myBeforeConfirm = alarmJobService.countByUser("1", "1", currentUser.getId(), beginTime, endTime); + Long myInHandle = alarmJobService.countByUser("1", "2", currentUser.getId(), beginTime, endTime); + Long myOver = alarmJobService.countByUser("1", "3", currentUser.getId(), beginTime, endTime); + Long myCancel = alarmJobService.countByUser("1", "4", currentUser.getId(), beginTime, endTime); if (currentUser.getRoleTips().contains(sLeader)) { - Integer beforeConfirm = alarmJobService.countByResponse("1", "1", currentUser.getDeptId(), beginTime, endTime); - Integer inHandle = alarmJobService.countByResponse("1", "2", currentUser.getDeptId(), beginTime, endTime); - Integer over = alarmJobService.countByResponse("1", "3", currentUser.getDeptId(), beginTime, endTime); - Integer cancel = alarmJobService.countByResponse("1", "4", currentUser.getDeptId(), beginTime, endTime); + Long beforeConfirm = alarmJobService.countByResponse("1", "1", currentUser.getDeptId(), beginTime, endTime); + Long inHandle = alarmJobService.countByResponse("1", "2", currentUser.getDeptId(), beginTime, endTime); + Long over = alarmJobService.countByResponse("1", "3", currentUser.getDeptId(), beginTime, endTime); + Long cancel = alarmJobService.countByResponse("1", "4", currentUser.getDeptId(), beginTime, endTime); retObj.put("beforeConfirm", myBeforeConfirm + "/" + beforeConfirm); retObj.put("inHandle", myInHandle + "/" + inHandle); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index d4db8ce..66d7431 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -50,8 +50,8 @@ boolean checkPcRole(List roleTips); Integer countByDataScope(DataScope dataScope,String alarmType, String jobStatus,String beginTime,String endTime); - Integer countByResponse(String alarmType,String jobStatus,Long deptId,String beginTime,String endTime); - Integer countByUser(String alarmType,String jobStatus,Long userId,String beginTime,String endTime); + Long countByResponse(String alarmType,String jobStatus,Long deptId,String beginTime,String endTime); + Long countByUser(String alarmType,String jobStatus,Long userId,String beginTime,String endTime); void updateSinkJob(String id,String msg,String wellCode); List selectUserByWellCode(String wellCode); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index 4ad0f2a..a360887 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -249,12 +249,12 @@ } @Override - public Integer countByResponse(String alarmType, String jobStatus, Long deptId, String beginTime, String endTime) { + public Long countByResponse(String alarmType, String jobStatus, Long deptId, String beginTime, String endTime) { return this.baseMapper.countByResponse(alarmType, jobStatus, deptId, beginTime, endTime); } @Override - public Integer countByUser(String alarmType, String jobStatus, Long userId, String beginTime, String endTime) { + public Long countByUser(String alarmType, String jobStatus, Long userId, String beginTime, String endTime) { return this.baseMapper.countByUser(alarmType, jobStatus, userId, beginTime, endTime); } 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 fb74560..efddf31 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 @@ -7,9 +7,11 @@ import com.casic.missiles.core.util.DateUtil; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.dao.AlarmRecordsMapper; import com.casic.missiles.modular.system.dto.AlarmRecordDTO; +import com.casic.missiles.modular.system.model.AlarmJob; import com.casic.missiles.modular.system.model.AlarmRecords; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,7 +35,8 @@ private ICommonPermissionService permissionService; @Resource AlarmRecordsMapper alarmRecordsMapper; - + @Resource + IAlarmJobService alarmJobService; @Override public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope, String deptId, String alarmLevel,String wellName) { String sContent = null; @@ -94,6 +97,18 @@ @Override public boolean cancelAlarm(long id, String jobStatus, String handleMessage, long personId) { + AlarmRecords alarmRecords = this.selectById(id); + if(alarmRecords!=null&&ToolUtil.isNotEmpty(alarmRecords.getJobId())){ + AlarmJob alarmJob= alarmJobService.selectById(alarmRecords.getJobId()); + if(ToolUtil.isNotEmpty(alarmJob)&&alarmJob.getJobStatus()!="3"){ + alarmJob.setJobStatus("3"); + alarmJob.setHandleJobTime(new Date()); + alarmJob.setHandleJobPerson(personId); + alarmJob.setJobBelongTo(personId); + alarmJob.setHandleMessage(handleMessage); + alarmJobService.updateById(alarmJob); + } + } return this.baseMapper.cancelAlarm(id, jobStatus, handleMessage, personId); } @@ -128,6 +143,7 @@ } else if ("1".equals(alarmRecordDTO.getStatus())) {//未消警，计算时长 //同步相差8小时时间 Calendar now = Calendar.getInstance(); + now.add(Calendar.HOUR_OF_DAY,8); now.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai")); alarmRecordDTO.setAlarmDuration(getTimeDifference(alarmRecordDTO.getAlarmTimeDate(), now.getTime())); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index f38bb32..ad88d5b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -53,8 +53,8 @@ boolean handleJob(@Param("id") int id,@Param("personId") long personId); List> countByDataScope(@Param("dataScope") DataScope dataScope,@Param("alarmType")String alarmType,@Param("jobStatus")String jobStatus,@Param("beginTime")String beginTime,@Param("endTime")String endTime); - Integer countByResponse(@Param("alarmType")String alarmType,@Param("jobStatus")String jobStatus,@Param("deptId") Long deptId,@Param("beginTime")String beginTime,@Param("endTime")String endTime); - Integer countByUser(@Param("alarmType")String alarmType,@Param("jobStatus")String jobStatus,@Param("userId") Long userId,@Param("beginTime")String beginTime,@Param("endTime")String endTime); + Long countByResponse(@Param("alarmType")String alarmType,@Param("jobStatus")String jobStatus,@Param("deptId") Long deptId,@Param("beginTime")String beginTime,@Param("endTime")String endTime); + Long countByUser(@Param("alarmType")String alarmType,@Param("jobStatus")String jobStatus,@Param("userId") Long userId,@Param("beginTime")String beginTime,@Param("endTime")String endTime); String selectClientIdByUser(@Param("userId") Long userId); List selectUserByWellCode(@Param("wellCode") String wellCode); 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 38a66dc..caf5c3a 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 @@ -174,7 +174,7 @@ - SELECT COUNT( DISTINCT AJ.ID ) FROM alarm_job aj LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index c36298d..daf3952 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -5,7 +5,7 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter; //tomcat启动无需配置 -//@Configuration +@Configuration public class WebSocketConfig { /** * 注入ServerEndpointExporter， diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index fbbeeff..01e6f9a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -91,19 +91,19 @@ retObj.put("cancel", alarmJobService.countByDataScope(dataScope, alarmType, "4", beginTime, endTime)); } else { //app角色 - Integer beforeGet = alarmJobService.countByResponse("1", "0", currentUser.getDeptId(), beginTime, endTime); + Long beforeGet = alarmJobService.countByResponse("1", "0", currentUser.getDeptId(), beginTime, endTime); retObj.put("beforeGet", beforeGet); - Integer myBeforeConfirm = alarmJobService.countByUser("1", "1", currentUser.getId(), beginTime, endTime); - Integer myInHandle = alarmJobService.countByUser("1", "2", currentUser.getId(), beginTime, endTime); - Integer myOver = alarmJobService.countByUser("1", "3", currentUser.getId(), beginTime, endTime); - Integer myCancel = alarmJobService.countByUser("1", "4", currentUser.getId(), beginTime, endTime); + Long myBeforeConfirm = alarmJobService.countByUser("1", "1", currentUser.getId(), beginTime, endTime); + Long myInHandle = alarmJobService.countByUser("1", "2", currentUser.getId(), beginTime, endTime); + Long myOver = alarmJobService.countByUser("1", "3", currentUser.getId(), beginTime, endTime); + Long myCancel = alarmJobService.countByUser("1", "4", currentUser.getId(), beginTime, endTime); if (currentUser.getRoleTips().contains(sLeader)) { - Integer beforeConfirm = alarmJobService.countByResponse("1", "1", currentUser.getDeptId(), beginTime, endTime); - Integer inHandle = alarmJobService.countByResponse("1", "2", currentUser.getDeptId(), beginTime, endTime); - Integer over = alarmJobService.countByResponse("1", "3", currentUser.getDeptId(), beginTime, endTime); - Integer cancel = alarmJobService.countByResponse("1", "4", currentUser.getDeptId(), beginTime, endTime); + Long beforeConfirm = alarmJobService.countByResponse("1", "1", currentUser.getDeptId(), beginTime, endTime); + Long inHandle = alarmJobService.countByResponse("1", "2", currentUser.getDeptId(), beginTime, endTime); + Long over = alarmJobService.countByResponse("1", "3", currentUser.getDeptId(), beginTime, endTime); + Long cancel = alarmJobService.countByResponse("1", "4", currentUser.getDeptId(), beginTime, endTime); retObj.put("beforeConfirm", myBeforeConfirm + "/" + beforeConfirm); retObj.put("inHandle", myInHandle + "/" + inHandle); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index d4db8ce..66d7431 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -50,8 +50,8 @@ boolean checkPcRole(List roleTips); Integer countByDataScope(DataScope dataScope,String alarmType, String jobStatus,String beginTime,String endTime); - Integer countByResponse(String alarmType,String jobStatus,Long deptId,String beginTime,String endTime); - Integer countByUser(String alarmType,String jobStatus,Long userId,String beginTime,String endTime); + Long countByResponse(String alarmType,String jobStatus,Long deptId,String beginTime,String endTime); + Long countByUser(String alarmType,String jobStatus,Long userId,String beginTime,String endTime); void updateSinkJob(String id,String msg,String wellCode); List selectUserByWellCode(String wellCode); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index 4ad0f2a..a360887 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -249,12 +249,12 @@ } @Override - public Integer countByResponse(String alarmType, String jobStatus, Long deptId, String beginTime, String endTime) { + public Long countByResponse(String alarmType, String jobStatus, Long deptId, String beginTime, String endTime) { return this.baseMapper.countByResponse(alarmType, jobStatus, deptId, beginTime, endTime); } @Override - public Integer countByUser(String alarmType, String jobStatus, Long userId, String beginTime, String endTime) { + public Long countByUser(String alarmType, String jobStatus, Long userId, String beginTime, String endTime) { return this.baseMapper.countByUser(alarmType, jobStatus, userId, beginTime, endTime); } 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 fb74560..efddf31 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 @@ -7,9 +7,11 @@ import com.casic.missiles.core.util.DateUtil; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.dao.AlarmRecordsMapper; import com.casic.missiles.modular.system.dto.AlarmRecordDTO; +import com.casic.missiles.modular.system.model.AlarmJob; import com.casic.missiles.modular.system.model.AlarmRecords; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,7 +35,8 @@ private ICommonPermissionService permissionService; @Resource AlarmRecordsMapper alarmRecordsMapper; - + @Resource + IAlarmJobService alarmJobService; @Override public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope, String deptId, String alarmLevel,String wellName) { String sContent = null; @@ -94,6 +97,18 @@ @Override public boolean cancelAlarm(long id, String jobStatus, String handleMessage, long personId) { + AlarmRecords alarmRecords = this.selectById(id); + if(alarmRecords!=null&&ToolUtil.isNotEmpty(alarmRecords.getJobId())){ + AlarmJob alarmJob= alarmJobService.selectById(alarmRecords.getJobId()); + if(ToolUtil.isNotEmpty(alarmJob)&&alarmJob.getJobStatus()!="3"){ + alarmJob.setJobStatus("3"); + alarmJob.setHandleJobTime(new Date()); + alarmJob.setHandleJobPerson(personId); + alarmJob.setJobBelongTo(personId); + alarmJob.setHandleMessage(handleMessage); + alarmJobService.updateById(alarmJob); + } + } return this.baseMapper.cancelAlarm(id, jobStatus, handleMessage, personId); } @@ -128,6 +143,7 @@ } else if ("1".equals(alarmRecordDTO.getStatus())) {//未消警，计算时长 //同步相差8小时时间 Calendar now = Calendar.getInstance(); + now.add(Calendar.HOUR_OF_DAY,8); now.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai")); alarmRecordDTO.setAlarmDuration(getTimeDifference(alarmRecordDTO.getAlarmTimeDate(), now.getTime())); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index f38bb32..ad88d5b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -53,8 +53,8 @@ boolean handleJob(@Param("id") int id,@Param("personId") long personId); List> countByDataScope(@Param("dataScope") DataScope dataScope,@Param("alarmType")String alarmType,@Param("jobStatus")String jobStatus,@Param("beginTime")String beginTime,@Param("endTime")String endTime); - Integer countByResponse(@Param("alarmType")String alarmType,@Param("jobStatus")String jobStatus,@Param("deptId") Long deptId,@Param("beginTime")String beginTime,@Param("endTime")String endTime); - Integer countByUser(@Param("alarmType")String alarmType,@Param("jobStatus")String jobStatus,@Param("userId") Long userId,@Param("beginTime")String beginTime,@Param("endTime")String endTime); + Long countByResponse(@Param("alarmType")String alarmType,@Param("jobStatus")String jobStatus,@Param("deptId") Long deptId,@Param("beginTime")String beginTime,@Param("endTime")String endTime); + Long countByUser(@Param("alarmType")String alarmType,@Param("jobStatus")String jobStatus,@Param("userId") Long userId,@Param("beginTime")String beginTime,@Param("endTime")String endTime); String selectClientIdByUser(@Param("userId") Long userId); List selectUserByWellCode(@Param("wellCode") String wellCode); 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 38a66dc..caf5c3a 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 @@ -174,7 +174,7 @@ - SELECT COUNT( DISTINCT AJ.ID ) FROM alarm_job aj LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID 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 f45eb50..3a34d79 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 @@ -4,27 +4,31 @@ - - - - - - - - + + + + + + + + - - - + + + - ID AS id, DEVICE_ID AS deviceId, DEVCODE AS devcode, WELL_CODE AS wellCode, ALARM_TYPE AS alarmType, ALARM_CONTENT AS alarmContent, ALARM_VALUE AS alarmValue, ALARM_TIME AS alarmTime, STATUS AS status, JOB_ID AS jobId + ID + AS id, DEVICE_ID AS deviceId, DEVCODE AS devcode, WELL_CODE AS wellCode, ALARM_TYPE AS alarmType, ALARM_CONTENT AS alarmContent, ALARM_VALUE AS alarmValue, ALARM_TIME AS alarmTime, STATUS AS status, JOB_ID AS jobId - ar.ID as id, + ar + . + ID + as id, ar.WELL_CODE as wellCode, bwi.WELL_NAME as wellName, ar.ALARM_CONTENT as alarmContentName, @@ -101,7 +105,7 @@ #{i} - order by ar.ALARM_TIME desc + order by ar.ALARM_TIME desc SELECT - ar.ID AS id, - ar.DEVICE_ID AS deviceId, - ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, - ar.STATUS AS status, - ar.JOB_ID AS jobId, - bwi.DEPTID AS deptid, - bwi.WELL_NAME AS wellName + ar.ID AS id, + ar.DEVICE_ID AS deviceId, + ar.DEVCODE AS devcode, + ar.WELL_CODE AS wellCode, + ar.ALARM_TYPE AS alarmType, + ar.ALARM_CONTENT AS alarmContent, + ar.ALARM_VALUE AS alarmValue, + ar.ALARM_TIME AS alarmTime, + ar.ALARM_LEVEL AS alarmLevel, + ar.ALARM_MSG AS alarmMessage, + ar.STATUS AS status, + ar.JOB_ID AS jobId, + bwi.DEPTID AS deptid, + bwi.WELL_NAME AS wellName FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE WHERE STATUS = 1 @@ -189,40 +193,34 @@ - UPDATE alarm_job aj, alarm_records ar + UPDATE alarm_records ar - 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, - ar.OPERATE_TIME=now() + ar.OPERATE_TIME = NOW() - WHERE aj.ID = ar.job_id - AND aj.ID = #{id} - and ar.STATUS = '1' + WHERE ar.ID = #{id} - SELECT ar.id AS id,bwi.id AS wellId, ar.well_code AS wellCode, ar.devcode AS devcode, - bwi.DEPTID AS deptid, bwi.RESPONSIBLE_DEPT AS companyId, + bwi.DEPTID AS deptid, bwi.RESPONSIBLE_DEPT AS companyId, bdt.type_name AS deviceType, ar.alarm_type AS alarmType, ar.alarm_content AS alarmContentName,ar.alarm_value AS alarmValue, ar.alarm_level AS alarmLevel,ar.status AS STATUS,ar.alarm_time AS alarmTimeDate, diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index c36298d..daf3952 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -5,7 +5,7 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter; //tomcat启动无需配置 -//@Configuration +@Configuration public class WebSocketConfig { /** * 注入ServerEndpointExporter， diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index fbbeeff..01e6f9a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -91,19 +91,19 @@ retObj.put("cancel", alarmJobService.countByDataScope(dataScope, alarmType, "4", beginTime, endTime)); } else { //app角色 - Integer beforeGet = alarmJobService.countByResponse("1", "0", currentUser.getDeptId(), beginTime, endTime); + Long beforeGet = alarmJobService.countByResponse("1", "0", currentUser.getDeptId(), beginTime, endTime); retObj.put("beforeGet", beforeGet); - Integer myBeforeConfirm = alarmJobService.countByUser("1", "1", currentUser.getId(), beginTime, endTime); - Integer myInHandle = alarmJobService.countByUser("1", "2", currentUser.getId(), beginTime, endTime); - Integer myOver = alarmJobService.countByUser("1", "3", currentUser.getId(), beginTime, endTime); - Integer myCancel = alarmJobService.countByUser("1", "4", currentUser.getId(), beginTime, endTime); + Long myBeforeConfirm = alarmJobService.countByUser("1", "1", currentUser.getId(), beginTime, endTime); + Long myInHandle = alarmJobService.countByUser("1", "2", currentUser.getId(), beginTime, endTime); + Long myOver = alarmJobService.countByUser("1", "3", currentUser.getId(), beginTime, endTime); + Long myCancel = alarmJobService.countByUser("1", "4", currentUser.getId(), beginTime, endTime); if (currentUser.getRoleTips().contains(sLeader)) { - Integer beforeConfirm = alarmJobService.countByResponse("1", "1", currentUser.getDeptId(), beginTime, endTime); - Integer inHandle = alarmJobService.countByResponse("1", "2", currentUser.getDeptId(), beginTime, endTime); - Integer over = alarmJobService.countByResponse("1", "3", currentUser.getDeptId(), beginTime, endTime); - Integer cancel = alarmJobService.countByResponse("1", "4", currentUser.getDeptId(), beginTime, endTime); + Long beforeConfirm = alarmJobService.countByResponse("1", "1", currentUser.getDeptId(), beginTime, endTime); + Long inHandle = alarmJobService.countByResponse("1", "2", currentUser.getDeptId(), beginTime, endTime); + Long over = alarmJobService.countByResponse("1", "3", currentUser.getDeptId(), beginTime, endTime); + Long cancel = alarmJobService.countByResponse("1", "4", currentUser.getDeptId(), beginTime, endTime); retObj.put("beforeConfirm", myBeforeConfirm + "/" + beforeConfirm); retObj.put("inHandle", myInHandle + "/" + inHandle); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index d4db8ce..66d7431 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -50,8 +50,8 @@ boolean checkPcRole(List roleTips); Integer countByDataScope(DataScope dataScope,String alarmType, String jobStatus,String beginTime,String endTime); - Integer countByResponse(String alarmType,String jobStatus,Long deptId,String beginTime,String endTime); - Integer countByUser(String alarmType,String jobStatus,Long userId,String beginTime,String endTime); + Long countByResponse(String alarmType,String jobStatus,Long deptId,String beginTime,String endTime); + Long countByUser(String alarmType,String jobStatus,Long userId,String beginTime,String endTime); void updateSinkJob(String id,String msg,String wellCode); List selectUserByWellCode(String wellCode); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index 4ad0f2a..a360887 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -249,12 +249,12 @@ } @Override - public Integer countByResponse(String alarmType, String jobStatus, Long deptId, String beginTime, String endTime) { + public Long countByResponse(String alarmType, String jobStatus, Long deptId, String beginTime, String endTime) { return this.baseMapper.countByResponse(alarmType, jobStatus, deptId, beginTime, endTime); } @Override - public Integer countByUser(String alarmType, String jobStatus, Long userId, String beginTime, String endTime) { + public Long countByUser(String alarmType, String jobStatus, Long userId, String beginTime, String endTime) { return this.baseMapper.countByUser(alarmType, jobStatus, userId, beginTime, endTime); } 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 fb74560..efddf31 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 @@ -7,9 +7,11 @@ import com.casic.missiles.core.util.DateUtil; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.dao.AlarmRecordsMapper; import com.casic.missiles.modular.system.dto.AlarmRecordDTO; +import com.casic.missiles.modular.system.model.AlarmJob; import com.casic.missiles.modular.system.model.AlarmRecords; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,7 +35,8 @@ private ICommonPermissionService permissionService; @Resource AlarmRecordsMapper alarmRecordsMapper; - + @Resource + IAlarmJobService alarmJobService; @Override public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope, String deptId, String alarmLevel,String wellName) { String sContent = null; @@ -94,6 +97,18 @@ @Override public boolean cancelAlarm(long id, String jobStatus, String handleMessage, long personId) { + AlarmRecords alarmRecords = this.selectById(id); + if(alarmRecords!=null&&ToolUtil.isNotEmpty(alarmRecords.getJobId())){ + AlarmJob alarmJob= alarmJobService.selectById(alarmRecords.getJobId()); + if(ToolUtil.isNotEmpty(alarmJob)&&alarmJob.getJobStatus()!="3"){ + alarmJob.setJobStatus("3"); + alarmJob.setHandleJobTime(new Date()); + alarmJob.setHandleJobPerson(personId); + alarmJob.setJobBelongTo(personId); + alarmJob.setHandleMessage(handleMessage); + alarmJobService.updateById(alarmJob); + } + } return this.baseMapper.cancelAlarm(id, jobStatus, handleMessage, personId); } @@ -128,6 +143,7 @@ } else if ("1".equals(alarmRecordDTO.getStatus())) {//未消警，计算时长 //同步相差8小时时间 Calendar now = Calendar.getInstance(); + now.add(Calendar.HOUR_OF_DAY,8); now.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai")); alarmRecordDTO.setAlarmDuration(getTimeDifference(alarmRecordDTO.getAlarmTimeDate(), now.getTime())); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index f38bb32..ad88d5b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -53,8 +53,8 @@ boolean handleJob(@Param("id") int id,@Param("personId") long personId); List> countByDataScope(@Param("dataScope") DataScope dataScope,@Param("alarmType")String alarmType,@Param("jobStatus")String jobStatus,@Param("beginTime")String beginTime,@Param("endTime")String endTime); - Integer countByResponse(@Param("alarmType")String alarmType,@Param("jobStatus")String jobStatus,@Param("deptId") Long deptId,@Param("beginTime")String beginTime,@Param("endTime")String endTime); - Integer countByUser(@Param("alarmType")String alarmType,@Param("jobStatus")String jobStatus,@Param("userId") Long userId,@Param("beginTime")String beginTime,@Param("endTime")String endTime); + Long countByResponse(@Param("alarmType")String alarmType,@Param("jobStatus")String jobStatus,@Param("deptId") Long deptId,@Param("beginTime")String beginTime,@Param("endTime")String endTime); + Long countByUser(@Param("alarmType")String alarmType,@Param("jobStatus")String jobStatus,@Param("userId") Long userId,@Param("beginTime")String beginTime,@Param("endTime")String endTime); String selectClientIdByUser(@Param("userId") Long userId); List selectUserByWellCode(@Param("wellCode") String wellCode); 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 38a66dc..caf5c3a 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 @@ -174,7 +174,7 @@ - SELECT COUNT( DISTINCT AJ.ID ) FROM alarm_job aj LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID 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 f45eb50..3a34d79 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 @@ -4,27 +4,31 @@ - - - - - - - - + + + + + + + + - - - + + + - ID AS id, DEVICE_ID AS deviceId, DEVCODE AS devcode, WELL_CODE AS wellCode, ALARM_TYPE AS alarmType, ALARM_CONTENT AS alarmContent, ALARM_VALUE AS alarmValue, ALARM_TIME AS alarmTime, STATUS AS status, JOB_ID AS jobId + ID + AS id, DEVICE_ID AS deviceId, DEVCODE AS devcode, WELL_CODE AS wellCode, ALARM_TYPE AS alarmType, ALARM_CONTENT AS alarmContent, ALARM_VALUE AS alarmValue, ALARM_TIME AS alarmTime, STATUS AS status, JOB_ID AS jobId - ar.ID as id, + ar + . + ID + as id, ar.WELL_CODE as wellCode, bwi.WELL_NAME as wellName, ar.ALARM_CONTENT as alarmContentName, @@ -101,7 +105,7 @@ #{i} - order by ar.ALARM_TIME desc + order by ar.ALARM_TIME desc SELECT - ar.ID AS id, - ar.DEVICE_ID AS deviceId, - ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, - ar.STATUS AS status, - ar.JOB_ID AS jobId, - bwi.DEPTID AS deptid, - bwi.WELL_NAME AS wellName + ar.ID AS id, + ar.DEVICE_ID AS deviceId, + ar.DEVCODE AS devcode, + ar.WELL_CODE AS wellCode, + ar.ALARM_TYPE AS alarmType, + ar.ALARM_CONTENT AS alarmContent, + ar.ALARM_VALUE AS alarmValue, + ar.ALARM_TIME AS alarmTime, + ar.ALARM_LEVEL AS alarmLevel, + ar.ALARM_MSG AS alarmMessage, + ar.STATUS AS status, + ar.JOB_ID AS jobId, + bwi.DEPTID AS deptid, + bwi.WELL_NAME AS wellName FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE WHERE STATUS = 1 @@ -189,40 +193,34 @@ - UPDATE alarm_job aj, alarm_records ar + UPDATE alarm_records ar - 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, - ar.OPERATE_TIME=now() + ar.OPERATE_TIME = NOW() - WHERE aj.ID = ar.job_id - AND aj.ID = #{id} - and ar.STATUS = '1' + WHERE ar.ID = #{id} - SELECT ar.id AS id,bwi.id AS wellId, ar.well_code AS wellCode, ar.devcode AS devcode, - bwi.DEPTID AS deptid, bwi.RESPONSIBLE_DEPT AS companyId, + bwi.DEPTID AS deptid, bwi.RESPONSIBLE_DEPT AS companyId, bdt.type_name AS deviceType, ar.alarm_type AS alarmType, ar.alarm_content AS alarmContentName,ar.alarm_value AS alarmValue, ar.alarm_level AS alarmLevel,ar.status AS STATUS,ar.alarm_time AS alarmTimeDate, diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 80005b9..149e7ab 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -143,7 +143,7 @@ entity.setSecretKey(secretKey); boolean flag = super.insert(entity); - insertSecretKey(entity.getDevcode(),true); +// insertSecretKey(entity.getDevcode(),true); //关联设备集中器信息 if (isAddConcentrator) { @@ -345,7 +345,7 @@ device.setWellId(wellDto.getWellId()); device.setSecretKey(secretKey); - insertSecretKey(device.getDevcode(),true); +// insertSecretKey(device.getDevcode(),true); }); if (ToolUtil.isNotEmpty(list)) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index c36298d..daf3952 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -5,7 +5,7 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter; //tomcat启动无需配置 -//@Configuration +@Configuration public class WebSocketConfig { /** * 注入ServerEndpointExporter， diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index fbbeeff..01e6f9a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -91,19 +91,19 @@ retObj.put("cancel", alarmJobService.countByDataScope(dataScope, alarmType, "4", beginTime, endTime)); } else { //app角色 - Integer beforeGet = alarmJobService.countByResponse("1", "0", currentUser.getDeptId(), beginTime, endTime); + Long beforeGet = alarmJobService.countByResponse("1", "0", currentUser.getDeptId(), beginTime, endTime); retObj.put("beforeGet", beforeGet); - Integer myBeforeConfirm = alarmJobService.countByUser("1", "1", currentUser.getId(), beginTime, endTime); - Integer myInHandle = alarmJobService.countByUser("1", "2", currentUser.getId(), beginTime, endTime); - Integer myOver = alarmJobService.countByUser("1", "3", currentUser.getId(), beginTime, endTime); - Integer myCancel = alarmJobService.countByUser("1", "4", currentUser.getId(), beginTime, endTime); + Long myBeforeConfirm = alarmJobService.countByUser("1", "1", currentUser.getId(), beginTime, endTime); + Long myInHandle = alarmJobService.countByUser("1", "2", currentUser.getId(), beginTime, endTime); + Long myOver = alarmJobService.countByUser("1", "3", currentUser.getId(), beginTime, endTime); + Long myCancel = alarmJobService.countByUser("1", "4", currentUser.getId(), beginTime, endTime); if (currentUser.getRoleTips().contains(sLeader)) { - Integer beforeConfirm = alarmJobService.countByResponse("1", "1", currentUser.getDeptId(), beginTime, endTime); - Integer inHandle = alarmJobService.countByResponse("1", "2", currentUser.getDeptId(), beginTime, endTime); - Integer over = alarmJobService.countByResponse("1", "3", currentUser.getDeptId(), beginTime, endTime); - Integer cancel = alarmJobService.countByResponse("1", "4", currentUser.getDeptId(), beginTime, endTime); + Long beforeConfirm = alarmJobService.countByResponse("1", "1", currentUser.getDeptId(), beginTime, endTime); + Long inHandle = alarmJobService.countByResponse("1", "2", currentUser.getDeptId(), beginTime, endTime); + Long over = alarmJobService.countByResponse("1", "3", currentUser.getDeptId(), beginTime, endTime); + Long cancel = alarmJobService.countByResponse("1", "4", currentUser.getDeptId(), beginTime, endTime); retObj.put("beforeConfirm", myBeforeConfirm + "/" + beforeConfirm); retObj.put("inHandle", myInHandle + "/" + inHandle); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index d4db8ce..66d7431 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -50,8 +50,8 @@ boolean checkPcRole(List roleTips); Integer countByDataScope(DataScope dataScope,String alarmType, String jobStatus,String beginTime,String endTime); - Integer countByResponse(String alarmType,String jobStatus,Long deptId,String beginTime,String endTime); - Integer countByUser(String alarmType,String jobStatus,Long userId,String beginTime,String endTime); + Long countByResponse(String alarmType,String jobStatus,Long deptId,String beginTime,String endTime); + Long countByUser(String alarmType,String jobStatus,Long userId,String beginTime,String endTime); void updateSinkJob(String id,String msg,String wellCode); List selectUserByWellCode(String wellCode); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index 4ad0f2a..a360887 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -249,12 +249,12 @@ } @Override - public Integer countByResponse(String alarmType, String jobStatus, Long deptId, String beginTime, String endTime) { + public Long countByResponse(String alarmType, String jobStatus, Long deptId, String beginTime, String endTime) { return this.baseMapper.countByResponse(alarmType, jobStatus, deptId, beginTime, endTime); } @Override - public Integer countByUser(String alarmType, String jobStatus, Long userId, String beginTime, String endTime) { + public Long countByUser(String alarmType, String jobStatus, Long userId, String beginTime, String endTime) { return this.baseMapper.countByUser(alarmType, jobStatus, userId, beginTime, endTime); } 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 fb74560..efddf31 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 @@ -7,9 +7,11 @@ import com.casic.missiles.core.util.DateUtil; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.dao.AlarmRecordsMapper; import com.casic.missiles.modular.system.dto.AlarmRecordDTO; +import com.casic.missiles.modular.system.model.AlarmJob; import com.casic.missiles.modular.system.model.AlarmRecords; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,7 +35,8 @@ private ICommonPermissionService permissionService; @Resource AlarmRecordsMapper alarmRecordsMapper; - + @Resource + IAlarmJobService alarmJobService; @Override public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope, String deptId, String alarmLevel,String wellName) { String sContent = null; @@ -94,6 +97,18 @@ @Override public boolean cancelAlarm(long id, String jobStatus, String handleMessage, long personId) { + AlarmRecords alarmRecords = this.selectById(id); + if(alarmRecords!=null&&ToolUtil.isNotEmpty(alarmRecords.getJobId())){ + AlarmJob alarmJob= alarmJobService.selectById(alarmRecords.getJobId()); + if(ToolUtil.isNotEmpty(alarmJob)&&alarmJob.getJobStatus()!="3"){ + alarmJob.setJobStatus("3"); + alarmJob.setHandleJobTime(new Date()); + alarmJob.setHandleJobPerson(personId); + alarmJob.setJobBelongTo(personId); + alarmJob.setHandleMessage(handleMessage); + alarmJobService.updateById(alarmJob); + } + } return this.baseMapper.cancelAlarm(id, jobStatus, handleMessage, personId); } @@ -128,6 +143,7 @@ } else if ("1".equals(alarmRecordDTO.getStatus())) {//未消警，计算时长 //同步相差8小时时间 Calendar now = Calendar.getInstance(); + now.add(Calendar.HOUR_OF_DAY,8); now.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai")); alarmRecordDTO.setAlarmDuration(getTimeDifference(alarmRecordDTO.getAlarmTimeDate(), now.getTime())); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index f38bb32..ad88d5b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -53,8 +53,8 @@ boolean handleJob(@Param("id") int id,@Param("personId") long personId); List> countByDataScope(@Param("dataScope") DataScope dataScope,@Param("alarmType")String alarmType,@Param("jobStatus")String jobStatus,@Param("beginTime")String beginTime,@Param("endTime")String endTime); - Integer countByResponse(@Param("alarmType")String alarmType,@Param("jobStatus")String jobStatus,@Param("deptId") Long deptId,@Param("beginTime")String beginTime,@Param("endTime")String endTime); - Integer countByUser(@Param("alarmType")String alarmType,@Param("jobStatus")String jobStatus,@Param("userId") Long userId,@Param("beginTime")String beginTime,@Param("endTime")String endTime); + Long countByResponse(@Param("alarmType")String alarmType,@Param("jobStatus")String jobStatus,@Param("deptId") Long deptId,@Param("beginTime")String beginTime,@Param("endTime")String endTime); + Long countByUser(@Param("alarmType")String alarmType,@Param("jobStatus")String jobStatus,@Param("userId") Long userId,@Param("beginTime")String beginTime,@Param("endTime")String endTime); String selectClientIdByUser(@Param("userId") Long userId); List selectUserByWellCode(@Param("wellCode") String wellCode); 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 38a66dc..caf5c3a 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 @@ -174,7 +174,7 @@ - SELECT COUNT( DISTINCT AJ.ID ) FROM alarm_job aj LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID 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 f45eb50..3a34d79 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 @@ -4,27 +4,31 @@ - - - - - - - - + + + + + + + + - - - + + + - ID AS id, DEVICE_ID AS deviceId, DEVCODE AS devcode, WELL_CODE AS wellCode, ALARM_TYPE AS alarmType, ALARM_CONTENT AS alarmContent, ALARM_VALUE AS alarmValue, ALARM_TIME AS alarmTime, STATUS AS status, JOB_ID AS jobId + ID + AS id, DEVICE_ID AS deviceId, DEVCODE AS devcode, WELL_CODE AS wellCode, ALARM_TYPE AS alarmType, ALARM_CONTENT AS alarmContent, ALARM_VALUE AS alarmValue, ALARM_TIME AS alarmTime, STATUS AS status, JOB_ID AS jobId - ar.ID as id, + ar + . + ID + as id, ar.WELL_CODE as wellCode, bwi.WELL_NAME as wellName, ar.ALARM_CONTENT as alarmContentName, @@ -101,7 +105,7 @@ #{i} - order by ar.ALARM_TIME desc + order by ar.ALARM_TIME desc SELECT - ar.ID AS id, - ar.DEVICE_ID AS deviceId, - ar.DEVCODE AS devcode, - ar.WELL_CODE AS wellCode, - ar.ALARM_TYPE AS alarmType, - ar.ALARM_CONTENT AS alarmContent, - ar.ALARM_VALUE AS alarmValue, - ar.ALARM_TIME AS alarmTime, - ar.ALARM_LEVEL AS alarmLevel, - ar.ALARM_MSG AS alarmMessage, - ar.STATUS AS status, - ar.JOB_ID AS jobId, - bwi.DEPTID AS deptid, - bwi.WELL_NAME AS wellName + ar.ID AS id, + ar.DEVICE_ID AS deviceId, + ar.DEVCODE AS devcode, + ar.WELL_CODE AS wellCode, + ar.ALARM_TYPE AS alarmType, + ar.ALARM_CONTENT AS alarmContent, + ar.ALARM_VALUE AS alarmValue, + ar.ALARM_TIME AS alarmTime, + ar.ALARM_LEVEL AS alarmLevel, + ar.ALARM_MSG AS alarmMessage, + ar.STATUS AS status, + ar.JOB_ID AS jobId, + bwi.DEPTID AS deptid, + bwi.WELL_NAME AS wellName FROM alarm_records ar LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE WHERE STATUS = 1 @@ -189,40 +193,34 @@ - UPDATE alarm_job aj, alarm_records ar + UPDATE alarm_records ar - 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, - ar.OPERATE_TIME=now() + ar.OPERATE_TIME = NOW() - WHERE aj.ID = ar.job_id - AND aj.ID = #{id} - and ar.STATUS = '1' + WHERE ar.ID = #{id} - SELECT ar.id AS id,bwi.id AS wellId, ar.well_code AS wellCode, ar.devcode AS devcode, - bwi.DEPTID AS deptid, bwi.RESPONSIBLE_DEPT AS companyId, + bwi.DEPTID AS deptid, bwi.RESPONSIBLE_DEPT AS companyId, bdt.type_name AS deviceType, ar.alarm_type AS alarmType, ar.alarm_content AS alarmContentName,ar.alarm_value AS alarmValue, ar.alarm_level AS alarmLevel,ar.status AS STATUS,ar.alarm_time AS alarmTimeDate, diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 80005b9..149e7ab 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -143,7 +143,7 @@ entity.setSecretKey(secretKey); boolean flag = super.insert(entity); - insertSecretKey(entity.getDevcode(),true); +// insertSecretKey(entity.getDevcode(),true); //关联设备集中器信息 if (isAddConcentrator) { @@ -345,7 +345,7 @@ device.setWellId(wellDto.getWellId()); device.setSecretKey(secretKey); - insertSecretKey(device.getDevcode(),true); +// insertSecretKey(device.getDevcode(),true); }); if (ToolUtil.isNotEmpty(list)) { diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index a1e4796..cd3e2df 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -3,7 +3,7 @@ ################### spring配置 ################### spring: resources: - static-locations: file:/usr/local/tomcat/webapps/ROOT/WEB-INF/classes/config/image/,file:/usr/local/tomcat/webapps/ROOT/WEB-INF/classes/config/download/ + static-locations: file:/usr/local/tomcat/webapps/ROOT/WEB-INF/classes/config/image/,file:/download/ datasource: url: jdbc:mysql://172.27.33.49:3306/smartwell_br?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false username: brzj @@ -42,11 +42,11 @@ connection-properties: config.decrypt=true;config.decrypt.key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKeBY1awypn6+XTqBWQ7vNUlHiVYwc2OO3EAXKYxIJqry4O6qeAGafVTSOJ7dxy/1gPi/cNNBxA3J976eUD504sCAwEAAQ== smartcity: config: - export-path: /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/config/export/ + export-path: /export/ #export-path: D:\export\ - image-path: /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/config/image/ - config-path: //usr/local/tomcat/webapps/ROOT/WEB-INF/classes/config/temp/ - download-path: /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/config/download/ + image-path: /image/ + config-path: /temp/ + download-path: /download/ device: redis: invalid-time: 86400 @@ -54,10 +54,10 @@ port: 6379 sm4: deviceType: gasjc01 - appId: a9c92d1b8b72417285744962d06e145b - appSecret: dc43576cd2a045dfb48c93212fdbfdff - url: http://117.119.83.196:8063 - secretKey: 009f1bbe8ba832438b59ef81beab5169 + appId: 4b70940c9e4976f90e6fddcd0dff1e44 + appSecret: b27245d1552f7d9826ef6c88abd46ba8 + url: http://117.119.83.196/prod-iot/services/iot-security-interface + secretKey: 24ad182507479a5da3ad94d9d78ea203 getui: appId: 115V4gtbgZ8OSC2U9vikz2 appKey: dyamRUrm2YAUYAkeYQmIQ