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 e2fe425..01d1be7 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 @@ -184,7 +184,7 @@ @RequestMapping(value = "/batchCancel") @ResponseBody - public Map batchCancel() { + public Map batchCancel(@RequestParam(value = "handleMessage", required = false) String handleMessage) { Map retMap = new HashMap<>(); if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); @@ -197,7 +197,7 @@ retMap.put("code", 200); retMap.put("message", "success"); - List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId()); + List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId(),handleMessage); if (ToolUtil.isEmpty(devCodes)) { retMap.put("code", 200); retMap.put("message", "failure"); 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 e2fe425..01d1be7 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 @@ -184,7 +184,7 @@ @RequestMapping(value = "/batchCancel") @ResponseBody - public Map batchCancel() { + public Map batchCancel(@RequestParam(value = "handleMessage", required = false) String handleMessage) { Map retMap = new HashMap<>(); if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); @@ -197,7 +197,7 @@ retMap.put("code", 200); retMap.put("message", "success"); - List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId()); + List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId(),handleMessage); if (ToolUtil.isEmpty(devCodes)) { retMap.put("code", 200); retMap.put("message", "failure"); 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 539103b..edccd10 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 @@ -34,7 +34,7 @@ Map countByJobStatus(long deptId,int spanDays); Map countMyJob(long userId,long deptId,int spanDays,String deptIds); - List batchCancel(String ids,long userId); + List batchCancel(String ids,long userId,String handleMessage); // 根据dataScope 查工单列表 List jobListScope( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent,DataScope dataScope); 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 e2fe425..01d1be7 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 @@ -184,7 +184,7 @@ @RequestMapping(value = "/batchCancel") @ResponseBody - public Map batchCancel() { + public Map batchCancel(@RequestParam(value = "handleMessage", required = false) String handleMessage) { Map retMap = new HashMap<>(); if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); @@ -197,7 +197,7 @@ retMap.put("code", 200); retMap.put("message", "success"); - List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId()); + List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId(),handleMessage); if (ToolUtil.isEmpty(devCodes)) { retMap.put("code", 200); retMap.put("message", "failure"); 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 539103b..edccd10 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 @@ -34,7 +34,7 @@ Map countByJobStatus(long deptId,int spanDays); Map countMyJob(long userId,long deptId,int spanDays,String deptIds); - List batchCancel(String ids,long userId); + List batchCancel(String ids,long userId,String handleMessage); // 根据dataScope 查工单列表 List jobListScope( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent,DataScope dataScope); 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 21f0adc..5aa1829 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 @@ -162,9 +162,9 @@ } @Override - public List batchCancel(String deptIds,long userId){ + public List batchCancel(String deptIds,long userId,String handleMessage){ List stringList = this.baseMapper.getDevCodesByDeptIds(deptIds); - boolean bTrue = this.baseMapper.batchCancel(deptIds,userId); + boolean bTrue = this.baseMapper.batchCancel(deptIds,userId,handleMessage); if (bTrue) return stringList; else 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 e2fe425..01d1be7 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 @@ -184,7 +184,7 @@ @RequestMapping(value = "/batchCancel") @ResponseBody - public Map batchCancel() { + public Map batchCancel(@RequestParam(value = "handleMessage", required = false) String handleMessage) { Map retMap = new HashMap<>(); if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); @@ -197,7 +197,7 @@ retMap.put("code", 200); retMap.put("message", "success"); - List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId()); + List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId(),handleMessage); if (ToolUtil.isEmpty(devCodes)) { retMap.put("code", 200); retMap.put("message", "failure"); 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 539103b..edccd10 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 @@ -34,7 +34,7 @@ Map countByJobStatus(long deptId,int spanDays); Map countMyJob(long userId,long deptId,int spanDays,String deptIds); - List batchCancel(String ids,long userId); + List batchCancel(String ids,long userId,String handleMessage); // 根据dataScope 查工单列表 List jobListScope( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent,DataScope dataScope); 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 21f0adc..5aa1829 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 @@ -162,9 +162,9 @@ } @Override - public List batchCancel(String deptIds,long userId){ + public List batchCancel(String deptIds,long userId,String handleMessage){ List stringList = this.baseMapper.getDevCodesByDeptIds(deptIds); - boolean bTrue = this.baseMapper.batchCancel(deptIds,userId); + boolean bTrue = this.baseMapper.batchCancel(deptIds,userId,handleMessage); if (bTrue) return stringList; else 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 20af3db..cd2b876 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 @@ -34,7 +34,7 @@ boolean handleJob(@Param("id") int id,@Param("personId") long personId); String getDevCodeByJobId(@Param("id") int id); List getDevCodesByDeptIds(@Param("deptIds") String deptIds); - boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId); + boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId ,@Param("handleMessage") String handleMessage ); /** * 根据工单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 e2fe425..01d1be7 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 @@ -184,7 +184,7 @@ @RequestMapping(value = "/batchCancel") @ResponseBody - public Map batchCancel() { + public Map batchCancel(@RequestParam(value = "handleMessage", required = false) String handleMessage) { Map retMap = new HashMap<>(); if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); @@ -197,7 +197,7 @@ retMap.put("code", 200); retMap.put("message", "success"); - List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId()); + List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId(),handleMessage); if (ToolUtil.isEmpty(devCodes)) { retMap.put("code", 200); retMap.put("message", "failure"); 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 539103b..edccd10 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 @@ -34,7 +34,7 @@ Map countByJobStatus(long deptId,int spanDays); Map countMyJob(long userId,long deptId,int spanDays,String deptIds); - List batchCancel(String ids,long userId); + List batchCancel(String ids,long userId,String handleMessage); // 根据dataScope 查工单列表 List jobListScope( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent,DataScope dataScope); 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 21f0adc..5aa1829 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 @@ -162,9 +162,9 @@ } @Override - public List batchCancel(String deptIds,long userId){ + public List batchCancel(String deptIds,long userId,String handleMessage){ List stringList = this.baseMapper.getDevCodesByDeptIds(deptIds); - boolean bTrue = this.baseMapper.batchCancel(deptIds,userId); + boolean bTrue = this.baseMapper.batchCancel(deptIds,userId,handleMessage); if (bTrue) return stringList; else 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 20af3db..cd2b876 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 @@ -34,7 +34,7 @@ boolean handleJob(@Param("id") int id,@Param("personId") long personId); String getDevCodeByJobId(@Param("id") int id); List getDevCodesByDeptIds(@Param("deptIds") String deptIds); - boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId); + boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId ,@Param("handleMessage") String handleMessage ); /** * 根据工单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 98ac0e0..9762a96 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 @@ -4,29 +4,30 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - ID AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, + ID + AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, WELL_CODE AS wellCode, DEVCODE AS devcode, DATE_FORMAT(CREATE_TIME,'%Y-%m-%d %H:%i:%s') AS createTime, JOB_STATUS AS jobStatus, GET_JOB_PERSON AS getJobPerson, DATE_FORMAT(GET_JOB_TIME,'%Y-%m-%d %H:%i:%s') AS getJobTime, FIRST_STATE AS firstState, @@ -37,7 +38,10 @@ - ar.id AS alarmId, + ar + . + id + AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, ar.ALARM_TYPE AS alarmType, @@ -48,6 +52,7 @@ aj.JOB_STATUS AS jobStatus, aj.JOB_BELONG_TO AS jobBelongTo, aj.GET_JOB_PERSON AS getJobPerson, + aj.HANDLE_MESSAGE AS handleMessage, ar.ALARM_VALUE AS alarmValue, DATE_FORMAT( aj.CREATE_TIME, '%Y-%m-%d %H:%i:%s' ) AS createTime, DATE_FORMAT( ar.ALARM_TIME, '%Y-%m-%d %H:%i:%s' ) AS alarmTime, @@ -66,18 +71,18 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} + ) and ar.alarm_type =1 - + @@ -99,20 +104,20 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.deptid in ( ${deptIds} ) - - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.deptid in ( ${deptIds} ) + + ) and ar.alarm_type =1 - + @@ -128,42 +133,42 @@ SELECT * FROM ( - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.WELL_CODE IN ( - SELECT WELL_CODE - FROM bus_well_info bwi - INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID - INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID - INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) - ) - AND aj.JOB_STATUS = '0' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.WELL_CODE IN ( + SELECT WELL_CODE + FROM bus_well_info bwi + INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID + INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID + INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) + ) + AND aj.JOB_STATUS = '0' + AND ar.ALARM_TYPE = '1' - UNION DISTINCT + UNION DISTINCT - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.HANDLE_JOB_PERSON = #{userId} - AND aj.JOB_STATUS = '3' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.HANDLE_JOB_PERSON = #{userId} + AND aj.JOB_STATUS = '3' + AND ar.ALARM_TYPE = '1' ) uni WHERE 1=1 @@ -378,19 +387,18 @@ - - select devcode from alarm_records where job_id = #{id} limit 1 + select devcode + from alarm_records + where job_id = #{id} limit 1 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 e2fe425..01d1be7 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 @@ -184,7 +184,7 @@ @RequestMapping(value = "/batchCancel") @ResponseBody - public Map batchCancel() { + public Map batchCancel(@RequestParam(value = "handleMessage", required = false) String handleMessage) { Map retMap = new HashMap<>(); if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); @@ -197,7 +197,7 @@ retMap.put("code", 200); retMap.put("message", "success"); - List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId()); + List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId(),handleMessage); if (ToolUtil.isEmpty(devCodes)) { retMap.put("code", 200); retMap.put("message", "failure"); 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 539103b..edccd10 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 @@ -34,7 +34,7 @@ Map countByJobStatus(long deptId,int spanDays); Map countMyJob(long userId,long deptId,int spanDays,String deptIds); - List batchCancel(String ids,long userId); + List batchCancel(String ids,long userId,String handleMessage); // 根据dataScope 查工单列表 List jobListScope( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent,DataScope dataScope); 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 21f0adc..5aa1829 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 @@ -162,9 +162,9 @@ } @Override - public List batchCancel(String deptIds,long userId){ + public List batchCancel(String deptIds,long userId,String handleMessage){ List stringList = this.baseMapper.getDevCodesByDeptIds(deptIds); - boolean bTrue = this.baseMapper.batchCancel(deptIds,userId); + boolean bTrue = this.baseMapper.batchCancel(deptIds,userId,handleMessage); if (bTrue) return stringList; else 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 20af3db..cd2b876 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 @@ -34,7 +34,7 @@ boolean handleJob(@Param("id") int id,@Param("personId") long personId); String getDevCodeByJobId(@Param("id") int id); List getDevCodesByDeptIds(@Param("deptIds") String deptIds); - boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId); + boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId ,@Param("handleMessage") String handleMessage ); /** * 根据工单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 98ac0e0..9762a96 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 @@ -4,29 +4,30 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - ID AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, + ID + AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, WELL_CODE AS wellCode, DEVCODE AS devcode, DATE_FORMAT(CREATE_TIME,'%Y-%m-%d %H:%i:%s') AS createTime, JOB_STATUS AS jobStatus, GET_JOB_PERSON AS getJobPerson, DATE_FORMAT(GET_JOB_TIME,'%Y-%m-%d %H:%i:%s') AS getJobTime, FIRST_STATE AS firstState, @@ -37,7 +38,10 @@ - ar.id AS alarmId, + ar + . + id + AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, ar.ALARM_TYPE AS alarmType, @@ -48,6 +52,7 @@ aj.JOB_STATUS AS jobStatus, aj.JOB_BELONG_TO AS jobBelongTo, aj.GET_JOB_PERSON AS getJobPerson, + aj.HANDLE_MESSAGE AS handleMessage, ar.ALARM_VALUE AS alarmValue, DATE_FORMAT( aj.CREATE_TIME, '%Y-%m-%d %H:%i:%s' ) AS createTime, DATE_FORMAT( ar.ALARM_TIME, '%Y-%m-%d %H:%i:%s' ) AS alarmTime, @@ -66,18 +71,18 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} + ) and ar.alarm_type =1 - + @@ -99,20 +104,20 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.deptid in ( ${deptIds} ) - - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.deptid in ( ${deptIds} ) + + ) and ar.alarm_type =1 - + @@ -128,42 +133,42 @@ SELECT * FROM ( - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.WELL_CODE IN ( - SELECT WELL_CODE - FROM bus_well_info bwi - INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID - INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID - INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) - ) - AND aj.JOB_STATUS = '0' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.WELL_CODE IN ( + SELECT WELL_CODE + FROM bus_well_info bwi + INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID + INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID + INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) + ) + AND aj.JOB_STATUS = '0' + AND ar.ALARM_TYPE = '1' - UNION DISTINCT + UNION DISTINCT - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.HANDLE_JOB_PERSON = #{userId} - AND aj.JOB_STATUS = '3' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.HANDLE_JOB_PERSON = #{userId} + AND aj.JOB_STATUS = '3' + AND ar.ALARM_TYPE = '1' ) uni WHERE 1=1 @@ -378,19 +387,18 @@ - - select devcode from alarm_records where job_id = #{id} limit 1 + select devcode + from alarm_records + where job_id = #{id} limit 1 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 42cf61b..174d9ce 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -7,7 +7,7 @@ wellId AS wellId, deviceId AS deviceId, devcode as devcode, wellCode AS wellCode, alarmId AS alarmId, deptid AS deptid, owner AS owner, alarmType AS alarmType, alarmValue AS alarmValue, alarmContent AS alarmContent, alarmTimeDate AS alarmTimeDate, position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY, - lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode + lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode,wellType AS wellType 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 e2fe425..01d1be7 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 @@ -184,7 +184,7 @@ @RequestMapping(value = "/batchCancel") @ResponseBody - public Map batchCancel() { + public Map batchCancel(@RequestParam(value = "handleMessage", required = false) String handleMessage) { Map retMap = new HashMap<>(); if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); @@ -197,7 +197,7 @@ retMap.put("code", 200); retMap.put("message", "success"); - List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId()); + List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId(),handleMessage); if (ToolUtil.isEmpty(devCodes)) { retMap.put("code", 200); retMap.put("message", "failure"); 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 539103b..edccd10 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 @@ -34,7 +34,7 @@ Map countByJobStatus(long deptId,int spanDays); Map countMyJob(long userId,long deptId,int spanDays,String deptIds); - List batchCancel(String ids,long userId); + List batchCancel(String ids,long userId,String handleMessage); // 根据dataScope 查工单列表 List jobListScope( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent,DataScope dataScope); 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 21f0adc..5aa1829 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 @@ -162,9 +162,9 @@ } @Override - public List batchCancel(String deptIds,long userId){ + public List batchCancel(String deptIds,long userId,String handleMessage){ List stringList = this.baseMapper.getDevCodesByDeptIds(deptIds); - boolean bTrue = this.baseMapper.batchCancel(deptIds,userId); + boolean bTrue = this.baseMapper.batchCancel(deptIds,userId,handleMessage); if (bTrue) return stringList; else 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 20af3db..cd2b876 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 @@ -34,7 +34,7 @@ boolean handleJob(@Param("id") int id,@Param("personId") long personId); String getDevCodeByJobId(@Param("id") int id); List getDevCodesByDeptIds(@Param("deptIds") String deptIds); - boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId); + boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId ,@Param("handleMessage") String handleMessage ); /** * 根据工单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 98ac0e0..9762a96 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 @@ -4,29 +4,30 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - ID AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, + ID + AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, WELL_CODE AS wellCode, DEVCODE AS devcode, DATE_FORMAT(CREATE_TIME,'%Y-%m-%d %H:%i:%s') AS createTime, JOB_STATUS AS jobStatus, GET_JOB_PERSON AS getJobPerson, DATE_FORMAT(GET_JOB_TIME,'%Y-%m-%d %H:%i:%s') AS getJobTime, FIRST_STATE AS firstState, @@ -37,7 +38,10 @@ - ar.id AS alarmId, + ar + . + id + AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, ar.ALARM_TYPE AS alarmType, @@ -48,6 +52,7 @@ aj.JOB_STATUS AS jobStatus, aj.JOB_BELONG_TO AS jobBelongTo, aj.GET_JOB_PERSON AS getJobPerson, + aj.HANDLE_MESSAGE AS handleMessage, ar.ALARM_VALUE AS alarmValue, DATE_FORMAT( aj.CREATE_TIME, '%Y-%m-%d %H:%i:%s' ) AS createTime, DATE_FORMAT( ar.ALARM_TIME, '%Y-%m-%d %H:%i:%s' ) AS alarmTime, @@ -66,18 +71,18 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} + ) and ar.alarm_type =1 - + @@ -99,20 +104,20 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.deptid in ( ${deptIds} ) - - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.deptid in ( ${deptIds} ) + + ) and ar.alarm_type =1 - + @@ -128,42 +133,42 @@ SELECT * FROM ( - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.WELL_CODE IN ( - SELECT WELL_CODE - FROM bus_well_info bwi - INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID - INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID - INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) - ) - AND aj.JOB_STATUS = '0' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.WELL_CODE IN ( + SELECT WELL_CODE + FROM bus_well_info bwi + INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID + INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID + INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) + ) + AND aj.JOB_STATUS = '0' + AND ar.ALARM_TYPE = '1' - UNION DISTINCT + UNION DISTINCT - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.HANDLE_JOB_PERSON = #{userId} - AND aj.JOB_STATUS = '3' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.HANDLE_JOB_PERSON = #{userId} + AND aj.JOB_STATUS = '3' + AND ar.ALARM_TYPE = '1' ) uni WHERE 1=1 @@ -378,19 +387,18 @@ - - select devcode from alarm_records where job_id = #{id} limit 1 + select devcode + from alarm_records + where job_id = #{id} limit 1 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 42cf61b..174d9ce 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -7,7 +7,7 @@ wellId AS wellId, deviceId AS deviceId, devcode as devcode, wellCode AS wellCode, alarmId AS alarmId, deptid AS deptid, owner AS owner, alarmType AS alarmType, alarmValue AS alarmValue, alarmContent AS alarmContent, alarmTimeDate AS alarmTimeDate, position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY, - lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode + lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode,wellType AS wellType 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 0c71440..b3cb789 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,103 +4,87 @@ - - - - - - - - - - + + + + + + + + + + - 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 - 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 e2fe425..01d1be7 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 @@ -184,7 +184,7 @@ @RequestMapping(value = "/batchCancel") @ResponseBody - public Map batchCancel() { + public Map batchCancel(@RequestParam(value = "handleMessage", required = false) String handleMessage) { Map retMap = new HashMap<>(); if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); @@ -197,7 +197,7 @@ retMap.put("code", 200); retMap.put("message", "success"); - List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId()); + List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId(),handleMessage); if (ToolUtil.isEmpty(devCodes)) { retMap.put("code", 200); retMap.put("message", "failure"); 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 539103b..edccd10 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 @@ -34,7 +34,7 @@ Map countByJobStatus(long deptId,int spanDays); Map countMyJob(long userId,long deptId,int spanDays,String deptIds); - List batchCancel(String ids,long userId); + List batchCancel(String ids,long userId,String handleMessage); // 根据dataScope 查工单列表 List jobListScope( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent,DataScope dataScope); 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 21f0adc..5aa1829 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 @@ -162,9 +162,9 @@ } @Override - public List batchCancel(String deptIds,long userId){ + public List batchCancel(String deptIds,long userId,String handleMessage){ List stringList = this.baseMapper.getDevCodesByDeptIds(deptIds); - boolean bTrue = this.baseMapper.batchCancel(deptIds,userId); + boolean bTrue = this.baseMapper.batchCancel(deptIds,userId,handleMessage); if (bTrue) return stringList; else 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 20af3db..cd2b876 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 @@ -34,7 +34,7 @@ boolean handleJob(@Param("id") int id,@Param("personId") long personId); String getDevCodeByJobId(@Param("id") int id); List getDevCodesByDeptIds(@Param("deptIds") String deptIds); - boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId); + boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId ,@Param("handleMessage") String handleMessage ); /** * 根据工单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 98ac0e0..9762a96 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 @@ -4,29 +4,30 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - ID AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, + ID + AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, WELL_CODE AS wellCode, DEVCODE AS devcode, DATE_FORMAT(CREATE_TIME,'%Y-%m-%d %H:%i:%s') AS createTime, JOB_STATUS AS jobStatus, GET_JOB_PERSON AS getJobPerson, DATE_FORMAT(GET_JOB_TIME,'%Y-%m-%d %H:%i:%s') AS getJobTime, FIRST_STATE AS firstState, @@ -37,7 +38,10 @@ - ar.id AS alarmId, + ar + . + id + AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, ar.ALARM_TYPE AS alarmType, @@ -48,6 +52,7 @@ aj.JOB_STATUS AS jobStatus, aj.JOB_BELONG_TO AS jobBelongTo, aj.GET_JOB_PERSON AS getJobPerson, + aj.HANDLE_MESSAGE AS handleMessage, ar.ALARM_VALUE AS alarmValue, DATE_FORMAT( aj.CREATE_TIME, '%Y-%m-%d %H:%i:%s' ) AS createTime, DATE_FORMAT( ar.ALARM_TIME, '%Y-%m-%d %H:%i:%s' ) AS alarmTime, @@ -66,18 +71,18 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} + ) and ar.alarm_type =1 - + @@ -99,20 +104,20 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.deptid in ( ${deptIds} ) - - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.deptid in ( ${deptIds} ) + + ) and ar.alarm_type =1 - + @@ -128,42 +133,42 @@ SELECT * FROM ( - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.WELL_CODE IN ( - SELECT WELL_CODE - FROM bus_well_info bwi - INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID - INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID - INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) - ) - AND aj.JOB_STATUS = '0' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.WELL_CODE IN ( + SELECT WELL_CODE + FROM bus_well_info bwi + INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID + INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID + INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) + ) + AND aj.JOB_STATUS = '0' + AND ar.ALARM_TYPE = '1' - UNION DISTINCT + UNION DISTINCT - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.HANDLE_JOB_PERSON = #{userId} - AND aj.JOB_STATUS = '3' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.HANDLE_JOB_PERSON = #{userId} + AND aj.JOB_STATUS = '3' + AND ar.ALARM_TYPE = '1' ) uni WHERE 1=1 @@ -378,19 +387,18 @@ - - select devcode from alarm_records where job_id = #{id} limit 1 + select devcode + from alarm_records + where job_id = #{id} limit 1 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 42cf61b..174d9ce 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -7,7 +7,7 @@ wellId AS wellId, deviceId AS deviceId, devcode as devcode, wellCode AS wellCode, alarmId AS alarmId, deptid AS deptid, owner AS owner, alarmType AS alarmType, alarmValue AS alarmValue, alarmContent AS alarmContent, alarmTimeDate AS alarmTimeDate, position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY, - lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode + lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode,wellType AS wellType 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 0c71440..b3cb789 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,103 +4,87 @@ - - - - - - - - - - + + + + + + + + + + - 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 - diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java index 8c09726..7efefff 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java @@ -101,6 +101,12 @@ */ private String owner; + /** + * 井类型 + */ + private String wellType; + + public Long getAlarmId() { return alarmId; @@ -255,6 +261,14 @@ this.owner = owner; } + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + @Override public String toString() { return "AlarmNowView{" + 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 e2fe425..01d1be7 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 @@ -184,7 +184,7 @@ @RequestMapping(value = "/batchCancel") @ResponseBody - public Map batchCancel() { + public Map batchCancel(@RequestParam(value = "handleMessage", required = false) String handleMessage) { Map retMap = new HashMap<>(); if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); @@ -197,7 +197,7 @@ retMap.put("code", 200); retMap.put("message", "success"); - List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId()); + List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId(),handleMessage); if (ToolUtil.isEmpty(devCodes)) { retMap.put("code", 200); retMap.put("message", "failure"); 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 539103b..edccd10 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 @@ -34,7 +34,7 @@ Map countByJobStatus(long deptId,int spanDays); Map countMyJob(long userId,long deptId,int spanDays,String deptIds); - List batchCancel(String ids,long userId); + List batchCancel(String ids,long userId,String handleMessage); // 根据dataScope 查工单列表 List jobListScope( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent,DataScope dataScope); 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 21f0adc..5aa1829 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 @@ -162,9 +162,9 @@ } @Override - public List batchCancel(String deptIds,long userId){ + public List batchCancel(String deptIds,long userId,String handleMessage){ List stringList = this.baseMapper.getDevCodesByDeptIds(deptIds); - boolean bTrue = this.baseMapper.batchCancel(deptIds,userId); + boolean bTrue = this.baseMapper.batchCancel(deptIds,userId,handleMessage); if (bTrue) return stringList; else 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 20af3db..cd2b876 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 @@ -34,7 +34,7 @@ boolean handleJob(@Param("id") int id,@Param("personId") long personId); String getDevCodeByJobId(@Param("id") int id); List getDevCodesByDeptIds(@Param("deptIds") String deptIds); - boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId); + boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId ,@Param("handleMessage") String handleMessage ); /** * 根据工单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 98ac0e0..9762a96 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 @@ -4,29 +4,30 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - ID AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, + ID + AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, WELL_CODE AS wellCode, DEVCODE AS devcode, DATE_FORMAT(CREATE_TIME,'%Y-%m-%d %H:%i:%s') AS createTime, JOB_STATUS AS jobStatus, GET_JOB_PERSON AS getJobPerson, DATE_FORMAT(GET_JOB_TIME,'%Y-%m-%d %H:%i:%s') AS getJobTime, FIRST_STATE AS firstState, @@ -37,7 +38,10 @@ - ar.id AS alarmId, + ar + . + id + AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, ar.ALARM_TYPE AS alarmType, @@ -48,6 +52,7 @@ aj.JOB_STATUS AS jobStatus, aj.JOB_BELONG_TO AS jobBelongTo, aj.GET_JOB_PERSON AS getJobPerson, + aj.HANDLE_MESSAGE AS handleMessage, ar.ALARM_VALUE AS alarmValue, DATE_FORMAT( aj.CREATE_TIME, '%Y-%m-%d %H:%i:%s' ) AS createTime, DATE_FORMAT( ar.ALARM_TIME, '%Y-%m-%d %H:%i:%s' ) AS alarmTime, @@ -66,18 +71,18 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} + ) and ar.alarm_type =1 - + @@ -99,20 +104,20 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.deptid in ( ${deptIds} ) - - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.deptid in ( ${deptIds} ) + + ) and ar.alarm_type =1 - + @@ -128,42 +133,42 @@ SELECT * FROM ( - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.WELL_CODE IN ( - SELECT WELL_CODE - FROM bus_well_info bwi - INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID - INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID - INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) - ) - AND aj.JOB_STATUS = '0' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.WELL_CODE IN ( + SELECT WELL_CODE + FROM bus_well_info bwi + INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID + INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID + INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) + ) + AND aj.JOB_STATUS = '0' + AND ar.ALARM_TYPE = '1' - UNION DISTINCT + UNION DISTINCT - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.HANDLE_JOB_PERSON = #{userId} - AND aj.JOB_STATUS = '3' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.HANDLE_JOB_PERSON = #{userId} + AND aj.JOB_STATUS = '3' + AND ar.ALARM_TYPE = '1' ) uni WHERE 1=1 @@ -378,19 +387,18 @@ - - select devcode from alarm_records where job_id = #{id} limit 1 + select devcode + from alarm_records + where job_id = #{id} limit 1 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 42cf61b..174d9ce 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -7,7 +7,7 @@ wellId AS wellId, deviceId AS deviceId, devcode as devcode, wellCode AS wellCode, alarmId AS alarmId, deptid AS deptid, owner AS owner, alarmType AS alarmType, alarmValue AS alarmValue, alarmContent AS alarmContent, alarmTimeDate AS alarmTimeDate, position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY, - lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode + lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode,wellType AS wellType 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 0c71440..b3cb789 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,103 +4,87 @@ - - - - - - - - - - + + + + + + + + + + - 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 - diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java index 8c09726..7efefff 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java @@ -101,6 +101,12 @@ */ private String owner; + /** + * 井类型 + */ + private String wellType; + + public Long getAlarmId() { return alarmId; @@ -255,6 +261,14 @@ this.owner = owner; } + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + @Override public String toString() { return "AlarmNowView{" + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java index a68232c..989293b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java @@ -72,10 +72,18 @@ */ @TableField("JOB_ID") private Integer jobId; - + @TableField("HANDLE_MESSAGE") + private String handleMessage; @TableField(exist = false) private Integer jobStatus; + @TableField(exist = false) + private String handlePerson; + + @TableField(exist = false) + private Date handleTime; + + public Integer getJobStatus() { @@ -166,6 +174,30 @@ this.jobId = jobId; } + public String getHandlePerson() { + return handlePerson; + } + + public void setHandlePerson(String handlePerson) { + this.handlePerson = handlePerson; + } + + public Date getHandleTime() { + return handleTime; + } + + public void setHandleTime(Date handleTime) { + this.handleTime = handleTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + @Override protected Serializable pkVal() { return this.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 e2fe425..01d1be7 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 @@ -184,7 +184,7 @@ @RequestMapping(value = "/batchCancel") @ResponseBody - public Map batchCancel() { + public Map batchCancel(@RequestParam(value = "handleMessage", required = false) String handleMessage) { Map retMap = new HashMap<>(); if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); @@ -197,7 +197,7 @@ retMap.put("code", 200); retMap.put("message", "success"); - List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId()); + List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId(),handleMessage); if (ToolUtil.isEmpty(devCodes)) { retMap.put("code", 200); retMap.put("message", "failure"); 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 539103b..edccd10 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 @@ -34,7 +34,7 @@ Map countByJobStatus(long deptId,int spanDays); Map countMyJob(long userId,long deptId,int spanDays,String deptIds); - List batchCancel(String ids,long userId); + List batchCancel(String ids,long userId,String handleMessage); // 根据dataScope 查工单列表 List jobListScope( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent,DataScope dataScope); 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 21f0adc..5aa1829 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 @@ -162,9 +162,9 @@ } @Override - public List batchCancel(String deptIds,long userId){ + public List batchCancel(String deptIds,long userId,String handleMessage){ List stringList = this.baseMapper.getDevCodesByDeptIds(deptIds); - boolean bTrue = this.baseMapper.batchCancel(deptIds,userId); + boolean bTrue = this.baseMapper.batchCancel(deptIds,userId,handleMessage); if (bTrue) return stringList; else 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 20af3db..cd2b876 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 @@ -34,7 +34,7 @@ boolean handleJob(@Param("id") int id,@Param("personId") long personId); String getDevCodeByJobId(@Param("id") int id); List getDevCodesByDeptIds(@Param("deptIds") String deptIds); - boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId); + boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId ,@Param("handleMessage") String handleMessage ); /** * 根据工单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 98ac0e0..9762a96 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 @@ -4,29 +4,30 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - ID AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, + ID + AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, WELL_CODE AS wellCode, DEVCODE AS devcode, DATE_FORMAT(CREATE_TIME,'%Y-%m-%d %H:%i:%s') AS createTime, JOB_STATUS AS jobStatus, GET_JOB_PERSON AS getJobPerson, DATE_FORMAT(GET_JOB_TIME,'%Y-%m-%d %H:%i:%s') AS getJobTime, FIRST_STATE AS firstState, @@ -37,7 +38,10 @@ - ar.id AS alarmId, + ar + . + id + AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, ar.ALARM_TYPE AS alarmType, @@ -48,6 +52,7 @@ aj.JOB_STATUS AS jobStatus, aj.JOB_BELONG_TO AS jobBelongTo, aj.GET_JOB_PERSON AS getJobPerson, + aj.HANDLE_MESSAGE AS handleMessage, ar.ALARM_VALUE AS alarmValue, DATE_FORMAT( aj.CREATE_TIME, '%Y-%m-%d %H:%i:%s' ) AS createTime, DATE_FORMAT( ar.ALARM_TIME, '%Y-%m-%d %H:%i:%s' ) AS alarmTime, @@ -66,18 +71,18 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} + ) and ar.alarm_type =1 - + @@ -99,20 +104,20 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.deptid in ( ${deptIds} ) - - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.deptid in ( ${deptIds} ) + + ) and ar.alarm_type =1 - + @@ -128,42 +133,42 @@ SELECT * FROM ( - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.WELL_CODE IN ( - SELECT WELL_CODE - FROM bus_well_info bwi - INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID - INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID - INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) - ) - AND aj.JOB_STATUS = '0' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.WELL_CODE IN ( + SELECT WELL_CODE + FROM bus_well_info bwi + INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID + INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID + INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) + ) + AND aj.JOB_STATUS = '0' + AND ar.ALARM_TYPE = '1' - UNION DISTINCT + UNION DISTINCT - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.HANDLE_JOB_PERSON = #{userId} - AND aj.JOB_STATUS = '3' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.HANDLE_JOB_PERSON = #{userId} + AND aj.JOB_STATUS = '3' + AND ar.ALARM_TYPE = '1' ) uni WHERE 1=1 @@ -378,19 +387,18 @@ - - select devcode from alarm_records where job_id = #{id} limit 1 + select devcode + from alarm_records + where job_id = #{id} limit 1 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 42cf61b..174d9ce 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -7,7 +7,7 @@ wellId AS wellId, deviceId AS deviceId, devcode as devcode, wellCode AS wellCode, alarmId AS alarmId, deptid AS deptid, owner AS owner, alarmType AS alarmType, alarmValue AS alarmValue, alarmContent AS alarmContent, alarmTimeDate AS alarmTimeDate, position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY, - lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode + lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode,wellType AS wellType 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 0c71440..b3cb789 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,103 +4,87 @@ - - - - - - - - - - + + + + + + + + + + - 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 - diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java index 8c09726..7efefff 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java @@ -101,6 +101,12 @@ */ private String owner; + /** + * 井类型 + */ + private String wellType; + + public Long getAlarmId() { return alarmId; @@ -255,6 +261,14 @@ this.owner = owner; } + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + @Override public String toString() { return "AlarmNowView{" + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java index a68232c..989293b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java @@ -72,10 +72,18 @@ */ @TableField("JOB_ID") private Integer jobId; - + @TableField("HANDLE_MESSAGE") + private String handleMessage; @TableField(exist = false) private Integer jobStatus; + @TableField(exist = false) + private String handlePerson; + + @TableField(exist = false) + private Date handleTime; + + public Integer getJobStatus() { @@ -166,6 +174,30 @@ this.jobId = jobId; } + public String getHandlePerson() { + return handlePerson; + } + + public void setHandlePerson(String handlePerson) { + this.handlePerson = handlePerson; + } + + public Date getHandleTime() { + return handleTime; + } + + public void setHandleTime(Date handleTime) { + this.handleTime = handleTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java index 56165b3..75ce2aa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java @@ -10,8 +10,11 @@ //@Service //@Primary public class AlarmRecordWarpper extends BaseControllerWarpper { -// private EhcacheConstant ehcacheConstant = new EhcacheConstant(); - public AlarmRecordWarpper(Object list) { super(list); } + // private EhcacheConstant ehcacheConstant = new EhcacheConstant(); + public AlarmRecordWarpper(Object list) { + super(list); + } + @Override public void warpTheMap(Map map) { /* @@ -20,15 +23,16 @@ ar.STATUS as status,ar.alarm_type as alarmType, aj.JOB_STATUS as jobStatus,ar.JOB_ID as jobId */ - Map wellInfoMap = new HashMap<>(); - Map userInfoMap = new HashMap<>(); + Map wellInfoMap = new HashMap<>(); + Map userInfoMap = new HashMap<>(); String alarmTypeStr = map.get("alarmType").toString(); String statusStr = map.get("status").toString(); String wellCode = map.get("wellCode").toString(); String alarmContentNameStr = map.get("alarmContentName").toString(); - if (alarmContentNameStr.contains("井盖") || "2".equals(alarmTypeStr)) - { - map.replace("alarmValue","--"); + if (ToolUtil.isEmpty(map.get("handlePerson"))) map.replace("handlePerson", "--"); + if (ToolUtil.isEmpty(map.get("handleTime"))) map.replace("handleTime", "--"); + if (alarmContentNameStr.contains("井盖") || "2".equals(alarmTypeStr)) { + map.replace("alarmValue", "--"); } // String alarmContentStr = map.get("alarmContent").toString(); dictionary version String jobStatusStr = map.get("jobStatus").toString();//if notnull @@ -36,7 +40,7 @@ wellInfoMap = EhcacheConstant.retBean().getWellInfoViaCode(wellCode); String deptidStr = wellInfoMap.get("deptid").toString(); - long deptid = ToolUtil.isEmpty(deptidStr)? -1: Long.valueOf(deptidStr); + long deptid = ToolUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr); String staffStr = (String) wellInfoMap.get("staff"); if (EhcacheConstant.isNumL(staffStr)) { userInfoMap = EhcacheConstant.retBean().getUserInfoById(Long.valueOf(staffStr)); @@ -46,12 +50,12 @@ // wellInfoMap.replace("staff",EhcacheConstant.retBean().getUsernameById(Long.valueOf(staffStr))); // } - map.put("alarmTypeName",EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmTypeStr)); - map.put("deptName",EhcacheConstant.retBean().getDeptNameById(deptid)); - map.put("alarmContent",EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmTypeStr)); + map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid)); + map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // map.put("alarmContentName",EhcacheConstant.retBean().getAlarmContentName(alarmContent));//dictionaryversion - map.put("statusName",EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr,"alarmStatus"));//std dictionary - map.put("jobStatusName",EhcacheConstant.retBean().getJobStatusNameByCodeNum(jobStatusStr)); + map.put("statusName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr, "alarmStatus"));//std dictionary + map.put("jobStatusName", EhcacheConstant.retBean().getJobStatusNameByCodeNum(jobStatusStr)); map.putAll(wellInfoMap); 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 e2fe425..01d1be7 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 @@ -184,7 +184,7 @@ @RequestMapping(value = "/batchCancel") @ResponseBody - public Map batchCancel() { + public Map batchCancel(@RequestParam(value = "handleMessage", required = false) String handleMessage) { Map retMap = new HashMap<>(); if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); @@ -197,7 +197,7 @@ retMap.put("code", 200); retMap.put("message", "success"); - List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId()); + List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId(),handleMessage); if (ToolUtil.isEmpty(devCodes)) { retMap.put("code", 200); retMap.put("message", "failure"); 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 539103b..edccd10 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 @@ -34,7 +34,7 @@ Map countByJobStatus(long deptId,int spanDays); Map countMyJob(long userId,long deptId,int spanDays,String deptIds); - List batchCancel(String ids,long userId); + List batchCancel(String ids,long userId,String handleMessage); // 根据dataScope 查工单列表 List jobListScope( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent,DataScope dataScope); 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 21f0adc..5aa1829 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 @@ -162,9 +162,9 @@ } @Override - public List batchCancel(String deptIds,long userId){ + public List batchCancel(String deptIds,long userId,String handleMessage){ List stringList = this.baseMapper.getDevCodesByDeptIds(deptIds); - boolean bTrue = this.baseMapper.batchCancel(deptIds,userId); + boolean bTrue = this.baseMapper.batchCancel(deptIds,userId,handleMessage); if (bTrue) return stringList; else 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 20af3db..cd2b876 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 @@ -34,7 +34,7 @@ boolean handleJob(@Param("id") int id,@Param("personId") long personId); String getDevCodeByJobId(@Param("id") int id); List getDevCodesByDeptIds(@Param("deptIds") String deptIds); - boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId); + boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId ,@Param("handleMessage") String handleMessage ); /** * 根据工单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 98ac0e0..9762a96 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 @@ -4,29 +4,30 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - ID AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, + ID + AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, WELL_CODE AS wellCode, DEVCODE AS devcode, DATE_FORMAT(CREATE_TIME,'%Y-%m-%d %H:%i:%s') AS createTime, JOB_STATUS AS jobStatus, GET_JOB_PERSON AS getJobPerson, DATE_FORMAT(GET_JOB_TIME,'%Y-%m-%d %H:%i:%s') AS getJobTime, FIRST_STATE AS firstState, @@ -37,7 +38,10 @@ - ar.id AS alarmId, + ar + . + id + AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, ar.ALARM_TYPE AS alarmType, @@ -48,6 +52,7 @@ aj.JOB_STATUS AS jobStatus, aj.JOB_BELONG_TO AS jobBelongTo, aj.GET_JOB_PERSON AS getJobPerson, + aj.HANDLE_MESSAGE AS handleMessage, ar.ALARM_VALUE AS alarmValue, DATE_FORMAT( aj.CREATE_TIME, '%Y-%m-%d %H:%i:%s' ) AS createTime, DATE_FORMAT( ar.ALARM_TIME, '%Y-%m-%d %H:%i:%s' ) AS alarmTime, @@ -66,18 +71,18 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} + ) and ar.alarm_type =1 - + @@ -99,20 +104,20 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.deptid in ( ${deptIds} ) - - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.deptid in ( ${deptIds} ) + + ) and ar.alarm_type =1 - + @@ -128,42 +133,42 @@ SELECT * FROM ( - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.WELL_CODE IN ( - SELECT WELL_CODE - FROM bus_well_info bwi - INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID - INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID - INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) - ) - AND aj.JOB_STATUS = '0' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.WELL_CODE IN ( + SELECT WELL_CODE + FROM bus_well_info bwi + INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID + INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID + INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) + ) + AND aj.JOB_STATUS = '0' + AND ar.ALARM_TYPE = '1' - UNION DISTINCT + UNION DISTINCT - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.HANDLE_JOB_PERSON = #{userId} - AND aj.JOB_STATUS = '3' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.HANDLE_JOB_PERSON = #{userId} + AND aj.JOB_STATUS = '3' + AND ar.ALARM_TYPE = '1' ) uni WHERE 1=1 @@ -378,19 +387,18 @@ - - select devcode from alarm_records where job_id = #{id} limit 1 + select devcode + from alarm_records + where job_id = #{id} limit 1 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 42cf61b..174d9ce 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -7,7 +7,7 @@ wellId AS wellId, deviceId AS deviceId, devcode as devcode, wellCode AS wellCode, alarmId AS alarmId, deptid AS deptid, owner AS owner, alarmType AS alarmType, alarmValue AS alarmValue, alarmContent AS alarmContent, alarmTimeDate AS alarmTimeDate, position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY, - lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode + lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode,wellType AS wellType 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 0c71440..b3cb789 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,103 +4,87 @@ - - - - - - - - - - + + + + + + + + + + - 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 - diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java index 8c09726..7efefff 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java @@ -101,6 +101,12 @@ */ private String owner; + /** + * 井类型 + */ + private String wellType; + + public Long getAlarmId() { return alarmId; @@ -255,6 +261,14 @@ this.owner = owner; } + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + @Override public String toString() { return "AlarmNowView{" + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java index a68232c..989293b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java @@ -72,10 +72,18 @@ */ @TableField("JOB_ID") private Integer jobId; - + @TableField("HANDLE_MESSAGE") + private String handleMessage; @TableField(exist = false) private Integer jobStatus; + @TableField(exist = false) + private String handlePerson; + + @TableField(exist = false) + private Date handleTime; + + public Integer getJobStatus() { @@ -166,6 +174,30 @@ this.jobId = jobId; } + public String getHandlePerson() { + return handlePerson; + } + + public void setHandlePerson(String handlePerson) { + this.handlePerson = handlePerson; + } + + public Date getHandleTime() { + return handleTime; + } + + public void setHandleTime(Date handleTime) { + this.handleTime = handleTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java index 56165b3..75ce2aa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java @@ -10,8 +10,11 @@ //@Service //@Primary public class AlarmRecordWarpper extends BaseControllerWarpper { -// private EhcacheConstant ehcacheConstant = new EhcacheConstant(); - public AlarmRecordWarpper(Object list) { super(list); } + // private EhcacheConstant ehcacheConstant = new EhcacheConstant(); + public AlarmRecordWarpper(Object list) { + super(list); + } + @Override public void warpTheMap(Map map) { /* @@ -20,15 +23,16 @@ ar.STATUS as status,ar.alarm_type as alarmType, aj.JOB_STATUS as jobStatus,ar.JOB_ID as jobId */ - Map wellInfoMap = new HashMap<>(); - Map userInfoMap = new HashMap<>(); + Map wellInfoMap = new HashMap<>(); + Map userInfoMap = new HashMap<>(); String alarmTypeStr = map.get("alarmType").toString(); String statusStr = map.get("status").toString(); String wellCode = map.get("wellCode").toString(); String alarmContentNameStr = map.get("alarmContentName").toString(); - if (alarmContentNameStr.contains("井盖") || "2".equals(alarmTypeStr)) - { - map.replace("alarmValue","--"); + if (ToolUtil.isEmpty(map.get("handlePerson"))) map.replace("handlePerson", "--"); + if (ToolUtil.isEmpty(map.get("handleTime"))) map.replace("handleTime", "--"); + if (alarmContentNameStr.contains("井盖") || "2".equals(alarmTypeStr)) { + map.replace("alarmValue", "--"); } // String alarmContentStr = map.get("alarmContent").toString(); dictionary version String jobStatusStr = map.get("jobStatus").toString();//if notnull @@ -36,7 +40,7 @@ wellInfoMap = EhcacheConstant.retBean().getWellInfoViaCode(wellCode); String deptidStr = wellInfoMap.get("deptid").toString(); - long deptid = ToolUtil.isEmpty(deptidStr)? -1: Long.valueOf(deptidStr); + long deptid = ToolUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr); String staffStr = (String) wellInfoMap.get("staff"); if (EhcacheConstant.isNumL(staffStr)) { userInfoMap = EhcacheConstant.retBean().getUserInfoById(Long.valueOf(staffStr)); @@ -46,12 +50,12 @@ // wellInfoMap.replace("staff",EhcacheConstant.retBean().getUsernameById(Long.valueOf(staffStr))); // } - map.put("alarmTypeName",EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmTypeStr)); - map.put("deptName",EhcacheConstant.retBean().getDeptNameById(deptid)); - map.put("alarmContent",EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmTypeStr)); + map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid)); + map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // map.put("alarmContentName",EhcacheConstant.retBean().getAlarmContentName(alarmContent));//dictionaryversion - map.put("statusName",EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr,"alarmStatus"));//std dictionary - map.put("jobStatusName",EhcacheConstant.retBean().getJobStatusNameByCodeNum(jobStatusStr)); + map.put("statusName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr, "alarmStatus"));//std dictionary + map.put("jobStatusName", EhcacheConstant.retBean().getJobStatusNameByCodeNum(jobStatusStr)); map.putAll(wellInfoMap); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index a801a90..80ee929 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -29,11 +29,15 @@ - ID AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, OWNER AS owner, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID + AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, OWNER AS owner, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept - w.ID AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + w + . + ID + AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName - '%' || #{keywords}|| '%' + '%' || + #{keywords} + || + '%' - CONCAT('%',#{keywords},'%') + CONCAT + ('%', + #{keywords}, + '%' + ) @@ -109,8 +123,11 @@ and notes = #{notes} - and (WELL_CODE like - or POSITION like ) + and (WELL_CODE like + + or POSITION like + + ) @@ -135,8 +152,11 @@ and notes = #{notes} - and (WELL_CODE like - or POSITION like ) + and (WELL_CODE like + + or POSITION like + + ) @@ -149,7 +169,10 @@ - d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type + d + . + ID + AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type @@ -248,11 +269,12 @@ SELECT - - FROM bus_well_info w WHERE 1 = 1 + w.ID AS id, w.WELL_CODE AS wellCode, w.WELL_NAME AS wellName, + w.DEEP AS deep, w.COORDINATE_X AS coordinateX, w.COORDINATE_Y AS coordinateY, + w.LAT_BAIDU AS latBaidu, w.LNG_BAIDU AS lngBaidu, w.LNG_GAODE AS lngGaode, + w.LAT_GAODE AS latGaode, w.AREA AS area, w.POSITION AS position, w.DEPTID AS deptid, + w.OWNER AS owner, w.PHOTOS AS photos, w.NOTES AS notes, w.WELL_TYPE AS wellType, w.STAFF AS staff, + w.TEL AS tel, w.TS AS ts, w.VALID AS valid, w.BFZT AS bfzt, w.RESPONSIBLE_DEPT AS responsibleDept, + IFNULL(b.well_id,'0') AS wellFlag + FROM bus_well_info w + LEFT JOIN (SELECT DISTINCT well_id FROM bus_device_well) b ON w.`ID`=b.well_id + WHERE 1 = 1 AND (w.WELL_CODE LIKE CONCAT('%',#{keywords},'%') OR w.POSITION LIKE CONCAT('%',#{keywords},'%')) 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 e2fe425..01d1be7 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 @@ -184,7 +184,7 @@ @RequestMapping(value = "/batchCancel") @ResponseBody - public Map batchCancel() { + public Map batchCancel(@RequestParam(value = "handleMessage", required = false) String handleMessage) { Map retMap = new HashMap<>(); if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); @@ -197,7 +197,7 @@ retMap.put("code", 200); retMap.put("message", "success"); - List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId()); + List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId(),handleMessage); if (ToolUtil.isEmpty(devCodes)) { retMap.put("code", 200); retMap.put("message", "failure"); 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 539103b..edccd10 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 @@ -34,7 +34,7 @@ Map countByJobStatus(long deptId,int spanDays); Map countMyJob(long userId,long deptId,int spanDays,String deptIds); - List batchCancel(String ids,long userId); + List batchCancel(String ids,long userId,String handleMessage); // 根据dataScope 查工单列表 List jobListScope( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent,DataScope dataScope); 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 21f0adc..5aa1829 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 @@ -162,9 +162,9 @@ } @Override - public List batchCancel(String deptIds,long userId){ + public List batchCancel(String deptIds,long userId,String handleMessage){ List stringList = this.baseMapper.getDevCodesByDeptIds(deptIds); - boolean bTrue = this.baseMapper.batchCancel(deptIds,userId); + boolean bTrue = this.baseMapper.batchCancel(deptIds,userId,handleMessage); if (bTrue) return stringList; else 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 20af3db..cd2b876 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 @@ -34,7 +34,7 @@ boolean handleJob(@Param("id") int id,@Param("personId") long personId); String getDevCodeByJobId(@Param("id") int id); List getDevCodesByDeptIds(@Param("deptIds") String deptIds); - boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId); + boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId ,@Param("handleMessage") String handleMessage ); /** * 根据工单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 98ac0e0..9762a96 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 @@ -4,29 +4,30 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - ID AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, + ID + AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, WELL_CODE AS wellCode, DEVCODE AS devcode, DATE_FORMAT(CREATE_TIME,'%Y-%m-%d %H:%i:%s') AS createTime, JOB_STATUS AS jobStatus, GET_JOB_PERSON AS getJobPerson, DATE_FORMAT(GET_JOB_TIME,'%Y-%m-%d %H:%i:%s') AS getJobTime, FIRST_STATE AS firstState, @@ -37,7 +38,10 @@ - ar.id AS alarmId, + ar + . + id + AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, ar.ALARM_TYPE AS alarmType, @@ -48,6 +52,7 @@ aj.JOB_STATUS AS jobStatus, aj.JOB_BELONG_TO AS jobBelongTo, aj.GET_JOB_PERSON AS getJobPerson, + aj.HANDLE_MESSAGE AS handleMessage, ar.ALARM_VALUE AS alarmValue, DATE_FORMAT( aj.CREATE_TIME, '%Y-%m-%d %H:%i:%s' ) AS createTime, DATE_FORMAT( ar.ALARM_TIME, '%Y-%m-%d %H:%i:%s' ) AS alarmTime, @@ -66,18 +71,18 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} + ) and ar.alarm_type =1 - + @@ -99,20 +104,20 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.deptid in ( ${deptIds} ) - - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.deptid in ( ${deptIds} ) + + ) and ar.alarm_type =1 - + @@ -128,42 +133,42 @@ SELECT * FROM ( - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.WELL_CODE IN ( - SELECT WELL_CODE - FROM bus_well_info bwi - INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID - INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID - INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) - ) - AND aj.JOB_STATUS = '0' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.WELL_CODE IN ( + SELECT WELL_CODE + FROM bus_well_info bwi + INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID + INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID + INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) + ) + AND aj.JOB_STATUS = '0' + AND ar.ALARM_TYPE = '1' - UNION DISTINCT + UNION DISTINCT - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.HANDLE_JOB_PERSON = #{userId} - AND aj.JOB_STATUS = '3' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.HANDLE_JOB_PERSON = #{userId} + AND aj.JOB_STATUS = '3' + AND ar.ALARM_TYPE = '1' ) uni WHERE 1=1 @@ -378,19 +387,18 @@ - - select devcode from alarm_records where job_id = #{id} limit 1 + select devcode + from alarm_records + where job_id = #{id} limit 1 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 42cf61b..174d9ce 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -7,7 +7,7 @@ wellId AS wellId, deviceId AS deviceId, devcode as devcode, wellCode AS wellCode, alarmId AS alarmId, deptid AS deptid, owner AS owner, alarmType AS alarmType, alarmValue AS alarmValue, alarmContent AS alarmContent, alarmTimeDate AS alarmTimeDate, position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY, - lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode + lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode,wellType AS wellType 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 0c71440..b3cb789 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,103 +4,87 @@ - - - - - - - - - - + + + + + + + + + + - 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 - diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java index 8c09726..7efefff 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java @@ -101,6 +101,12 @@ */ private String owner; + /** + * 井类型 + */ + private String wellType; + + public Long getAlarmId() { return alarmId; @@ -255,6 +261,14 @@ this.owner = owner; } + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + @Override public String toString() { return "AlarmNowView{" + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java index a68232c..989293b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java @@ -72,10 +72,18 @@ */ @TableField("JOB_ID") private Integer jobId; - + @TableField("HANDLE_MESSAGE") + private String handleMessage; @TableField(exist = false) private Integer jobStatus; + @TableField(exist = false) + private String handlePerson; + + @TableField(exist = false) + private Date handleTime; + + public Integer getJobStatus() { @@ -166,6 +174,30 @@ this.jobId = jobId; } + public String getHandlePerson() { + return handlePerson; + } + + public void setHandlePerson(String handlePerson) { + this.handlePerson = handlePerson; + } + + public Date getHandleTime() { + return handleTime; + } + + public void setHandleTime(Date handleTime) { + this.handleTime = handleTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java index 56165b3..75ce2aa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java @@ -10,8 +10,11 @@ //@Service //@Primary public class AlarmRecordWarpper extends BaseControllerWarpper { -// private EhcacheConstant ehcacheConstant = new EhcacheConstant(); - public AlarmRecordWarpper(Object list) { super(list); } + // private EhcacheConstant ehcacheConstant = new EhcacheConstant(); + public AlarmRecordWarpper(Object list) { + super(list); + } + @Override public void warpTheMap(Map map) { /* @@ -20,15 +23,16 @@ ar.STATUS as status,ar.alarm_type as alarmType, aj.JOB_STATUS as jobStatus,ar.JOB_ID as jobId */ - Map wellInfoMap = new HashMap<>(); - Map userInfoMap = new HashMap<>(); + Map wellInfoMap = new HashMap<>(); + Map userInfoMap = new HashMap<>(); String alarmTypeStr = map.get("alarmType").toString(); String statusStr = map.get("status").toString(); String wellCode = map.get("wellCode").toString(); String alarmContentNameStr = map.get("alarmContentName").toString(); - if (alarmContentNameStr.contains("井盖") || "2".equals(alarmTypeStr)) - { - map.replace("alarmValue","--"); + if (ToolUtil.isEmpty(map.get("handlePerson"))) map.replace("handlePerson", "--"); + if (ToolUtil.isEmpty(map.get("handleTime"))) map.replace("handleTime", "--"); + if (alarmContentNameStr.contains("井盖") || "2".equals(alarmTypeStr)) { + map.replace("alarmValue", "--"); } // String alarmContentStr = map.get("alarmContent").toString(); dictionary version String jobStatusStr = map.get("jobStatus").toString();//if notnull @@ -36,7 +40,7 @@ wellInfoMap = EhcacheConstant.retBean().getWellInfoViaCode(wellCode); String deptidStr = wellInfoMap.get("deptid").toString(); - long deptid = ToolUtil.isEmpty(deptidStr)? -1: Long.valueOf(deptidStr); + long deptid = ToolUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr); String staffStr = (String) wellInfoMap.get("staff"); if (EhcacheConstant.isNumL(staffStr)) { userInfoMap = EhcacheConstant.retBean().getUserInfoById(Long.valueOf(staffStr)); @@ -46,12 +50,12 @@ // wellInfoMap.replace("staff",EhcacheConstant.retBean().getUsernameById(Long.valueOf(staffStr))); // } - map.put("alarmTypeName",EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmTypeStr)); - map.put("deptName",EhcacheConstant.retBean().getDeptNameById(deptid)); - map.put("alarmContent",EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmTypeStr)); + map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid)); + map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // map.put("alarmContentName",EhcacheConstant.retBean().getAlarmContentName(alarmContent));//dictionaryversion - map.put("statusName",EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr,"alarmStatus"));//std dictionary - map.put("jobStatusName",EhcacheConstant.retBean().getJobStatusNameByCodeNum(jobStatusStr)); + map.put("statusName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr, "alarmStatus"));//std dictionary + map.put("jobStatusName", EhcacheConstant.retBean().getJobStatusNameByCodeNum(jobStatusStr)); map.putAll(wellInfoMap); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index a801a90..80ee929 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -29,11 +29,15 @@ - ID AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, OWNER AS owner, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID + AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, OWNER AS owner, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept - w.ID AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + w + . + ID + AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName - '%' || #{keywords}|| '%' + '%' || + #{keywords} + || + '%' - CONCAT('%',#{keywords},'%') + CONCAT + ('%', + #{keywords}, + '%' + ) @@ -109,8 +123,11 @@ and notes = #{notes} - and (WELL_CODE like - or POSITION like ) + and (WELL_CODE like + + or POSITION like + + ) @@ -135,8 +152,11 @@ and notes = #{notes} - and (WELL_CODE like - or POSITION like ) + and (WELL_CODE like + + or POSITION like + + ) @@ -149,7 +169,10 @@ - d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type + d + . + ID + AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type @@ -248,11 +269,12 @@ SELECT - - FROM bus_well_info w WHERE 1 = 1 + w.ID AS id, w.WELL_CODE AS wellCode, w.WELL_NAME AS wellName, + w.DEEP AS deep, w.COORDINATE_X AS coordinateX, w.COORDINATE_Y AS coordinateY, + w.LAT_BAIDU AS latBaidu, w.LNG_BAIDU AS lngBaidu, w.LNG_GAODE AS lngGaode, + w.LAT_GAODE AS latGaode, w.AREA AS area, w.POSITION AS position, w.DEPTID AS deptid, + w.OWNER AS owner, w.PHOTOS AS photos, w.NOTES AS notes, w.WELL_TYPE AS wellType, w.STAFF AS staff, + w.TEL AS tel, w.TS AS ts, w.VALID AS valid, w.BFZT AS bfzt, w.RESPONSIBLE_DEPT AS responsibleDept, + IFNULL(b.well_id,'0') AS wellFlag + FROM bus_well_info w + LEFT JOIN (SELECT DISTINCT well_id FROM bus_device_well) b ON w.`ID`=b.well_id + WHERE 1 = 1 AND (w.WELL_CODE LIKE CONCAT('%',#{keywords},'%') OR w.POSITION LIKE CONCAT('%',#{keywords},'%')) diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java index 2ffe860..2910eef 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java @@ -34,6 +34,7 @@ private String tel; private String valid; private String ts; + private String wellFlag; private List watchData; Map map = new HashMap(); @@ -263,6 +264,15 @@ map.put("ts", ts); } + public String getWellFlag() { + return wellFlag; + } + + public void setWellFlag(String wellFlag) { + this.wellFlag = wellFlag; + map.put("wellFlag", wellFlag); + } + public List getWatchData() { return watchData; } @@ -293,6 +303,7 @@ this.setPosition(busWellInfo.getPosition()); this.setStaff(busWellInfo.getStaff()); this.setTel(busWellInfo.getTel()); + this.setWellFlag(busWellInfo.getWellFlag()); if (null != busWellInfo.getTs()) { DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); this.setTs(fmt.print(busWellInfo.getTs().getTime())); 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 e2fe425..01d1be7 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 @@ -184,7 +184,7 @@ @RequestMapping(value = "/batchCancel") @ResponseBody - public Map batchCancel() { + public Map batchCancel(@RequestParam(value = "handleMessage", required = false) String handleMessage) { Map retMap = new HashMap<>(); if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); @@ -197,7 +197,7 @@ retMap.put("code", 200); retMap.put("message", "success"); - List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId()); + List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId(),handleMessage); if (ToolUtil.isEmpty(devCodes)) { retMap.put("code", 200); retMap.put("message", "failure"); 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 539103b..edccd10 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 @@ -34,7 +34,7 @@ Map countByJobStatus(long deptId,int spanDays); Map countMyJob(long userId,long deptId,int spanDays,String deptIds); - List batchCancel(String ids,long userId); + List batchCancel(String ids,long userId,String handleMessage); // 根据dataScope 查工单列表 List jobListScope( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent,DataScope dataScope); 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 21f0adc..5aa1829 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 @@ -162,9 +162,9 @@ } @Override - public List batchCancel(String deptIds,long userId){ + public List batchCancel(String deptIds,long userId,String handleMessage){ List stringList = this.baseMapper.getDevCodesByDeptIds(deptIds); - boolean bTrue = this.baseMapper.batchCancel(deptIds,userId); + boolean bTrue = this.baseMapper.batchCancel(deptIds,userId,handleMessage); if (bTrue) return stringList; else 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 20af3db..cd2b876 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 @@ -34,7 +34,7 @@ boolean handleJob(@Param("id") int id,@Param("personId") long personId); String getDevCodeByJobId(@Param("id") int id); List getDevCodesByDeptIds(@Param("deptIds") String deptIds); - boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId); + boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId ,@Param("handleMessage") String handleMessage ); /** * 根据工单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 98ac0e0..9762a96 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 @@ -4,29 +4,30 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - ID AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, + ID + AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, WELL_CODE AS wellCode, DEVCODE AS devcode, DATE_FORMAT(CREATE_TIME,'%Y-%m-%d %H:%i:%s') AS createTime, JOB_STATUS AS jobStatus, GET_JOB_PERSON AS getJobPerson, DATE_FORMAT(GET_JOB_TIME,'%Y-%m-%d %H:%i:%s') AS getJobTime, FIRST_STATE AS firstState, @@ -37,7 +38,10 @@ - ar.id AS alarmId, + ar + . + id + AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, ar.ALARM_TYPE AS alarmType, @@ -48,6 +52,7 @@ aj.JOB_STATUS AS jobStatus, aj.JOB_BELONG_TO AS jobBelongTo, aj.GET_JOB_PERSON AS getJobPerson, + aj.HANDLE_MESSAGE AS handleMessage, ar.ALARM_VALUE AS alarmValue, DATE_FORMAT( aj.CREATE_TIME, '%Y-%m-%d %H:%i:%s' ) AS createTime, DATE_FORMAT( ar.ALARM_TIME, '%Y-%m-%d %H:%i:%s' ) AS alarmTime, @@ -66,18 +71,18 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} + ) and ar.alarm_type =1 - + @@ -99,20 +104,20 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.deptid in ( ${deptIds} ) - - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.deptid in ( ${deptIds} ) + + ) and ar.alarm_type =1 - + @@ -128,42 +133,42 @@ SELECT * FROM ( - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.WELL_CODE IN ( - SELECT WELL_CODE - FROM bus_well_info bwi - INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID - INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID - INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) - ) - AND aj.JOB_STATUS = '0' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.WELL_CODE IN ( + SELECT WELL_CODE + FROM bus_well_info bwi + INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID + INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID + INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) + ) + AND aj.JOB_STATUS = '0' + AND ar.ALARM_TYPE = '1' - UNION DISTINCT + UNION DISTINCT - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.HANDLE_JOB_PERSON = #{userId} - AND aj.JOB_STATUS = '3' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.HANDLE_JOB_PERSON = #{userId} + AND aj.JOB_STATUS = '3' + AND ar.ALARM_TYPE = '1' ) uni WHERE 1=1 @@ -378,19 +387,18 @@ - - select devcode from alarm_records where job_id = #{id} limit 1 + select devcode + from alarm_records + where job_id = #{id} limit 1 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 42cf61b..174d9ce 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -7,7 +7,7 @@ wellId AS wellId, deviceId AS deviceId, devcode as devcode, wellCode AS wellCode, alarmId AS alarmId, deptid AS deptid, owner AS owner, alarmType AS alarmType, alarmValue AS alarmValue, alarmContent AS alarmContent, alarmTimeDate AS alarmTimeDate, position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY, - lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode + lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode,wellType AS wellType 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 0c71440..b3cb789 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,103 +4,87 @@ - - - - - - - - - - + + + + + + + + + + - 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 - diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java index 8c09726..7efefff 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java @@ -101,6 +101,12 @@ */ private String owner; + /** + * 井类型 + */ + private String wellType; + + public Long getAlarmId() { return alarmId; @@ -255,6 +261,14 @@ this.owner = owner; } + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + @Override public String toString() { return "AlarmNowView{" + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java index a68232c..989293b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java @@ -72,10 +72,18 @@ */ @TableField("JOB_ID") private Integer jobId; - + @TableField("HANDLE_MESSAGE") + private String handleMessage; @TableField(exist = false) private Integer jobStatus; + @TableField(exist = false) + private String handlePerson; + + @TableField(exist = false) + private Date handleTime; + + public Integer getJobStatus() { @@ -166,6 +174,30 @@ this.jobId = jobId; } + public String getHandlePerson() { + return handlePerson; + } + + public void setHandlePerson(String handlePerson) { + this.handlePerson = handlePerson; + } + + public Date getHandleTime() { + return handleTime; + } + + public void setHandleTime(Date handleTime) { + this.handleTime = handleTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java index 56165b3..75ce2aa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java @@ -10,8 +10,11 @@ //@Service //@Primary public class AlarmRecordWarpper extends BaseControllerWarpper { -// private EhcacheConstant ehcacheConstant = new EhcacheConstant(); - public AlarmRecordWarpper(Object list) { super(list); } + // private EhcacheConstant ehcacheConstant = new EhcacheConstant(); + public AlarmRecordWarpper(Object list) { + super(list); + } + @Override public void warpTheMap(Map map) { /* @@ -20,15 +23,16 @@ ar.STATUS as status,ar.alarm_type as alarmType, aj.JOB_STATUS as jobStatus,ar.JOB_ID as jobId */ - Map wellInfoMap = new HashMap<>(); - Map userInfoMap = new HashMap<>(); + Map wellInfoMap = new HashMap<>(); + Map userInfoMap = new HashMap<>(); String alarmTypeStr = map.get("alarmType").toString(); String statusStr = map.get("status").toString(); String wellCode = map.get("wellCode").toString(); String alarmContentNameStr = map.get("alarmContentName").toString(); - if (alarmContentNameStr.contains("井盖") || "2".equals(alarmTypeStr)) - { - map.replace("alarmValue","--"); + if (ToolUtil.isEmpty(map.get("handlePerson"))) map.replace("handlePerson", "--"); + if (ToolUtil.isEmpty(map.get("handleTime"))) map.replace("handleTime", "--"); + if (alarmContentNameStr.contains("井盖") || "2".equals(alarmTypeStr)) { + map.replace("alarmValue", "--"); } // String alarmContentStr = map.get("alarmContent").toString(); dictionary version String jobStatusStr = map.get("jobStatus").toString();//if notnull @@ -36,7 +40,7 @@ wellInfoMap = EhcacheConstant.retBean().getWellInfoViaCode(wellCode); String deptidStr = wellInfoMap.get("deptid").toString(); - long deptid = ToolUtil.isEmpty(deptidStr)? -1: Long.valueOf(deptidStr); + long deptid = ToolUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr); String staffStr = (String) wellInfoMap.get("staff"); if (EhcacheConstant.isNumL(staffStr)) { userInfoMap = EhcacheConstant.retBean().getUserInfoById(Long.valueOf(staffStr)); @@ -46,12 +50,12 @@ // wellInfoMap.replace("staff",EhcacheConstant.retBean().getUsernameById(Long.valueOf(staffStr))); // } - map.put("alarmTypeName",EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmTypeStr)); - map.put("deptName",EhcacheConstant.retBean().getDeptNameById(deptid)); - map.put("alarmContent",EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmTypeStr)); + map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid)); + map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // map.put("alarmContentName",EhcacheConstant.retBean().getAlarmContentName(alarmContent));//dictionaryversion - map.put("statusName",EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr,"alarmStatus"));//std dictionary - map.put("jobStatusName",EhcacheConstant.retBean().getJobStatusNameByCodeNum(jobStatusStr)); + map.put("statusName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr, "alarmStatus"));//std dictionary + map.put("jobStatusName", EhcacheConstant.retBean().getJobStatusNameByCodeNum(jobStatusStr)); map.putAll(wellInfoMap); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index a801a90..80ee929 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -29,11 +29,15 @@ - ID AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, OWNER AS owner, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID + AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, OWNER AS owner, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept - w.ID AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + w + . + ID + AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName - '%' || #{keywords}|| '%' + '%' || + #{keywords} + || + '%' - CONCAT('%',#{keywords},'%') + CONCAT + ('%', + #{keywords}, + '%' + ) @@ -109,8 +123,11 @@ and notes = #{notes} - and (WELL_CODE like - or POSITION like ) + and (WELL_CODE like + + or POSITION like + + ) @@ -135,8 +152,11 @@ and notes = #{notes} - and (WELL_CODE like - or POSITION like ) + and (WELL_CODE like + + or POSITION like + + ) @@ -149,7 +169,10 @@ - d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type + d + . + ID + AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type @@ -248,11 +269,12 @@ SELECT - - FROM bus_well_info w WHERE 1 = 1 + w.ID AS id, w.WELL_CODE AS wellCode, w.WELL_NAME AS wellName, + w.DEEP AS deep, w.COORDINATE_X AS coordinateX, w.COORDINATE_Y AS coordinateY, + w.LAT_BAIDU AS latBaidu, w.LNG_BAIDU AS lngBaidu, w.LNG_GAODE AS lngGaode, + w.LAT_GAODE AS latGaode, w.AREA AS area, w.POSITION AS position, w.DEPTID AS deptid, + w.OWNER AS owner, w.PHOTOS AS photos, w.NOTES AS notes, w.WELL_TYPE AS wellType, w.STAFF AS staff, + w.TEL AS tel, w.TS AS ts, w.VALID AS valid, w.BFZT AS bfzt, w.RESPONSIBLE_DEPT AS responsibleDept, + IFNULL(b.well_id,'0') AS wellFlag + FROM bus_well_info w + LEFT JOIN (SELECT DISTINCT well_id FROM bus_device_well) b ON w.`ID`=b.well_id + WHERE 1 = 1 AND (w.WELL_CODE LIKE CONCAT('%',#{keywords},'%') OR w.POSITION LIKE CONCAT('%',#{keywords},'%')) diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java index 2ffe860..2910eef 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java @@ -34,6 +34,7 @@ private String tel; private String valid; private String ts; + private String wellFlag; private List watchData; Map map = new HashMap(); @@ -263,6 +264,15 @@ map.put("ts", ts); } + public String getWellFlag() { + return wellFlag; + } + + public void setWellFlag(String wellFlag) { + this.wellFlag = wellFlag; + map.put("wellFlag", wellFlag); + } + public List getWatchData() { return watchData; } @@ -293,6 +303,7 @@ this.setPosition(busWellInfo.getPosition()); this.setStaff(busWellInfo.getStaff()); this.setTel(busWellInfo.getTel()); + this.setWellFlag(busWellInfo.getWellFlag()); if (null != busWellInfo.getTs()) { DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); this.setTs(fmt.print(busWellInfo.getTs().getTime())); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index 279b74b..4507dd0 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -195,6 +195,12 @@ @TableField(exist = false) private Integer deviceCount; + /** + * 是否关联设备 + */ + @TableField(exist = false) + private String wellFlag; + @Override protected Serializable pkVal() { return this.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 e2fe425..01d1be7 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 @@ -184,7 +184,7 @@ @RequestMapping(value = "/batchCancel") @ResponseBody - public Map batchCancel() { + public Map batchCancel(@RequestParam(value = "handleMessage", required = false) String handleMessage) { Map retMap = new HashMap<>(); if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); @@ -197,7 +197,7 @@ retMap.put("code", 200); retMap.put("message", "success"); - List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId()); + List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId(),handleMessage); if (ToolUtil.isEmpty(devCodes)) { retMap.put("code", 200); retMap.put("message", "failure"); 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 539103b..edccd10 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 @@ -34,7 +34,7 @@ Map countByJobStatus(long deptId,int spanDays); Map countMyJob(long userId,long deptId,int spanDays,String deptIds); - List batchCancel(String ids,long userId); + List batchCancel(String ids,long userId,String handleMessage); // 根据dataScope 查工单列表 List jobListScope( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent,DataScope dataScope); 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 21f0adc..5aa1829 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 @@ -162,9 +162,9 @@ } @Override - public List batchCancel(String deptIds,long userId){ + public List batchCancel(String deptIds,long userId,String handleMessage){ List stringList = this.baseMapper.getDevCodesByDeptIds(deptIds); - boolean bTrue = this.baseMapper.batchCancel(deptIds,userId); + boolean bTrue = this.baseMapper.batchCancel(deptIds,userId,handleMessage); if (bTrue) return stringList; else 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 20af3db..cd2b876 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 @@ -34,7 +34,7 @@ boolean handleJob(@Param("id") int id,@Param("personId") long personId); String getDevCodeByJobId(@Param("id") int id); List getDevCodesByDeptIds(@Param("deptIds") String deptIds); - boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId); + boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId ,@Param("handleMessage") String handleMessage ); /** * 根据工单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 98ac0e0..9762a96 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 @@ -4,29 +4,30 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - ID AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, + ID + AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, WELL_CODE AS wellCode, DEVCODE AS devcode, DATE_FORMAT(CREATE_TIME,'%Y-%m-%d %H:%i:%s') AS createTime, JOB_STATUS AS jobStatus, GET_JOB_PERSON AS getJobPerson, DATE_FORMAT(GET_JOB_TIME,'%Y-%m-%d %H:%i:%s') AS getJobTime, FIRST_STATE AS firstState, @@ -37,7 +38,10 @@ - ar.id AS alarmId, + ar + . + id + AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, ar.ALARM_TYPE AS alarmType, @@ -48,6 +52,7 @@ aj.JOB_STATUS AS jobStatus, aj.JOB_BELONG_TO AS jobBelongTo, aj.GET_JOB_PERSON AS getJobPerson, + aj.HANDLE_MESSAGE AS handleMessage, ar.ALARM_VALUE AS alarmValue, DATE_FORMAT( aj.CREATE_TIME, '%Y-%m-%d %H:%i:%s' ) AS createTime, DATE_FORMAT( ar.ALARM_TIME, '%Y-%m-%d %H:%i:%s' ) AS alarmTime, @@ -66,18 +71,18 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} + ) and ar.alarm_type =1 - + @@ -99,20 +104,20 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.deptid in ( ${deptIds} ) - - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.deptid in ( ${deptIds} ) + + ) and ar.alarm_type =1 - + @@ -128,42 +133,42 @@ SELECT * FROM ( - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.WELL_CODE IN ( - SELECT WELL_CODE - FROM bus_well_info bwi - INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID - INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID - INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) - ) - AND aj.JOB_STATUS = '0' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.WELL_CODE IN ( + SELECT WELL_CODE + FROM bus_well_info bwi + INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID + INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID + INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) + ) + AND aj.JOB_STATUS = '0' + AND ar.ALARM_TYPE = '1' - UNION DISTINCT + UNION DISTINCT - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.HANDLE_JOB_PERSON = #{userId} - AND aj.JOB_STATUS = '3' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.HANDLE_JOB_PERSON = #{userId} + AND aj.JOB_STATUS = '3' + AND ar.ALARM_TYPE = '1' ) uni WHERE 1=1 @@ -378,19 +387,18 @@ - - select devcode from alarm_records where job_id = #{id} limit 1 + select devcode + from alarm_records + where job_id = #{id} limit 1 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 42cf61b..174d9ce 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -7,7 +7,7 @@ wellId AS wellId, deviceId AS deviceId, devcode as devcode, wellCode AS wellCode, alarmId AS alarmId, deptid AS deptid, owner AS owner, alarmType AS alarmType, alarmValue AS alarmValue, alarmContent AS alarmContent, alarmTimeDate AS alarmTimeDate, position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY, - lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode + lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode,wellType AS wellType 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 0c71440..b3cb789 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,103 +4,87 @@ - - - - - - - - - - + + + + + + + + + + - 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 - diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java index 8c09726..7efefff 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java @@ -101,6 +101,12 @@ */ private String owner; + /** + * 井类型 + */ + private String wellType; + + public Long getAlarmId() { return alarmId; @@ -255,6 +261,14 @@ this.owner = owner; } + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + @Override public String toString() { return "AlarmNowView{" + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java index a68232c..989293b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java @@ -72,10 +72,18 @@ */ @TableField("JOB_ID") private Integer jobId; - + @TableField("HANDLE_MESSAGE") + private String handleMessage; @TableField(exist = false) private Integer jobStatus; + @TableField(exist = false) + private String handlePerson; + + @TableField(exist = false) + private Date handleTime; + + public Integer getJobStatus() { @@ -166,6 +174,30 @@ this.jobId = jobId; } + public String getHandlePerson() { + return handlePerson; + } + + public void setHandlePerson(String handlePerson) { + this.handlePerson = handlePerson; + } + + public Date getHandleTime() { + return handleTime; + } + + public void setHandleTime(Date handleTime) { + this.handleTime = handleTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java index 56165b3..75ce2aa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java @@ -10,8 +10,11 @@ //@Service //@Primary public class AlarmRecordWarpper extends BaseControllerWarpper { -// private EhcacheConstant ehcacheConstant = new EhcacheConstant(); - public AlarmRecordWarpper(Object list) { super(list); } + // private EhcacheConstant ehcacheConstant = new EhcacheConstant(); + public AlarmRecordWarpper(Object list) { + super(list); + } + @Override public void warpTheMap(Map map) { /* @@ -20,15 +23,16 @@ ar.STATUS as status,ar.alarm_type as alarmType, aj.JOB_STATUS as jobStatus,ar.JOB_ID as jobId */ - Map wellInfoMap = new HashMap<>(); - Map userInfoMap = new HashMap<>(); + Map wellInfoMap = new HashMap<>(); + Map userInfoMap = new HashMap<>(); String alarmTypeStr = map.get("alarmType").toString(); String statusStr = map.get("status").toString(); String wellCode = map.get("wellCode").toString(); String alarmContentNameStr = map.get("alarmContentName").toString(); - if (alarmContentNameStr.contains("井盖") || "2".equals(alarmTypeStr)) - { - map.replace("alarmValue","--"); + if (ToolUtil.isEmpty(map.get("handlePerson"))) map.replace("handlePerson", "--"); + if (ToolUtil.isEmpty(map.get("handleTime"))) map.replace("handleTime", "--"); + if (alarmContentNameStr.contains("井盖") || "2".equals(alarmTypeStr)) { + map.replace("alarmValue", "--"); } // String alarmContentStr = map.get("alarmContent").toString(); dictionary version String jobStatusStr = map.get("jobStatus").toString();//if notnull @@ -36,7 +40,7 @@ wellInfoMap = EhcacheConstant.retBean().getWellInfoViaCode(wellCode); String deptidStr = wellInfoMap.get("deptid").toString(); - long deptid = ToolUtil.isEmpty(deptidStr)? -1: Long.valueOf(deptidStr); + long deptid = ToolUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr); String staffStr = (String) wellInfoMap.get("staff"); if (EhcacheConstant.isNumL(staffStr)) { userInfoMap = EhcacheConstant.retBean().getUserInfoById(Long.valueOf(staffStr)); @@ -46,12 +50,12 @@ // wellInfoMap.replace("staff",EhcacheConstant.retBean().getUsernameById(Long.valueOf(staffStr))); // } - map.put("alarmTypeName",EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmTypeStr)); - map.put("deptName",EhcacheConstant.retBean().getDeptNameById(deptid)); - map.put("alarmContent",EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmTypeStr)); + map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid)); + map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // map.put("alarmContentName",EhcacheConstant.retBean().getAlarmContentName(alarmContent));//dictionaryversion - map.put("statusName",EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr,"alarmStatus"));//std dictionary - map.put("jobStatusName",EhcacheConstant.retBean().getJobStatusNameByCodeNum(jobStatusStr)); + map.put("statusName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr, "alarmStatus"));//std dictionary + map.put("jobStatusName", EhcacheConstant.retBean().getJobStatusNameByCodeNum(jobStatusStr)); map.putAll(wellInfoMap); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index a801a90..80ee929 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -29,11 +29,15 @@ - ID AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, OWNER AS owner, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID + AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, OWNER AS owner, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept - w.ID AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + w + . + ID + AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName - '%' || #{keywords}|| '%' + '%' || + #{keywords} + || + '%' - CONCAT('%',#{keywords},'%') + CONCAT + ('%', + #{keywords}, + '%' + ) @@ -109,8 +123,11 @@ and notes = #{notes} - and (WELL_CODE like - or POSITION like ) + and (WELL_CODE like + + or POSITION like + + ) @@ -135,8 +152,11 @@ and notes = #{notes} - and (WELL_CODE like - or POSITION like ) + and (WELL_CODE like + + or POSITION like + + ) @@ -149,7 +169,10 @@ - d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type + d + . + ID + AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type @@ -248,11 +269,12 @@ SELECT - - FROM bus_well_info w WHERE 1 = 1 + w.ID AS id, w.WELL_CODE AS wellCode, w.WELL_NAME AS wellName, + w.DEEP AS deep, w.COORDINATE_X AS coordinateX, w.COORDINATE_Y AS coordinateY, + w.LAT_BAIDU AS latBaidu, w.LNG_BAIDU AS lngBaidu, w.LNG_GAODE AS lngGaode, + w.LAT_GAODE AS latGaode, w.AREA AS area, w.POSITION AS position, w.DEPTID AS deptid, + w.OWNER AS owner, w.PHOTOS AS photos, w.NOTES AS notes, w.WELL_TYPE AS wellType, w.STAFF AS staff, + w.TEL AS tel, w.TS AS ts, w.VALID AS valid, w.BFZT AS bfzt, w.RESPONSIBLE_DEPT AS responsibleDept, + IFNULL(b.well_id,'0') AS wellFlag + FROM bus_well_info w + LEFT JOIN (SELECT DISTINCT well_id FROM bus_device_well) b ON w.`ID`=b.well_id + WHERE 1 = 1 AND (w.WELL_CODE LIKE CONCAT('%',#{keywords},'%') OR w.POSITION LIKE CONCAT('%',#{keywords},'%')) diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java index 2ffe860..2910eef 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java @@ -34,6 +34,7 @@ private String tel; private String valid; private String ts; + private String wellFlag; private List watchData; Map map = new HashMap(); @@ -263,6 +264,15 @@ map.put("ts", ts); } + public String getWellFlag() { + return wellFlag; + } + + public void setWellFlag(String wellFlag) { + this.wellFlag = wellFlag; + map.put("wellFlag", wellFlag); + } + public List getWatchData() { return watchData; } @@ -293,6 +303,7 @@ this.setPosition(busWellInfo.getPosition()); this.setStaff(busWellInfo.getStaff()); this.setTel(busWellInfo.getTel()); + this.setWellFlag(busWellInfo.getWellFlag()); if (null != busWellInfo.getTs()) { DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); this.setTs(fmt.print(busWellInfo.getTs().getTime())); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index 279b74b..4507dd0 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -195,6 +195,12 @@ @TableField(exist = false) private Integer deviceCount; + /** + * 是否关联设备 + */ + @TableField(exist = false) + private String wellFlag; + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java index 7f8fb6c..5e13076 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java @@ -249,7 +249,9 @@ @Override public List getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) { - return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid); + List busWellInfos= this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid); + + return busWellInfos; } @Override 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 e2fe425..01d1be7 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 @@ -184,7 +184,7 @@ @RequestMapping(value = "/batchCancel") @ResponseBody - public Map batchCancel() { + public Map batchCancel(@RequestParam(value = "handleMessage", required = false) String handleMessage) { Map retMap = new HashMap<>(); if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); @@ -197,7 +197,7 @@ retMap.put("code", 200); retMap.put("message", "success"); - List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId()); + List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId(),handleMessage); if (ToolUtil.isEmpty(devCodes)) { retMap.put("code", 200); retMap.put("message", "failure"); 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 539103b..edccd10 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 @@ -34,7 +34,7 @@ Map countByJobStatus(long deptId,int spanDays); Map countMyJob(long userId,long deptId,int spanDays,String deptIds); - List batchCancel(String ids,long userId); + List batchCancel(String ids,long userId,String handleMessage); // 根据dataScope 查工单列表 List jobListScope( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent,DataScope dataScope); 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 21f0adc..5aa1829 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 @@ -162,9 +162,9 @@ } @Override - public List batchCancel(String deptIds,long userId){ + public List batchCancel(String deptIds,long userId,String handleMessage){ List stringList = this.baseMapper.getDevCodesByDeptIds(deptIds); - boolean bTrue = this.baseMapper.batchCancel(deptIds,userId); + boolean bTrue = this.baseMapper.batchCancel(deptIds,userId,handleMessage); if (bTrue) return stringList; else 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 20af3db..cd2b876 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 @@ -34,7 +34,7 @@ boolean handleJob(@Param("id") int id,@Param("personId") long personId); String getDevCodeByJobId(@Param("id") int id); List getDevCodesByDeptIds(@Param("deptIds") String deptIds); - boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId); + boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId ,@Param("handleMessage") String handleMessage ); /** * 根据工单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 98ac0e0..9762a96 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 @@ -4,29 +4,30 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - ID AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, + ID + AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, WELL_CODE AS wellCode, DEVCODE AS devcode, DATE_FORMAT(CREATE_TIME,'%Y-%m-%d %H:%i:%s') AS createTime, JOB_STATUS AS jobStatus, GET_JOB_PERSON AS getJobPerson, DATE_FORMAT(GET_JOB_TIME,'%Y-%m-%d %H:%i:%s') AS getJobTime, FIRST_STATE AS firstState, @@ -37,7 +38,10 @@ - ar.id AS alarmId, + ar + . + id + AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, ar.ALARM_TYPE AS alarmType, @@ -48,6 +52,7 @@ aj.JOB_STATUS AS jobStatus, aj.JOB_BELONG_TO AS jobBelongTo, aj.GET_JOB_PERSON AS getJobPerson, + aj.HANDLE_MESSAGE AS handleMessage, ar.ALARM_VALUE AS alarmValue, DATE_FORMAT( aj.CREATE_TIME, '%Y-%m-%d %H:%i:%s' ) AS createTime, DATE_FORMAT( ar.ALARM_TIME, '%Y-%m-%d %H:%i:%s' ) AS alarmTime, @@ -66,18 +71,18 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} + ) and ar.alarm_type =1 - + @@ -99,20 +104,20 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.deptid in ( ${deptIds} ) - - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.deptid in ( ${deptIds} ) + + ) and ar.alarm_type =1 - + @@ -128,42 +133,42 @@ SELECT * FROM ( - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.WELL_CODE IN ( - SELECT WELL_CODE - FROM bus_well_info bwi - INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID - INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID - INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) - ) - AND aj.JOB_STATUS = '0' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.WELL_CODE IN ( + SELECT WELL_CODE + FROM bus_well_info bwi + INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID + INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID + INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) + ) + AND aj.JOB_STATUS = '0' + AND ar.ALARM_TYPE = '1' - UNION DISTINCT + UNION DISTINCT - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.HANDLE_JOB_PERSON = #{userId} - AND aj.JOB_STATUS = '3' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.HANDLE_JOB_PERSON = #{userId} + AND aj.JOB_STATUS = '3' + AND ar.ALARM_TYPE = '1' ) uni WHERE 1=1 @@ -378,19 +387,18 @@ - - select devcode from alarm_records where job_id = #{id} limit 1 + select devcode + from alarm_records + where job_id = #{id} limit 1 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 42cf61b..174d9ce 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -7,7 +7,7 @@ wellId AS wellId, deviceId AS deviceId, devcode as devcode, wellCode AS wellCode, alarmId AS alarmId, deptid AS deptid, owner AS owner, alarmType AS alarmType, alarmValue AS alarmValue, alarmContent AS alarmContent, alarmTimeDate AS alarmTimeDate, position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY, - lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode + lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode,wellType AS wellType 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 0c71440..b3cb789 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,103 +4,87 @@ - - - - - - - - - - + + + + + + + + + + - 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 - diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java index 8c09726..7efefff 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java @@ -101,6 +101,12 @@ */ private String owner; + /** + * 井类型 + */ + private String wellType; + + public Long getAlarmId() { return alarmId; @@ -255,6 +261,14 @@ this.owner = owner; } + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + @Override public String toString() { return "AlarmNowView{" + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java index a68232c..989293b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java @@ -72,10 +72,18 @@ */ @TableField("JOB_ID") private Integer jobId; - + @TableField("HANDLE_MESSAGE") + private String handleMessage; @TableField(exist = false) private Integer jobStatus; + @TableField(exist = false) + private String handlePerson; + + @TableField(exist = false) + private Date handleTime; + + public Integer getJobStatus() { @@ -166,6 +174,30 @@ this.jobId = jobId; } + public String getHandlePerson() { + return handlePerson; + } + + public void setHandlePerson(String handlePerson) { + this.handlePerson = handlePerson; + } + + public Date getHandleTime() { + return handleTime; + } + + public void setHandleTime(Date handleTime) { + this.handleTime = handleTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java index 56165b3..75ce2aa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java @@ -10,8 +10,11 @@ //@Service //@Primary public class AlarmRecordWarpper extends BaseControllerWarpper { -// private EhcacheConstant ehcacheConstant = new EhcacheConstant(); - public AlarmRecordWarpper(Object list) { super(list); } + // private EhcacheConstant ehcacheConstant = new EhcacheConstant(); + public AlarmRecordWarpper(Object list) { + super(list); + } + @Override public void warpTheMap(Map map) { /* @@ -20,15 +23,16 @@ ar.STATUS as status,ar.alarm_type as alarmType, aj.JOB_STATUS as jobStatus,ar.JOB_ID as jobId */ - Map wellInfoMap = new HashMap<>(); - Map userInfoMap = new HashMap<>(); + Map wellInfoMap = new HashMap<>(); + Map userInfoMap = new HashMap<>(); String alarmTypeStr = map.get("alarmType").toString(); String statusStr = map.get("status").toString(); String wellCode = map.get("wellCode").toString(); String alarmContentNameStr = map.get("alarmContentName").toString(); - if (alarmContentNameStr.contains("井盖") || "2".equals(alarmTypeStr)) - { - map.replace("alarmValue","--"); + if (ToolUtil.isEmpty(map.get("handlePerson"))) map.replace("handlePerson", "--"); + if (ToolUtil.isEmpty(map.get("handleTime"))) map.replace("handleTime", "--"); + if (alarmContentNameStr.contains("井盖") || "2".equals(alarmTypeStr)) { + map.replace("alarmValue", "--"); } // String alarmContentStr = map.get("alarmContent").toString(); dictionary version String jobStatusStr = map.get("jobStatus").toString();//if notnull @@ -36,7 +40,7 @@ wellInfoMap = EhcacheConstant.retBean().getWellInfoViaCode(wellCode); String deptidStr = wellInfoMap.get("deptid").toString(); - long deptid = ToolUtil.isEmpty(deptidStr)? -1: Long.valueOf(deptidStr); + long deptid = ToolUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr); String staffStr = (String) wellInfoMap.get("staff"); if (EhcacheConstant.isNumL(staffStr)) { userInfoMap = EhcacheConstant.retBean().getUserInfoById(Long.valueOf(staffStr)); @@ -46,12 +50,12 @@ // wellInfoMap.replace("staff",EhcacheConstant.retBean().getUsernameById(Long.valueOf(staffStr))); // } - map.put("alarmTypeName",EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmTypeStr)); - map.put("deptName",EhcacheConstant.retBean().getDeptNameById(deptid)); - map.put("alarmContent",EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmTypeStr)); + map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid)); + map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // map.put("alarmContentName",EhcacheConstant.retBean().getAlarmContentName(alarmContent));//dictionaryversion - map.put("statusName",EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr,"alarmStatus"));//std dictionary - map.put("jobStatusName",EhcacheConstant.retBean().getJobStatusNameByCodeNum(jobStatusStr)); + map.put("statusName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr, "alarmStatus"));//std dictionary + map.put("jobStatusName", EhcacheConstant.retBean().getJobStatusNameByCodeNum(jobStatusStr)); map.putAll(wellInfoMap); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index a801a90..80ee929 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -29,11 +29,15 @@ - ID AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, OWNER AS owner, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID + AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, OWNER AS owner, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept - w.ID AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + w + . + ID + AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName - '%' || #{keywords}|| '%' + '%' || + #{keywords} + || + '%' - CONCAT('%',#{keywords},'%') + CONCAT + ('%', + #{keywords}, + '%' + ) @@ -109,8 +123,11 @@ and notes = #{notes} - and (WELL_CODE like - or POSITION like ) + and (WELL_CODE like + + or POSITION like + + ) @@ -135,8 +152,11 @@ and notes = #{notes} - and (WELL_CODE like - or POSITION like ) + and (WELL_CODE like + + or POSITION like + + ) @@ -149,7 +169,10 @@ - d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type + d + . + ID + AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type @@ -248,11 +269,12 @@ SELECT - - FROM bus_well_info w WHERE 1 = 1 + w.ID AS id, w.WELL_CODE AS wellCode, w.WELL_NAME AS wellName, + w.DEEP AS deep, w.COORDINATE_X AS coordinateX, w.COORDINATE_Y AS coordinateY, + w.LAT_BAIDU AS latBaidu, w.LNG_BAIDU AS lngBaidu, w.LNG_GAODE AS lngGaode, + w.LAT_GAODE AS latGaode, w.AREA AS area, w.POSITION AS position, w.DEPTID AS deptid, + w.OWNER AS owner, w.PHOTOS AS photos, w.NOTES AS notes, w.WELL_TYPE AS wellType, w.STAFF AS staff, + w.TEL AS tel, w.TS AS ts, w.VALID AS valid, w.BFZT AS bfzt, w.RESPONSIBLE_DEPT AS responsibleDept, + IFNULL(b.well_id,'0') AS wellFlag + FROM bus_well_info w + LEFT JOIN (SELECT DISTINCT well_id FROM bus_device_well) b ON w.`ID`=b.well_id + WHERE 1 = 1 AND (w.WELL_CODE LIKE CONCAT('%',#{keywords},'%') OR w.POSITION LIKE CONCAT('%',#{keywords},'%')) diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java index 2ffe860..2910eef 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java @@ -34,6 +34,7 @@ private String tel; private String valid; private String ts; + private String wellFlag; private List watchData; Map map = new HashMap(); @@ -263,6 +264,15 @@ map.put("ts", ts); } + public String getWellFlag() { + return wellFlag; + } + + public void setWellFlag(String wellFlag) { + this.wellFlag = wellFlag; + map.put("wellFlag", wellFlag); + } + public List getWatchData() { return watchData; } @@ -293,6 +303,7 @@ this.setPosition(busWellInfo.getPosition()); this.setStaff(busWellInfo.getStaff()); this.setTel(busWellInfo.getTel()); + this.setWellFlag(busWellInfo.getWellFlag()); if (null != busWellInfo.getTs()) { DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); this.setTs(fmt.print(busWellInfo.getTs().getTime())); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index 279b74b..4507dd0 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -195,6 +195,12 @@ @TableField(exist = false) private Integer deviceCount; + /** + * 是否关联设备 + */ + @TableField(exist = false) + private String wellFlag; + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java index 7f8fb6c..5e13076 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java @@ -249,7 +249,9 @@ @Override public List getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) { - return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid); + List busWellInfos= this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid); + + return busWellInfos; } @Override diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 8777c87..d611f60 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -10,7 +10,7 @@ casic-web ${pro.version} - war + jar casic-web casic web启动入口 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 e2fe425..01d1be7 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 @@ -184,7 +184,7 @@ @RequestMapping(value = "/batchCancel") @ResponseBody - public Map batchCancel() { + public Map batchCancel(@RequestParam(value = "handleMessage", required = false) String handleMessage) { Map retMap = new HashMap<>(); if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); @@ -197,7 +197,7 @@ retMap.put("code", 200); retMap.put("message", "success"); - List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId()); + List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId(),handleMessage); if (ToolUtil.isEmpty(devCodes)) { retMap.put("code", 200); retMap.put("message", "failure"); 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 539103b..edccd10 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 @@ -34,7 +34,7 @@ Map countByJobStatus(long deptId,int spanDays); Map countMyJob(long userId,long deptId,int spanDays,String deptIds); - List batchCancel(String ids,long userId); + List batchCancel(String ids,long userId,String handleMessage); // 根据dataScope 查工单列表 List jobListScope( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent,DataScope dataScope); 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 21f0adc..5aa1829 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 @@ -162,9 +162,9 @@ } @Override - public List batchCancel(String deptIds,long userId){ + public List batchCancel(String deptIds,long userId,String handleMessage){ List stringList = this.baseMapper.getDevCodesByDeptIds(deptIds); - boolean bTrue = this.baseMapper.batchCancel(deptIds,userId); + boolean bTrue = this.baseMapper.batchCancel(deptIds,userId,handleMessage); if (bTrue) return stringList; else 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 20af3db..cd2b876 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 @@ -34,7 +34,7 @@ boolean handleJob(@Param("id") int id,@Param("personId") long personId); String getDevCodeByJobId(@Param("id") int id); List getDevCodesByDeptIds(@Param("deptIds") String deptIds); - boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId); + boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId ,@Param("handleMessage") String handleMessage ); /** * 根据工单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 98ac0e0..9762a96 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 @@ -4,29 +4,30 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - ID AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, + ID + AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, WELL_CODE AS wellCode, DEVCODE AS devcode, DATE_FORMAT(CREATE_TIME,'%Y-%m-%d %H:%i:%s') AS createTime, JOB_STATUS AS jobStatus, GET_JOB_PERSON AS getJobPerson, DATE_FORMAT(GET_JOB_TIME,'%Y-%m-%d %H:%i:%s') AS getJobTime, FIRST_STATE AS firstState, @@ -37,7 +38,10 @@ - ar.id AS alarmId, + ar + . + id + AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, ar.ALARM_TYPE AS alarmType, @@ -48,6 +52,7 @@ aj.JOB_STATUS AS jobStatus, aj.JOB_BELONG_TO AS jobBelongTo, aj.GET_JOB_PERSON AS getJobPerson, + aj.HANDLE_MESSAGE AS handleMessage, ar.ALARM_VALUE AS alarmValue, DATE_FORMAT( aj.CREATE_TIME, '%Y-%m-%d %H:%i:%s' ) AS createTime, DATE_FORMAT( ar.ALARM_TIME, '%Y-%m-%d %H:%i:%s' ) AS alarmTime, @@ -66,18 +71,18 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} + ) and ar.alarm_type =1 - + @@ -99,20 +104,20 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.deptid in ( ${deptIds} ) - - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.deptid in ( ${deptIds} ) + + ) and ar.alarm_type =1 - + @@ -128,42 +133,42 @@ SELECT * FROM ( - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.WELL_CODE IN ( - SELECT WELL_CODE - FROM bus_well_info bwi - INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID - INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID - INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) - ) - AND aj.JOB_STATUS = '0' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.WELL_CODE IN ( + SELECT WELL_CODE + FROM bus_well_info bwi + INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID + INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID + INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) + ) + AND aj.JOB_STATUS = '0' + AND ar.ALARM_TYPE = '1' - UNION DISTINCT + UNION DISTINCT - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.HANDLE_JOB_PERSON = #{userId} - AND aj.JOB_STATUS = '3' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.HANDLE_JOB_PERSON = #{userId} + AND aj.JOB_STATUS = '3' + AND ar.ALARM_TYPE = '1' ) uni WHERE 1=1 @@ -378,19 +387,18 @@ - - select devcode from alarm_records where job_id = #{id} limit 1 + select devcode + from alarm_records + where job_id = #{id} limit 1 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 42cf61b..174d9ce 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -7,7 +7,7 @@ wellId AS wellId, deviceId AS deviceId, devcode as devcode, wellCode AS wellCode, alarmId AS alarmId, deptid AS deptid, owner AS owner, alarmType AS alarmType, alarmValue AS alarmValue, alarmContent AS alarmContent, alarmTimeDate AS alarmTimeDate, position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY, - lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode + lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode,wellType AS wellType 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 0c71440..b3cb789 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,103 +4,87 @@ - - - - - - - - - - + + + + + + + + + + - 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 - diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java index 8c09726..7efefff 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java @@ -101,6 +101,12 @@ */ private String owner; + /** + * 井类型 + */ + private String wellType; + + public Long getAlarmId() { return alarmId; @@ -255,6 +261,14 @@ this.owner = owner; } + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + @Override public String toString() { return "AlarmNowView{" + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java index a68232c..989293b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java @@ -72,10 +72,18 @@ */ @TableField("JOB_ID") private Integer jobId; - + @TableField("HANDLE_MESSAGE") + private String handleMessage; @TableField(exist = false) private Integer jobStatus; + @TableField(exist = false) + private String handlePerson; + + @TableField(exist = false) + private Date handleTime; + + public Integer getJobStatus() { @@ -166,6 +174,30 @@ this.jobId = jobId; } + public String getHandlePerson() { + return handlePerson; + } + + public void setHandlePerson(String handlePerson) { + this.handlePerson = handlePerson; + } + + public Date getHandleTime() { + return handleTime; + } + + public void setHandleTime(Date handleTime) { + this.handleTime = handleTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java index 56165b3..75ce2aa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java @@ -10,8 +10,11 @@ //@Service //@Primary public class AlarmRecordWarpper extends BaseControllerWarpper { -// private EhcacheConstant ehcacheConstant = new EhcacheConstant(); - public AlarmRecordWarpper(Object list) { super(list); } + // private EhcacheConstant ehcacheConstant = new EhcacheConstant(); + public AlarmRecordWarpper(Object list) { + super(list); + } + @Override public void warpTheMap(Map map) { /* @@ -20,15 +23,16 @@ ar.STATUS as status,ar.alarm_type as alarmType, aj.JOB_STATUS as jobStatus,ar.JOB_ID as jobId */ - Map wellInfoMap = new HashMap<>(); - Map userInfoMap = new HashMap<>(); + Map wellInfoMap = new HashMap<>(); + Map userInfoMap = new HashMap<>(); String alarmTypeStr = map.get("alarmType").toString(); String statusStr = map.get("status").toString(); String wellCode = map.get("wellCode").toString(); String alarmContentNameStr = map.get("alarmContentName").toString(); - if (alarmContentNameStr.contains("井盖") || "2".equals(alarmTypeStr)) - { - map.replace("alarmValue","--"); + if (ToolUtil.isEmpty(map.get("handlePerson"))) map.replace("handlePerson", "--"); + if (ToolUtil.isEmpty(map.get("handleTime"))) map.replace("handleTime", "--"); + if (alarmContentNameStr.contains("井盖") || "2".equals(alarmTypeStr)) { + map.replace("alarmValue", "--"); } // String alarmContentStr = map.get("alarmContent").toString(); dictionary version String jobStatusStr = map.get("jobStatus").toString();//if notnull @@ -36,7 +40,7 @@ wellInfoMap = EhcacheConstant.retBean().getWellInfoViaCode(wellCode); String deptidStr = wellInfoMap.get("deptid").toString(); - long deptid = ToolUtil.isEmpty(deptidStr)? -1: Long.valueOf(deptidStr); + long deptid = ToolUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr); String staffStr = (String) wellInfoMap.get("staff"); if (EhcacheConstant.isNumL(staffStr)) { userInfoMap = EhcacheConstant.retBean().getUserInfoById(Long.valueOf(staffStr)); @@ -46,12 +50,12 @@ // wellInfoMap.replace("staff",EhcacheConstant.retBean().getUsernameById(Long.valueOf(staffStr))); // } - map.put("alarmTypeName",EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmTypeStr)); - map.put("deptName",EhcacheConstant.retBean().getDeptNameById(deptid)); - map.put("alarmContent",EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmTypeStr)); + map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid)); + map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // map.put("alarmContentName",EhcacheConstant.retBean().getAlarmContentName(alarmContent));//dictionaryversion - map.put("statusName",EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr,"alarmStatus"));//std dictionary - map.put("jobStatusName",EhcacheConstant.retBean().getJobStatusNameByCodeNum(jobStatusStr)); + map.put("statusName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr, "alarmStatus"));//std dictionary + map.put("jobStatusName", EhcacheConstant.retBean().getJobStatusNameByCodeNum(jobStatusStr)); map.putAll(wellInfoMap); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index a801a90..80ee929 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -29,11 +29,15 @@ - ID AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, OWNER AS owner, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID + AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, OWNER AS owner, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept - w.ID AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + w + . + ID + AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName - '%' || #{keywords}|| '%' + '%' || + #{keywords} + || + '%' - CONCAT('%',#{keywords},'%') + CONCAT + ('%', + #{keywords}, + '%' + ) @@ -109,8 +123,11 @@ and notes = #{notes} - and (WELL_CODE like - or POSITION like ) + and (WELL_CODE like + + or POSITION like + + ) @@ -135,8 +152,11 @@ and notes = #{notes} - and (WELL_CODE like - or POSITION like ) + and (WELL_CODE like + + or POSITION like + + ) @@ -149,7 +169,10 @@ - d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type + d + . + ID + AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type @@ -248,11 +269,12 @@ SELECT - - FROM bus_well_info w WHERE 1 = 1 + w.ID AS id, w.WELL_CODE AS wellCode, w.WELL_NAME AS wellName, + w.DEEP AS deep, w.COORDINATE_X AS coordinateX, w.COORDINATE_Y AS coordinateY, + w.LAT_BAIDU AS latBaidu, w.LNG_BAIDU AS lngBaidu, w.LNG_GAODE AS lngGaode, + w.LAT_GAODE AS latGaode, w.AREA AS area, w.POSITION AS position, w.DEPTID AS deptid, + w.OWNER AS owner, w.PHOTOS AS photos, w.NOTES AS notes, w.WELL_TYPE AS wellType, w.STAFF AS staff, + w.TEL AS tel, w.TS AS ts, w.VALID AS valid, w.BFZT AS bfzt, w.RESPONSIBLE_DEPT AS responsibleDept, + IFNULL(b.well_id,'0') AS wellFlag + FROM bus_well_info w + LEFT JOIN (SELECT DISTINCT well_id FROM bus_device_well) b ON w.`ID`=b.well_id + WHERE 1 = 1 AND (w.WELL_CODE LIKE CONCAT('%',#{keywords},'%') OR w.POSITION LIKE CONCAT('%',#{keywords},'%')) diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java index 2ffe860..2910eef 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java @@ -34,6 +34,7 @@ private String tel; private String valid; private String ts; + private String wellFlag; private List watchData; Map map = new HashMap(); @@ -263,6 +264,15 @@ map.put("ts", ts); } + public String getWellFlag() { + return wellFlag; + } + + public void setWellFlag(String wellFlag) { + this.wellFlag = wellFlag; + map.put("wellFlag", wellFlag); + } + public List getWatchData() { return watchData; } @@ -293,6 +303,7 @@ this.setPosition(busWellInfo.getPosition()); this.setStaff(busWellInfo.getStaff()); this.setTel(busWellInfo.getTel()); + this.setWellFlag(busWellInfo.getWellFlag()); if (null != busWellInfo.getTs()) { DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); this.setTs(fmt.print(busWellInfo.getTs().getTime())); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index 279b74b..4507dd0 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -195,6 +195,12 @@ @TableField(exist = false) private Integer deviceCount; + /** + * 是否关联设备 + */ + @TableField(exist = false) + private String wellFlag; + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java index 7f8fb6c..5e13076 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java @@ -249,7 +249,9 @@ @Override public List getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) { - return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid); + List busWellInfos= this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid); + + return busWellInfos; } @Override diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 8777c87..d611f60 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -10,7 +10,7 @@ casic-web ${pro.version} - war + jar casic-web casic web启动入口 diff --git a/casic-web/src/main/resources/application.yml b/casic-web/src/main/resources/application.yml index c0eb542..5a90ce5 100644 --- a/casic-web/src/main/resources/application.yml +++ b/casic-web/src/main/resources/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: @activatedProperties@ + active: dev datasource: driver-class-name: com.mysql.jdbc.Driver filters: log4j,wall,mergeStat 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 e2fe425..01d1be7 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 @@ -184,7 +184,7 @@ @RequestMapping(value = "/batchCancel") @ResponseBody - public Map batchCancel() { + public Map batchCancel(@RequestParam(value = "handleMessage", required = false) String handleMessage) { Map retMap = new HashMap<>(); if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); @@ -197,7 +197,7 @@ retMap.put("code", 200); retMap.put("message", "success"); - List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId()); + List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId(),handleMessage); if (ToolUtil.isEmpty(devCodes)) { retMap.put("code", 200); retMap.put("message", "failure"); 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 539103b..edccd10 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 @@ -34,7 +34,7 @@ Map countByJobStatus(long deptId,int spanDays); Map countMyJob(long userId,long deptId,int spanDays,String deptIds); - List batchCancel(String ids,long userId); + List batchCancel(String ids,long userId,String handleMessage); // 根据dataScope 查工单列表 List jobListScope( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent,DataScope dataScope); 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 21f0adc..5aa1829 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 @@ -162,9 +162,9 @@ } @Override - public List batchCancel(String deptIds,long userId){ + public List batchCancel(String deptIds,long userId,String handleMessage){ List stringList = this.baseMapper.getDevCodesByDeptIds(deptIds); - boolean bTrue = this.baseMapper.batchCancel(deptIds,userId); + boolean bTrue = this.baseMapper.batchCancel(deptIds,userId,handleMessage); if (bTrue) return stringList; else 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 20af3db..cd2b876 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 @@ -34,7 +34,7 @@ boolean handleJob(@Param("id") int id,@Param("personId") long personId); String getDevCodeByJobId(@Param("id") int id); List getDevCodesByDeptIds(@Param("deptIds") String deptIds); - boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId); + boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId ,@Param("handleMessage") String handleMessage ); /** * 根据工单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 98ac0e0..9762a96 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 @@ -4,29 +4,30 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - ID AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, + ID + AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, WELL_CODE AS wellCode, DEVCODE AS devcode, DATE_FORMAT(CREATE_TIME,'%Y-%m-%d %H:%i:%s') AS createTime, JOB_STATUS AS jobStatus, GET_JOB_PERSON AS getJobPerson, DATE_FORMAT(GET_JOB_TIME,'%Y-%m-%d %H:%i:%s') AS getJobTime, FIRST_STATE AS firstState, @@ -37,7 +38,10 @@ - ar.id AS alarmId, + ar + . + id + AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, ar.ALARM_TYPE AS alarmType, @@ -48,6 +52,7 @@ aj.JOB_STATUS AS jobStatus, aj.JOB_BELONG_TO AS jobBelongTo, aj.GET_JOB_PERSON AS getJobPerson, + aj.HANDLE_MESSAGE AS handleMessage, ar.ALARM_VALUE AS alarmValue, DATE_FORMAT( aj.CREATE_TIME, '%Y-%m-%d %H:%i:%s' ) AS createTime, DATE_FORMAT( ar.ALARM_TIME, '%Y-%m-%d %H:%i:%s' ) AS alarmTime, @@ -66,18 +71,18 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} + ) and ar.alarm_type =1 - + @@ -99,20 +104,20 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.deptid in ( ${deptIds} ) - - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.deptid in ( ${deptIds} ) + + ) and ar.alarm_type =1 - + @@ -128,42 +133,42 @@ SELECT * FROM ( - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.WELL_CODE IN ( - SELECT WELL_CODE - FROM bus_well_info bwi - INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID - INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID - INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) - ) - AND aj.JOB_STATUS = '0' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.WELL_CODE IN ( + SELECT WELL_CODE + FROM bus_well_info bwi + INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID + INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID + INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) + ) + AND aj.JOB_STATUS = '0' + AND ar.ALARM_TYPE = '1' - UNION DISTINCT + UNION DISTINCT - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.HANDLE_JOB_PERSON = #{userId} - AND aj.JOB_STATUS = '3' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.HANDLE_JOB_PERSON = #{userId} + AND aj.JOB_STATUS = '3' + AND ar.ALARM_TYPE = '1' ) uni WHERE 1=1 @@ -378,19 +387,18 @@ - - select devcode from alarm_records where job_id = #{id} limit 1 + select devcode + from alarm_records + where job_id = #{id} limit 1 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 42cf61b..174d9ce 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -7,7 +7,7 @@ wellId AS wellId, deviceId AS deviceId, devcode as devcode, wellCode AS wellCode, alarmId AS alarmId, deptid AS deptid, owner AS owner, alarmType AS alarmType, alarmValue AS alarmValue, alarmContent AS alarmContent, alarmTimeDate AS alarmTimeDate, position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY, - lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode + lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode,wellType AS wellType 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 0c71440..b3cb789 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,103 +4,87 @@ - - - - - - - - - - + + + + + + + + + + - 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 - diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java index 8c09726..7efefff 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java @@ -101,6 +101,12 @@ */ private String owner; + /** + * 井类型 + */ + private String wellType; + + public Long getAlarmId() { return alarmId; @@ -255,6 +261,14 @@ this.owner = owner; } + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + @Override public String toString() { return "AlarmNowView{" + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java index a68232c..989293b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java @@ -72,10 +72,18 @@ */ @TableField("JOB_ID") private Integer jobId; - + @TableField("HANDLE_MESSAGE") + private String handleMessage; @TableField(exist = false) private Integer jobStatus; + @TableField(exist = false) + private String handlePerson; + + @TableField(exist = false) + private Date handleTime; + + public Integer getJobStatus() { @@ -166,6 +174,30 @@ this.jobId = jobId; } + public String getHandlePerson() { + return handlePerson; + } + + public void setHandlePerson(String handlePerson) { + this.handlePerson = handlePerson; + } + + public Date getHandleTime() { + return handleTime; + } + + public void setHandleTime(Date handleTime) { + this.handleTime = handleTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java index 56165b3..75ce2aa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java @@ -10,8 +10,11 @@ //@Service //@Primary public class AlarmRecordWarpper extends BaseControllerWarpper { -// private EhcacheConstant ehcacheConstant = new EhcacheConstant(); - public AlarmRecordWarpper(Object list) { super(list); } + // private EhcacheConstant ehcacheConstant = new EhcacheConstant(); + public AlarmRecordWarpper(Object list) { + super(list); + } + @Override public void warpTheMap(Map map) { /* @@ -20,15 +23,16 @@ ar.STATUS as status,ar.alarm_type as alarmType, aj.JOB_STATUS as jobStatus,ar.JOB_ID as jobId */ - Map wellInfoMap = new HashMap<>(); - Map userInfoMap = new HashMap<>(); + Map wellInfoMap = new HashMap<>(); + Map userInfoMap = new HashMap<>(); String alarmTypeStr = map.get("alarmType").toString(); String statusStr = map.get("status").toString(); String wellCode = map.get("wellCode").toString(); String alarmContentNameStr = map.get("alarmContentName").toString(); - if (alarmContentNameStr.contains("井盖") || "2".equals(alarmTypeStr)) - { - map.replace("alarmValue","--"); + if (ToolUtil.isEmpty(map.get("handlePerson"))) map.replace("handlePerson", "--"); + if (ToolUtil.isEmpty(map.get("handleTime"))) map.replace("handleTime", "--"); + if (alarmContentNameStr.contains("井盖") || "2".equals(alarmTypeStr)) { + map.replace("alarmValue", "--"); } // String alarmContentStr = map.get("alarmContent").toString(); dictionary version String jobStatusStr = map.get("jobStatus").toString();//if notnull @@ -36,7 +40,7 @@ wellInfoMap = EhcacheConstant.retBean().getWellInfoViaCode(wellCode); String deptidStr = wellInfoMap.get("deptid").toString(); - long deptid = ToolUtil.isEmpty(deptidStr)? -1: Long.valueOf(deptidStr); + long deptid = ToolUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr); String staffStr = (String) wellInfoMap.get("staff"); if (EhcacheConstant.isNumL(staffStr)) { userInfoMap = EhcacheConstant.retBean().getUserInfoById(Long.valueOf(staffStr)); @@ -46,12 +50,12 @@ // wellInfoMap.replace("staff",EhcacheConstant.retBean().getUsernameById(Long.valueOf(staffStr))); // } - map.put("alarmTypeName",EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmTypeStr)); - map.put("deptName",EhcacheConstant.retBean().getDeptNameById(deptid)); - map.put("alarmContent",EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmTypeStr)); + map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid)); + map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // map.put("alarmContentName",EhcacheConstant.retBean().getAlarmContentName(alarmContent));//dictionaryversion - map.put("statusName",EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr,"alarmStatus"));//std dictionary - map.put("jobStatusName",EhcacheConstant.retBean().getJobStatusNameByCodeNum(jobStatusStr)); + map.put("statusName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr, "alarmStatus"));//std dictionary + map.put("jobStatusName", EhcacheConstant.retBean().getJobStatusNameByCodeNum(jobStatusStr)); map.putAll(wellInfoMap); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index a801a90..80ee929 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -29,11 +29,15 @@ - ID AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, OWNER AS owner, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID + AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, OWNER AS owner, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept - w.ID AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + w + . + ID + AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName - '%' || #{keywords}|| '%' + '%' || + #{keywords} + || + '%' - CONCAT('%',#{keywords},'%') + CONCAT + ('%', + #{keywords}, + '%' + ) @@ -109,8 +123,11 @@ and notes = #{notes} - and (WELL_CODE like - or POSITION like ) + and (WELL_CODE like + + or POSITION like + + ) @@ -135,8 +152,11 @@ and notes = #{notes} - and (WELL_CODE like - or POSITION like ) + and (WELL_CODE like + + or POSITION like + + ) @@ -149,7 +169,10 @@ - d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type + d + . + ID + AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type @@ -248,11 +269,12 @@ SELECT - - FROM bus_well_info w WHERE 1 = 1 + w.ID AS id, w.WELL_CODE AS wellCode, w.WELL_NAME AS wellName, + w.DEEP AS deep, w.COORDINATE_X AS coordinateX, w.COORDINATE_Y AS coordinateY, + w.LAT_BAIDU AS latBaidu, w.LNG_BAIDU AS lngBaidu, w.LNG_GAODE AS lngGaode, + w.LAT_GAODE AS latGaode, w.AREA AS area, w.POSITION AS position, w.DEPTID AS deptid, + w.OWNER AS owner, w.PHOTOS AS photos, w.NOTES AS notes, w.WELL_TYPE AS wellType, w.STAFF AS staff, + w.TEL AS tel, w.TS AS ts, w.VALID AS valid, w.BFZT AS bfzt, w.RESPONSIBLE_DEPT AS responsibleDept, + IFNULL(b.well_id,'0') AS wellFlag + FROM bus_well_info w + LEFT JOIN (SELECT DISTINCT well_id FROM bus_device_well) b ON w.`ID`=b.well_id + WHERE 1 = 1 AND (w.WELL_CODE LIKE CONCAT('%',#{keywords},'%') OR w.POSITION LIKE CONCAT('%',#{keywords},'%')) diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java index 2ffe860..2910eef 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java @@ -34,6 +34,7 @@ private String tel; private String valid; private String ts; + private String wellFlag; private List watchData; Map map = new HashMap(); @@ -263,6 +264,15 @@ map.put("ts", ts); } + public String getWellFlag() { + return wellFlag; + } + + public void setWellFlag(String wellFlag) { + this.wellFlag = wellFlag; + map.put("wellFlag", wellFlag); + } + public List getWatchData() { return watchData; } @@ -293,6 +303,7 @@ this.setPosition(busWellInfo.getPosition()); this.setStaff(busWellInfo.getStaff()); this.setTel(busWellInfo.getTel()); + this.setWellFlag(busWellInfo.getWellFlag()); if (null != busWellInfo.getTs()) { DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); this.setTs(fmt.print(busWellInfo.getTs().getTime())); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index 279b74b..4507dd0 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -195,6 +195,12 @@ @TableField(exist = false) private Integer deviceCount; + /** + * 是否关联设备 + */ + @TableField(exist = false) + private String wellFlag; + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java index 7f8fb6c..5e13076 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java @@ -249,7 +249,9 @@ @Override public List getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) { - return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid); + List busWellInfos= this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid); + + return busWellInfos; } @Override diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 8777c87..d611f60 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -10,7 +10,7 @@ casic-web ${pro.version} - war + jar casic-web casic web启动入口 diff --git a/casic-web/src/main/resources/application.yml b/casic-web/src/main/resources/application.yml index c0eb542..5a90ce5 100644 --- a/casic-web/src/main/resources/application.yml +++ b/casic-web/src/main/resources/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: @activatedProperties@ + active: dev datasource: driver-class-name: com.mysql.jdbc.Driver filters: log4j,wall,mergeStat diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index d9ef39d..67668cd 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -1,13 +1,13 @@ server: - port: 8084 + port: 8083 ################### spring配置 ################### spring: resources: - static-locations: file:D:\java\boot\casic-web-1.0.0-SNAPSHOT\image\,file:D:\java\boot\casic-web-1.0.0-SNAPSHOT\download\ + static-locations: file:/casic/casic-web-1.0.0-SNAPSHOT/image/,file:/casic/casic-web-1.0.0-SNAPSHOT/download/ datasource: - url: jdbc:mysql://111.198.10.15:11702/smartwell_sp?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false + url: jdbc:mysql://111.198.10.15:11102/casic_smartwell_sp2021?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false username: root - password: Casic203 + password: Casic203! initial-size: 2 min-idle: 1 jms: @@ -26,7 +26,7 @@ casic: kaptcha-open: false #是否开启登录时验证码 (true/false) nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/app/prepositionInvoke,/app/tokenByCard,/sys/receiveSyncData,/sys/test,/job/test - file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload + file-upload-path: /casic/casic-web-1.0.0-SNAPSHOT/upload spring-session-open: true #服务节点配置 master节点,请配置在末位 server: @@ -36,10 +36,11 @@ show-sync-user: true smartcity: config: - export-path: D:\java\boot\casic-web-1.0.0-SNAPSHOT\export\ - image-path: D:\java\boot\casic-web-1.0.0-SNAPSHOT\image\ - config-path: D:\java\boot\casic-web-1.0.0-SNAPSHOT\temp\ - download-path: D:\java\boot\casic-web-1.0.0-SNAPSHOT\download\ + export-path: /casic/casic-web-1.0.0-SNAPSHOT/export/ + image-path: /casic/casic-web-1.0.0-SNAPSHOT/image/ +# config-path: /casic/casic-web-1.0.0-SNAPSHOT/temp/ + config-path: c:/tmp/ + download-path: /casic/casic-web-1.0.0-SNAPSHOT/download/ device: redis: invalid-time: 43200 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 e2fe425..01d1be7 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 @@ -184,7 +184,7 @@ @RequestMapping(value = "/batchCancel") @ResponseBody - public Map batchCancel() { + public Map batchCancel(@RequestParam(value = "handleMessage", required = false) String handleMessage) { Map retMap = new HashMap<>(); if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); @@ -197,7 +197,7 @@ retMap.put("code", 200); retMap.put("message", "success"); - List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId()); + List devCodes = alarmJobService.batchCancel(deptIds, currentUser.getId(),handleMessage); if (ToolUtil.isEmpty(devCodes)) { retMap.put("code", 200); retMap.put("message", "failure"); 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 539103b..edccd10 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 @@ -34,7 +34,7 @@ Map countByJobStatus(long deptId,int spanDays); Map countMyJob(long userId,long deptId,int spanDays,String deptIds); - List batchCancel(String ids,long userId); + List batchCancel(String ids,long userId,String handleMessage); // 根据dataScope 查工单列表 List jobListScope( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent,DataScope dataScope); 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 21f0adc..5aa1829 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 @@ -162,9 +162,9 @@ } @Override - public List batchCancel(String deptIds,long userId){ + public List batchCancel(String deptIds,long userId,String handleMessage){ List stringList = this.baseMapper.getDevCodesByDeptIds(deptIds); - boolean bTrue = this.baseMapper.batchCancel(deptIds,userId); + boolean bTrue = this.baseMapper.batchCancel(deptIds,userId,handleMessage); if (bTrue) return stringList; else 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 20af3db..cd2b876 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 @@ -34,7 +34,7 @@ boolean handleJob(@Param("id") int id,@Param("personId") long personId); String getDevCodeByJobId(@Param("id") int id); List getDevCodesByDeptIds(@Param("deptIds") String deptIds); - boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId); + boolean batchCancel(@Param("deptIds") String deptIds,@Param("personId") long userId ,@Param("handleMessage") String handleMessage ); /** * 根据工单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 98ac0e0..9762a96 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 @@ -4,29 +4,30 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - ID AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, + ID + AS id, JOBCODE AS jobcode, JOG_TYPE AS jogType, WELL_CODE AS wellCode, DEVCODE AS devcode, DATE_FORMAT(CREATE_TIME,'%Y-%m-%d %H:%i:%s') AS createTime, JOB_STATUS AS jobStatus, GET_JOB_PERSON AS getJobPerson, DATE_FORMAT(GET_JOB_TIME,'%Y-%m-%d %H:%i:%s') AS getJobTime, FIRST_STATE AS firstState, @@ -37,7 +38,10 @@ - ar.id AS alarmId, + ar + . + id + AS alarmId, aj.DEVCODE AS devcode, aj.WELL_CODE AS wellCode, ar.ALARM_TYPE AS alarmType, @@ -48,6 +52,7 @@ aj.JOB_STATUS AS jobStatus, aj.JOB_BELONG_TO AS jobBelongTo, aj.GET_JOB_PERSON AS getJobPerson, + aj.HANDLE_MESSAGE AS handleMessage, ar.ALARM_VALUE AS alarmValue, DATE_FORMAT( aj.CREATE_TIME, '%Y-%m-%d %H:%i:%s' ) AS createTime, DATE_FORMAT( ar.ALARM_TIME, '%Y-%m-%d %H:%i:%s' ) AS alarmTime, @@ -66,18 +71,18 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.responsible_dept = #{deptId} or bwi.deptid = #{deptId} + ) and ar.alarm_type =1 - + @@ -99,20 +104,20 @@ count(1) as total FROM ( - SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status - FROM alarm_job aj LEFT JOIN alarm_records ar - ON aj.ID = ar.job_id - WHERE + SELECT IFNULL(MAX(ar.ID),0) AS alarmId,aj.job_status AS job_status + FROM alarm_job aj LEFT JOIN alarm_records ar + ON aj.ID = ar.job_id + WHERE aj.well_code in - ( - SELECT bwi.WELL_CODE - FROM bus_well_info bwi - WHERE bwi.deptid in ( ${deptIds} ) - - ) and + ( + SELECT bwi.WELL_CODE + FROM bus_well_info bwi + WHERE bwi.deptid in ( ${deptIds} ) + + ) and ar.alarm_type =1 - + @@ -128,42 +133,42 @@ SELECT * FROM ( - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.WELL_CODE IN ( - SELECT WELL_CODE - FROM bus_well_info bwi - INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID - INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID - INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) - ) - AND aj.JOB_STATUS = '0' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.WELL_CODE IN ( + SELECT WELL_CODE + FROM bus_well_info bwi + INNER JOIN bus_group_well bgw ON bgw.WELL_ID = bwi.ID + INNER JOIN bus_group bg ON bg.ID = bgw.GROUP_ID + INNER JOIN bus_group_user bgu ON ( bgu.GROUP_ID = bg.ID AND bgu.USER_ID = #{userId} ) + ) + AND aj.JOB_STATUS = '0' + AND ar.ALARM_TYPE = '1' - UNION DISTINCT + UNION DISTINCT - SELECT - FROM alarm_job aj - LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID - WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) - AND aj.HANDLE_JOB_PERSON = #{userId} - AND aj.JOB_STATUS = '3' - AND ar.ALARM_TYPE = '1' + SELECT + + FROM alarm_job aj + LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID + WHERE ar.ID = (SELECT MAX(ID) FROM alarm_records tmp WHERE tmp.JOB_ID = ar.JOB_ID) + AND aj.HANDLE_JOB_PERSON = #{userId} + AND aj.JOB_STATUS = '3' + AND ar.ALARM_TYPE = '1' ) uni WHERE 1=1 @@ -378,19 +387,18 @@ - - select devcode from alarm_records where job_id = #{id} limit 1 + select devcode + from alarm_records + where job_id = #{id} limit 1 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 42cf61b..174d9ce 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -7,7 +7,7 @@ wellId AS wellId, deviceId AS deviceId, devcode as devcode, wellCode AS wellCode, alarmId AS alarmId, deptid AS deptid, owner AS owner, alarmType AS alarmType, alarmValue AS alarmValue, alarmContent AS alarmContent, alarmTimeDate AS alarmTimeDate, position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY, - lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode + lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode,wellType AS wellType 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 0c71440..b3cb789 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,103 +4,87 @@ - - - - - - - - - - + + + + + + + + + + - 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 - diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java index 8c09726..7efefff 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java @@ -101,6 +101,12 @@ */ private String owner; + /** + * 井类型 + */ + private String wellType; + + public Long getAlarmId() { return alarmId; @@ -255,6 +261,14 @@ this.owner = owner; } + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + @Override public String toString() { return "AlarmNowView{" + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java index a68232c..989293b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java @@ -72,10 +72,18 @@ */ @TableField("JOB_ID") private Integer jobId; - + @TableField("HANDLE_MESSAGE") + private String handleMessage; @TableField(exist = false) private Integer jobStatus; + @TableField(exist = false) + private String handlePerson; + + @TableField(exist = false) + private Date handleTime; + + public Integer getJobStatus() { @@ -166,6 +174,30 @@ this.jobId = jobId; } + public String getHandlePerson() { + return handlePerson; + } + + public void setHandlePerson(String handlePerson) { + this.handlePerson = handlePerson; + } + + public Date getHandleTime() { + return handleTime; + } + + public void setHandleTime(Date handleTime) { + this.handleTime = handleTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java index 56165b3..75ce2aa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java @@ -10,8 +10,11 @@ //@Service //@Primary public class AlarmRecordWarpper extends BaseControllerWarpper { -// private EhcacheConstant ehcacheConstant = new EhcacheConstant(); - public AlarmRecordWarpper(Object list) { super(list); } + // private EhcacheConstant ehcacheConstant = new EhcacheConstant(); + public AlarmRecordWarpper(Object list) { + super(list); + } + @Override public void warpTheMap(Map map) { /* @@ -20,15 +23,16 @@ ar.STATUS as status,ar.alarm_type as alarmType, aj.JOB_STATUS as jobStatus,ar.JOB_ID as jobId */ - Map wellInfoMap = new HashMap<>(); - Map userInfoMap = new HashMap<>(); + Map wellInfoMap = new HashMap<>(); + Map userInfoMap = new HashMap<>(); String alarmTypeStr = map.get("alarmType").toString(); String statusStr = map.get("status").toString(); String wellCode = map.get("wellCode").toString(); String alarmContentNameStr = map.get("alarmContentName").toString(); - if (alarmContentNameStr.contains("井盖") || "2".equals(alarmTypeStr)) - { - map.replace("alarmValue","--"); + if (ToolUtil.isEmpty(map.get("handlePerson"))) map.replace("handlePerson", "--"); + if (ToolUtil.isEmpty(map.get("handleTime"))) map.replace("handleTime", "--"); + if (alarmContentNameStr.contains("井盖") || "2".equals(alarmTypeStr)) { + map.replace("alarmValue", "--"); } // String alarmContentStr = map.get("alarmContent").toString(); dictionary version String jobStatusStr = map.get("jobStatus").toString();//if notnull @@ -36,7 +40,7 @@ wellInfoMap = EhcacheConstant.retBean().getWellInfoViaCode(wellCode); String deptidStr = wellInfoMap.get("deptid").toString(); - long deptid = ToolUtil.isEmpty(deptidStr)? -1: Long.valueOf(deptidStr); + long deptid = ToolUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr); String staffStr = (String) wellInfoMap.get("staff"); if (EhcacheConstant.isNumL(staffStr)) { userInfoMap = EhcacheConstant.retBean().getUserInfoById(Long.valueOf(staffStr)); @@ -46,12 +50,12 @@ // wellInfoMap.replace("staff",EhcacheConstant.retBean().getUsernameById(Long.valueOf(staffStr))); // } - map.put("alarmTypeName",EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmTypeStr)); - map.put("deptName",EhcacheConstant.retBean().getDeptNameById(deptid)); - map.put("alarmContent",EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); + map.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmTypeStr)); + map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid)); + map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // map.put("alarmContentName",EhcacheConstant.retBean().getAlarmContentName(alarmContent));//dictionaryversion - map.put("statusName",EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr,"alarmStatus"));//std dictionary - map.put("jobStatusName",EhcacheConstant.retBean().getJobStatusNameByCodeNum(jobStatusStr)); + map.put("statusName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr, "alarmStatus"));//std dictionary + map.put("jobStatusName", EhcacheConstant.retBean().getJobStatusNameByCodeNum(jobStatusStr)); map.putAll(wellInfoMap); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index a801a90..80ee929 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -29,11 +29,15 @@ - ID AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, OWNER AS owner, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept + ID + AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, OWNER AS owner, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt, RESPONSIBLE_DEPT AS responsibleDept - w.ID AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName + w + . + ID + AS id, WELL_CODE AS wellCode, WELL_NAME AS wellName, DEEP AS deep, COORDINATE_X AS coordinateX, COORDINATE_Y AS coordinateY, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LNG_GAODE AS lngGaode, LAT_GAODE AS latGaode, AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes, WELL_TYPE AS wellType, STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid, BFZT AS bfzt,d1.simplename AS deptName,d2.id AS responsibleDept,d2.simplename AS responsibleDeptName - '%' || #{keywords}|| '%' + '%' || + #{keywords} + || + '%' - CONCAT('%',#{keywords},'%') + CONCAT + ('%', + #{keywords}, + '%' + ) @@ -109,8 +123,11 @@ and notes = #{notes} - and (WELL_CODE like - or POSITION like ) + and (WELL_CODE like + + or POSITION like + + ) @@ -135,8 +152,11 @@ and notes = #{notes} - and (WELL_CODE like - or POSITION like ) + and (WELL_CODE like + + or POSITION like + + ) @@ -149,7 +169,10 @@ - d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type + d + . + ID + AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type @@ -248,11 +269,12 @@ SELECT - - FROM bus_well_info w WHERE 1 = 1 + w.ID AS id, w.WELL_CODE AS wellCode, w.WELL_NAME AS wellName, + w.DEEP AS deep, w.COORDINATE_X AS coordinateX, w.COORDINATE_Y AS coordinateY, + w.LAT_BAIDU AS latBaidu, w.LNG_BAIDU AS lngBaidu, w.LNG_GAODE AS lngGaode, + w.LAT_GAODE AS latGaode, w.AREA AS area, w.POSITION AS position, w.DEPTID AS deptid, + w.OWNER AS owner, w.PHOTOS AS photos, w.NOTES AS notes, w.WELL_TYPE AS wellType, w.STAFF AS staff, + w.TEL AS tel, w.TS AS ts, w.VALID AS valid, w.BFZT AS bfzt, w.RESPONSIBLE_DEPT AS responsibleDept, + IFNULL(b.well_id,'0') AS wellFlag + FROM bus_well_info w + LEFT JOIN (SELECT DISTINCT well_id FROM bus_device_well) b ON w.`ID`=b.well_id + WHERE 1 = 1 AND (w.WELL_CODE LIKE CONCAT('%',#{keywords},'%') OR w.POSITION LIKE CONCAT('%',#{keywords},'%')) diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java index 2ffe860..2910eef 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java @@ -34,6 +34,7 @@ private String tel; private String valid; private String ts; + private String wellFlag; private List watchData; Map map = new HashMap(); @@ -263,6 +264,15 @@ map.put("ts", ts); } + public String getWellFlag() { + return wellFlag; + } + + public void setWellFlag(String wellFlag) { + this.wellFlag = wellFlag; + map.put("wellFlag", wellFlag); + } + public List getWatchData() { return watchData; } @@ -293,6 +303,7 @@ this.setPosition(busWellInfo.getPosition()); this.setStaff(busWellInfo.getStaff()); this.setTel(busWellInfo.getTel()); + this.setWellFlag(busWellInfo.getWellFlag()); if (null != busWellInfo.getTs()) { DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); this.setTs(fmt.print(busWellInfo.getTs().getTime())); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index 279b74b..4507dd0 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -195,6 +195,12 @@ @TableField(exist = false) private Integer deviceCount; + /** + * 是否关联设备 + */ + @TableField(exist = false) + private String wellFlag; + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java index 7f8fb6c..5e13076 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java @@ -249,7 +249,9 @@ @Override public List getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) { - return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid); + List busWellInfos= this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid); + + return busWellInfos; } @Override diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 8777c87..d611f60 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -10,7 +10,7 @@ casic-web ${pro.version} - war + jar casic-web casic web启动入口 diff --git a/casic-web/src/main/resources/application.yml b/casic-web/src/main/resources/application.yml index c0eb542..5a90ce5 100644 --- a/casic-web/src/main/resources/application.yml +++ b/casic-web/src/main/resources/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: @activatedProperties@ + active: dev datasource: driver-class-name: com.mysql.jdbc.Driver filters: log4j,wall,mergeStat diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index d9ef39d..67668cd 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -1,13 +1,13 @@ server: - port: 8084 + port: 8083 ################### spring配置 ################### spring: resources: - static-locations: file:D:\java\boot\casic-web-1.0.0-SNAPSHOT\image\,file:D:\java\boot\casic-web-1.0.0-SNAPSHOT\download\ + static-locations: file:/casic/casic-web-1.0.0-SNAPSHOT/image/,file:/casic/casic-web-1.0.0-SNAPSHOT/download/ datasource: - url: jdbc:mysql://111.198.10.15:11702/smartwell_sp?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false + url: jdbc:mysql://111.198.10.15:11102/casic_smartwell_sp2021?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false username: root - password: Casic203 + password: Casic203! initial-size: 2 min-idle: 1 jms: @@ -26,7 +26,7 @@ casic: kaptcha-open: false #是否开启登录时验证码 (true/false) nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/app/prepositionInvoke,/app/tokenByCard,/sys/receiveSyncData,/sys/test,/job/test - file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload + file-upload-path: /casic/casic-web-1.0.0-SNAPSHOT/upload spring-session-open: true #服务节点配置 master节点,请配置在末位 server: @@ -36,10 +36,11 @@ show-sync-user: true smartcity: config: - export-path: D:\java\boot\casic-web-1.0.0-SNAPSHOT\export\ - image-path: D:\java\boot\casic-web-1.0.0-SNAPSHOT\image\ - config-path: D:\java\boot\casic-web-1.0.0-SNAPSHOT\temp\ - download-path: D:\java\boot\casic-web-1.0.0-SNAPSHOT\download\ + export-path: /casic/casic-web-1.0.0-SNAPSHOT/export/ + image-path: /casic/casic-web-1.0.0-SNAPSHOT/image/ +# config-path: /casic/casic-web-1.0.0-SNAPSHOT/temp/ + config-path: c:/tmp/ + download-path: /casic/casic-web-1.0.0-SNAPSHOT/download/ device: redis: invalid-time: 43200 diff --git a/casic-web/src/main/resources/ehcache.xml b/casic-web/src/main/resources/ehcache.xml deleted file mode 100644 index 2a2d001..0000000 --- a/casic-web/src/main/resources/ehcache.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - -