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 3edbb9f..56b1b4c 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 @@ -183,7 +183,6 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); return ReturnUtil.success(iAlarmRecordsService.getPrincipals(idDTO.getId())); - } @PostMapping("/test") @@ -191,6 +190,5 @@ public void test( ) { iAlarmRecordsService.processOffline(); } - } 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 3edbb9f..56b1b4c 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 @@ -183,7 +183,6 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); return ReturnUtil.success(iAlarmRecordsService.getPrincipals(idDTO.getId())); - } @PostMapping("/test") @@ -191,6 +190,5 @@ public void test( ) { iAlarmRecordsService.processOffline(); } - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java index dcfa83e..b79e5ac 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java @@ -23,7 +23,8 @@ @Mapper public interface AlarmRuleMapper extends BaseMapper { - @Select(" select ar.ALARM_LEVEL_ID as alarmLevelId ,ar.PRODUCT_ID as productId ,ar.ALARM_THRESHOLD as alarmThreshold,ar.ALARM_TYPE_ID as alarmTypeId,ar.ALARM_NAME as alarmTypeName from alarm_rule ar where ar.PRODUCT_ID in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " + + @Select(" select ar.ALARM_LEVEL_ID as alarmLevelId ,ar.PRODUCT_ID as productId ,ar.ALARM_THRESHOLD as alarmThreshold,ar.ALARM_TYPE_ID as alarmTypeId,at.ALARM_TYPE as alarmTypeName from alarm_rule ar where ar.PRODUCT_ID in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " + + " LEFT JOIN alarm_type at on at.ID=ar.ALARM_TYPE_ID " + " where bd.DEVCODE= #{devCode} and bd.VALID=1 " + ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD desc") List getRuleListByCode(@Param("devCode") String devCode); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 3edbb9f..56b1b4c 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 @@ -183,7 +183,6 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); return ReturnUtil.success(iAlarmRecordsService.getPrincipals(idDTO.getId())); - } @PostMapping("/test") @@ -191,6 +190,5 @@ public void test( ) { iAlarmRecordsService.processOffline(); } - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java index dcfa83e..b79e5ac 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java @@ -23,7 +23,8 @@ @Mapper public interface AlarmRuleMapper extends BaseMapper { - @Select(" select ar.ALARM_LEVEL_ID as alarmLevelId ,ar.PRODUCT_ID as productId ,ar.ALARM_THRESHOLD as alarmThreshold,ar.ALARM_TYPE_ID as alarmTypeId,ar.ALARM_NAME as alarmTypeName from alarm_rule ar where ar.PRODUCT_ID in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " + + @Select(" select ar.ALARM_LEVEL_ID as alarmLevelId ,ar.PRODUCT_ID as productId ,ar.ALARM_THRESHOLD as alarmThreshold,ar.ALARM_TYPE_ID as alarmTypeId,at.ALARM_TYPE as alarmTypeName from alarm_rule ar where ar.PRODUCT_ID in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " + + " LEFT JOIN alarm_type at on at.ID=ar.ALARM_TYPE_ID " + " where bd.DEVCODE= #{devCode} and bd.VALID=1 " + ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD desc") List getRuleListByCode(@Param("devCode") String devCode); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index a00ca6f..113b910 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -504,7 +504,7 @@ lr.lngGaode, lr.latGaode, lr.manageType, - sd.full_name AS deptName, + lr.propertyOwner, lr.id as ledgerId, lr.type as watchObject, @@ -518,10 +518,11 @@ AND lr.type = bl.type AND bl.VALID = 1 AND lr.VALID = 1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN alarm_type ay on ay.id = rd.ALARM_TYPE_ID WHERE rd.STATUS = 1 and rd.ID = #{id} + limit 1 @@ -802,4 +803,8 @@ and valid > 0 + + 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 3edbb9f..56b1b4c 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 @@ -183,7 +183,6 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); return ReturnUtil.success(iAlarmRecordsService.getPrincipals(idDTO.getId())); - } @PostMapping("/test") @@ -191,6 +190,5 @@ public void test( ) { iAlarmRecordsService.processOffline(); } - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java index dcfa83e..b79e5ac 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java @@ -23,7 +23,8 @@ @Mapper public interface AlarmRuleMapper extends BaseMapper { - @Select(" select ar.ALARM_LEVEL_ID as alarmLevelId ,ar.PRODUCT_ID as productId ,ar.ALARM_THRESHOLD as alarmThreshold,ar.ALARM_TYPE_ID as alarmTypeId,ar.ALARM_NAME as alarmTypeName from alarm_rule ar where ar.PRODUCT_ID in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " + + @Select(" select ar.ALARM_LEVEL_ID as alarmLevelId ,ar.PRODUCT_ID as productId ,ar.ALARM_THRESHOLD as alarmThreshold,ar.ALARM_TYPE_ID as alarmTypeId,at.ALARM_TYPE as alarmTypeName from alarm_rule ar where ar.PRODUCT_ID in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " + + " LEFT JOIN alarm_type at on at.ID=ar.ALARM_TYPE_ID " + " where bd.DEVCODE= #{devCode} and bd.VALID=1 " + ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD desc") List getRuleListByCode(@Param("devCode") String devCode); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index a00ca6f..113b910 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -504,7 +504,7 @@ lr.lngGaode, lr.latGaode, lr.manageType, - sd.full_name AS deptName, + lr.propertyOwner, lr.id as ledgerId, lr.type as watchObject, @@ -518,10 +518,11 @@ AND lr.type = bl.type AND bl.VALID = 1 AND lr.VALID = 1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN alarm_type ay on ay.id = rd.ALARM_TYPE_ID WHERE rd.STATUS = 1 and rd.ID = #{id} + limit 1 @@ -802,4 +803,8 @@ and valid > 0 + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml index bbedb15..ca3066e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml @@ -69,8 +69,10 @@ al.ALARM_LEVEL_ID AS alarmLevelId, al.ALARM_THRESHOLD AS alarmThreshold, ALARM_TYPE_ID AS alarmTypeId, + al.ID AS alarmRuleId, ay.ALARM_TYPE as alarmTypeName, - ac.ALARM_LEVEL as alarmLevelName + ac.ALARM_LEVEL as alarmLevelName, + al.ALARM_NAME as alarmRuleName FROM `bus_device` bd INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_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 3edbb9f..56b1b4c 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 @@ -183,7 +183,6 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); return ReturnUtil.success(iAlarmRecordsService.getPrincipals(idDTO.getId())); - } @PostMapping("/test") @@ -191,6 +190,5 @@ public void test( ) { iAlarmRecordsService.processOffline(); } - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java index dcfa83e..b79e5ac 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java @@ -23,7 +23,8 @@ @Mapper public interface AlarmRuleMapper extends BaseMapper { - @Select(" select ar.ALARM_LEVEL_ID as alarmLevelId ,ar.PRODUCT_ID as productId ,ar.ALARM_THRESHOLD as alarmThreshold,ar.ALARM_TYPE_ID as alarmTypeId,ar.ALARM_NAME as alarmTypeName from alarm_rule ar where ar.PRODUCT_ID in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " + + @Select(" select ar.ALARM_LEVEL_ID as alarmLevelId ,ar.PRODUCT_ID as productId ,ar.ALARM_THRESHOLD as alarmThreshold,ar.ALARM_TYPE_ID as alarmTypeId,at.ALARM_TYPE as alarmTypeName from alarm_rule ar where ar.PRODUCT_ID in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " + + " LEFT JOIN alarm_type at on at.ID=ar.ALARM_TYPE_ID " + " where bd.DEVCODE= #{devCode} and bd.VALID=1 " + ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD desc") List getRuleListByCode(@Param("devCode") String devCode); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index a00ca6f..113b910 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -504,7 +504,7 @@ lr.lngGaode, lr.latGaode, lr.manageType, - sd.full_name AS deptName, + lr.propertyOwner, lr.id as ledgerId, lr.type as watchObject, @@ -518,10 +518,11 @@ AND lr.type = bl.type AND bl.VALID = 1 AND lr.VALID = 1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN alarm_type ay on ay.id = rd.ALARM_TYPE_ID WHERE rd.STATUS = 1 and rd.ID = #{id} + limit 1 @@ -802,4 +803,8 @@ and valid > 0 + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml index bbedb15..ca3066e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml @@ -69,8 +69,10 @@ al.ALARM_LEVEL_ID AS alarmLevelId, al.ALARM_THRESHOLD AS alarmThreshold, ALARM_TYPE_ID AS alarmTypeId, + al.ID AS alarmRuleId, ay.ALARM_TYPE as alarmTypeName, - ac.ALARM_LEVEL as alarmLevelName + ac.ALARM_LEVEL as alarmLevelName, + al.ALARM_NAME as alarmRuleName FROM `bus_device` bd INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java index 31f18e2..56f91dc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java @@ -18,9 +18,15 @@ @ApiModelProperty("报警类型id") private Long alarmTypeId; + @ApiModelProperty("报警规则id") + private Long alarmRuleId; + @ApiModelProperty("报警类型名称") private String alarmTypeName; + @ApiModelProperty("报警规则名称") + private String alarmRuleName; + @ApiModelProperty("报警阈值") private String alarmThreshold; } 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 3edbb9f..56b1b4c 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 @@ -183,7 +183,6 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); return ReturnUtil.success(iAlarmRecordsService.getPrincipals(idDTO.getId())); - } @PostMapping("/test") @@ -191,6 +190,5 @@ public void test( ) { iAlarmRecordsService.processOffline(); } - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java index dcfa83e..b79e5ac 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java @@ -23,7 +23,8 @@ @Mapper public interface AlarmRuleMapper extends BaseMapper { - @Select(" select ar.ALARM_LEVEL_ID as alarmLevelId ,ar.PRODUCT_ID as productId ,ar.ALARM_THRESHOLD as alarmThreshold,ar.ALARM_TYPE_ID as alarmTypeId,ar.ALARM_NAME as alarmTypeName from alarm_rule ar where ar.PRODUCT_ID in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " + + @Select(" select ar.ALARM_LEVEL_ID as alarmLevelId ,ar.PRODUCT_ID as productId ,ar.ALARM_THRESHOLD as alarmThreshold,ar.ALARM_TYPE_ID as alarmTypeId,at.ALARM_TYPE as alarmTypeName from alarm_rule ar where ar.PRODUCT_ID in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " + + " LEFT JOIN alarm_type at on at.ID=ar.ALARM_TYPE_ID " + " where bd.DEVCODE= #{devCode} and bd.VALID=1 " + ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD desc") List getRuleListByCode(@Param("devCode") String devCode); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index a00ca6f..113b910 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -504,7 +504,7 @@ lr.lngGaode, lr.latGaode, lr.manageType, - sd.full_name AS deptName, + lr.propertyOwner, lr.id as ledgerId, lr.type as watchObject, @@ -518,10 +518,11 @@ AND lr.type = bl.type AND bl.VALID = 1 AND lr.VALID = 1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN alarm_type ay on ay.id = rd.ALARM_TYPE_ID WHERE rd.STATUS = 1 and rd.ID = #{id} + limit 1 @@ -802,4 +803,8 @@ and valid > 0 + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml index bbedb15..ca3066e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml @@ -69,8 +69,10 @@ al.ALARM_LEVEL_ID AS alarmLevelId, al.ALARM_THRESHOLD AS alarmThreshold, ALARM_TYPE_ID AS alarmTypeId, + al.ID AS alarmRuleId, ay.ALARM_TYPE as alarmTypeName, - ac.ALARM_LEVEL as alarmLevelName + ac.ALARM_LEVEL as alarmLevelName, + al.ALARM_NAME as alarmRuleName FROM `bus_device` bd INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java index 31f18e2..56f91dc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java @@ -18,9 +18,15 @@ @ApiModelProperty("报警类型id") private Long alarmTypeId; + @ApiModelProperty("报警规则id") + private Long alarmRuleId; + @ApiModelProperty("报警类型名称") private String alarmTypeName; + @ApiModelProperty("报警规则名称") + private String alarmRuleName; + @ApiModelProperty("报警阈值") private String alarmThreshold; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/PrincipalDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/PrincipalDTO.java index 6827906..434a009 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/PrincipalDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/PrincipalDTO.java @@ -18,7 +18,7 @@ @ApiModelProperty("联系方式") private String telephone; - @ApiModelProperty("同步人员id") - private String synId; + @ApiModelProperty("人员编码") + private String account; } 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 3edbb9f..56b1b4c 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 @@ -183,7 +183,6 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); return ReturnUtil.success(iAlarmRecordsService.getPrincipals(idDTO.getId())); - } @PostMapping("/test") @@ -191,6 +190,5 @@ public void test( ) { iAlarmRecordsService.processOffline(); } - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java index dcfa83e..b79e5ac 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java @@ -23,7 +23,8 @@ @Mapper public interface AlarmRuleMapper extends BaseMapper { - @Select(" select ar.ALARM_LEVEL_ID as alarmLevelId ,ar.PRODUCT_ID as productId ,ar.ALARM_THRESHOLD as alarmThreshold,ar.ALARM_TYPE_ID as alarmTypeId,ar.ALARM_NAME as alarmTypeName from alarm_rule ar where ar.PRODUCT_ID in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " + + @Select(" select ar.ALARM_LEVEL_ID as alarmLevelId ,ar.PRODUCT_ID as productId ,ar.ALARM_THRESHOLD as alarmThreshold,ar.ALARM_TYPE_ID as alarmTypeId,at.ALARM_TYPE as alarmTypeName from alarm_rule ar where ar.PRODUCT_ID in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " + + " LEFT JOIN alarm_type at on at.ID=ar.ALARM_TYPE_ID " + " where bd.DEVCODE= #{devCode} and bd.VALID=1 " + ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD desc") List getRuleListByCode(@Param("devCode") String devCode); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index a00ca6f..113b910 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -504,7 +504,7 @@ lr.lngGaode, lr.latGaode, lr.manageType, - sd.full_name AS deptName, + lr.propertyOwner, lr.id as ledgerId, lr.type as watchObject, @@ -518,10 +518,11 @@ AND lr.type = bl.type AND bl.VALID = 1 AND lr.VALID = 1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN alarm_type ay on ay.id = rd.ALARM_TYPE_ID WHERE rd.STATUS = 1 and rd.ID = #{id} + limit 1 @@ -802,4 +803,8 @@ and valid > 0 + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml index bbedb15..ca3066e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml @@ -69,8 +69,10 @@ al.ALARM_LEVEL_ID AS alarmLevelId, al.ALARM_THRESHOLD AS alarmThreshold, ALARM_TYPE_ID AS alarmTypeId, + al.ID AS alarmRuleId, ay.ALARM_TYPE as alarmTypeName, - ac.ALARM_LEVEL as alarmLevelName + ac.ALARM_LEVEL as alarmLevelName, + al.ALARM_NAME as alarmRuleName FROM `bus_device` bd INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java index 31f18e2..56f91dc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java @@ -18,9 +18,15 @@ @ApiModelProperty("报警类型id") private Long alarmTypeId; + @ApiModelProperty("报警规则id") + private Long alarmRuleId; + @ApiModelProperty("报警类型名称") private String alarmTypeName; + @ApiModelProperty("报警规则名称") + private String alarmRuleName; + @ApiModelProperty("报警阈值") private String alarmThreshold; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/PrincipalDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/PrincipalDTO.java index 6827906..434a009 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/PrincipalDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/PrincipalDTO.java @@ -18,7 +18,7 @@ @ApiModelProperty("联系方式") private String telephone; - @ApiModelProperty("同步人员id") - private String synId; + @ApiModelProperty("人员编码") + private String account; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java index 0225611..6205a0d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java @@ -40,6 +40,10 @@ @TableField("ALARM_LEVEL_ID") private Long alarmLevelId; + @ApiModelProperty("报警规则ID") + @TableField("ALARM_RULE_ID") + private Long alarmRuleId; + @ApiModelProperty("报警阈值") @TableField("ALARM_THRESHOLD") private String alarmThreshold; 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 3edbb9f..56b1b4c 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 @@ -183,7 +183,6 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); return ReturnUtil.success(iAlarmRecordsService.getPrincipals(idDTO.getId())); - } @PostMapping("/test") @@ -191,6 +190,5 @@ public void test( ) { iAlarmRecordsService.processOffline(); } - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java index dcfa83e..b79e5ac 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java @@ -23,7 +23,8 @@ @Mapper public interface AlarmRuleMapper extends BaseMapper { - @Select(" select ar.ALARM_LEVEL_ID as alarmLevelId ,ar.PRODUCT_ID as productId ,ar.ALARM_THRESHOLD as alarmThreshold,ar.ALARM_TYPE_ID as alarmTypeId,ar.ALARM_NAME as alarmTypeName from alarm_rule ar where ar.PRODUCT_ID in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " + + @Select(" select ar.ALARM_LEVEL_ID as alarmLevelId ,ar.PRODUCT_ID as productId ,ar.ALARM_THRESHOLD as alarmThreshold,ar.ALARM_TYPE_ID as alarmTypeId,at.ALARM_TYPE as alarmTypeName from alarm_rule ar where ar.PRODUCT_ID in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " + + " LEFT JOIN alarm_type at on at.ID=ar.ALARM_TYPE_ID " + " where bd.DEVCODE= #{devCode} and bd.VALID=1 " + ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD desc") List getRuleListByCode(@Param("devCode") String devCode); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index a00ca6f..113b910 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -504,7 +504,7 @@ lr.lngGaode, lr.latGaode, lr.manageType, - sd.full_name AS deptName, + lr.propertyOwner, lr.id as ledgerId, lr.type as watchObject, @@ -518,10 +518,11 @@ AND lr.type = bl.type AND bl.VALID = 1 AND lr.VALID = 1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN alarm_type ay on ay.id = rd.ALARM_TYPE_ID WHERE rd.STATUS = 1 and rd.ID = #{id} + limit 1 @@ -802,4 +803,8 @@ and valid > 0 + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml index bbedb15..ca3066e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml @@ -69,8 +69,10 @@ al.ALARM_LEVEL_ID AS alarmLevelId, al.ALARM_THRESHOLD AS alarmThreshold, ALARM_TYPE_ID AS alarmTypeId, + al.ID AS alarmRuleId, ay.ALARM_TYPE as alarmTypeName, - ac.ALARM_LEVEL as alarmLevelName + ac.ALARM_LEVEL as alarmLevelName, + al.ALARM_NAME as alarmRuleName FROM `bus_device` bd INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java index 31f18e2..56f91dc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java @@ -18,9 +18,15 @@ @ApiModelProperty("报警类型id") private Long alarmTypeId; + @ApiModelProperty("报警规则id") + private Long alarmRuleId; + @ApiModelProperty("报警类型名称") private String alarmTypeName; + @ApiModelProperty("报警规则名称") + private String alarmRuleName; + @ApiModelProperty("报警阈值") private String alarmThreshold; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/PrincipalDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/PrincipalDTO.java index 6827906..434a009 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/PrincipalDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/PrincipalDTO.java @@ -18,7 +18,7 @@ @ApiModelProperty("联系方式") private String telephone; - @ApiModelProperty("同步人员id") - private String synId; + @ApiModelProperty("人员编码") + private String account; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java index 0225611..6205a0d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java @@ -40,6 +40,10 @@ @TableField("ALARM_LEVEL_ID") private Long alarmLevelId; + @ApiModelProperty("报警规则ID") + @TableField("ALARM_RULE_ID") + private Long alarmRuleId; + @ApiModelProperty("报警阈值") @TableField("ALARM_THRESHOLD") private String alarmThreshold; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 6c99ff9..115eecf 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -23,6 +24,7 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; +import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; @@ -56,6 +58,7 @@ private final SuspendLogMapper suspendLogMapper; private final RemindLogMapper remindLogMapper; private final AbstractDictService abstractDictService; + private final AbstractDeptService abstractDeptService; private final IAlarmLevelControlService iAlarmLevelControlService; private final IMessageLogService iMessageLogService; private final WebSocket webSocket; @@ -145,7 +148,19 @@ @Override public List getPrincipals(Long id) { - this.baseMapper.getPrincipals(id); + Map resultMap = new HashMap<>(); + Dept dept = abstractDeptService.getById(id); + if(dept!=null){ + if("grid".equals(dept.getTips())){ + List principalDTOList = this.baseMapper.getPrincipals(id); + resultMap.put("grid",principalDTOList); + if(null!=dept.getPid()){ + + } + + } + } + return null; } @@ -213,6 +228,8 @@ } resultMap.put("alarmCategory", abstractDictService.getDictNameByCode("alarmCategory", resultMap.get("alarmCategory").toString())); resultMap.put("processStatusName", ApprovalStatusEnum.getValue(resultMap.get("PROCESS_STATUS").toString())); + resultMap.put("deptName", ObjectUtil.isNotEmpty(resultMap.get("DEPTID"))&&CommonUtil.isNumber(resultMap.get("DEPTID").toString())? + commonServer.getDeptNamesByDeptId(Long.valueOf(resultMap.get("DEPTID").toString())):""); //0：自有，1：自管 resultMap.put("manageType", DictEnum.MANAGE_TYPE.equals(resultMap.get("manageType").toString()) ? "自有" : "自管"); //设置确认上个处置内容 @@ -575,9 +592,9 @@ try { AlarmRecords alarmRecords = new AlarmRecords(devCode, busLedgerDTO.getLedgerCode(), busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.getAlarmTypeId(), - alarmRuleResponseDTO.getAlarmTypeName(), data, + "燃气浓度达到".concat(data).concat("%LEL"), data, alarmRuleResponseDTO.getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)), - alarmRuleResponseDTO.getAlarmTypeName(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0"); + "燃气浓度达到".concat(data).concat("%LEL"), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0"); this.save(alarmRecords); alarmId = alarmRecords.getId(); } catch (Exception e) { @@ -588,9 +605,9 @@ //保存消息通知 iMessageLogService.save(new MessageLog(alarmId, DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(), ObjectUtil.isNotEmpty(busWellDTOList) ? busWellDTOList.get(0).getTagNumber(). + concat("|"). concat(busWellDTOList.get(0).getLedgerName()). - concat(alarmRuleResponseDTO.getAlarmTypeName()). - concat("，浓度值为").concat(data).concat("%LEL") : "", + concat("发现浓度超限，浓度值为").concat(data).concat("%LEL") : "", ObjectUtil.isNotEmpty(busWellDTOList) ? busWellDTOList.get(0).getTagNumber() : "")); final Long alarmIds = alarmId; 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 3edbb9f..56b1b4c 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 @@ -183,7 +183,6 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); return ReturnUtil.success(iAlarmRecordsService.getPrincipals(idDTO.getId())); - } @PostMapping("/test") @@ -191,6 +190,5 @@ public void test( ) { iAlarmRecordsService.processOffline(); } - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java index dcfa83e..b79e5ac 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRuleMapper.java @@ -23,7 +23,8 @@ @Mapper public interface AlarmRuleMapper extends BaseMapper { - @Select(" select ar.ALARM_LEVEL_ID as alarmLevelId ,ar.PRODUCT_ID as productId ,ar.ALARM_THRESHOLD as alarmThreshold,ar.ALARM_TYPE_ID as alarmTypeId,ar.ALARM_NAME as alarmTypeName from alarm_rule ar where ar.PRODUCT_ID in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " + + @Select(" select ar.ALARM_LEVEL_ID as alarmLevelId ,ar.PRODUCT_ID as productId ,ar.ALARM_THRESHOLD as alarmThreshold,ar.ALARM_TYPE_ID as alarmTypeId,at.ALARM_TYPE as alarmTypeName from alarm_rule ar where ar.PRODUCT_ID in(SELECT bd.PRODUCT_ID FROM `bus_device` bd " + + " LEFT JOIN alarm_type at on at.ID=ar.ALARM_TYPE_ID " + " where bd.DEVCODE= #{devCode} and bd.VALID=1 " + ") and ar.ALARM_JUDGE_METHOD=1 order by ALARM_THRESHOLD desc") List getRuleListByCode(@Param("devCode") String devCode); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index a00ca6f..113b910 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -504,7 +504,7 @@ lr.lngGaode, lr.latGaode, lr.manageType, - sd.full_name AS deptName, + lr.propertyOwner, lr.id as ledgerId, lr.type as watchObject, @@ -518,10 +518,11 @@ AND lr.type = bl.type AND bl.VALID = 1 AND lr.VALID = 1 - LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID + LEFT JOIN alarm_type ay on ay.id = rd.ALARM_TYPE_ID WHERE rd.STATUS = 1 and rd.ID = #{id} + limit 1 @@ -802,4 +803,8 @@ and valid > 0 + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml index bbedb15..ca3066e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml @@ -69,8 +69,10 @@ al.ALARM_LEVEL_ID AS alarmLevelId, al.ALARM_THRESHOLD AS alarmThreshold, ALARM_TYPE_ID AS alarmTypeId, + al.ID AS alarmRuleId, ay.ALARM_TYPE as alarmTypeName, - ac.ALARM_LEVEL as alarmLevelName + ac.ALARM_LEVEL as alarmLevelName, + al.ALARM_NAME as alarmRuleName FROM `bus_device` bd INNER JOIN alarm_rule al ON al.PRODUCT_ID = bd.PRODUCT_ID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java index 31f18e2..56f91dc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleSpecialDTO.java @@ -18,9 +18,15 @@ @ApiModelProperty("报警类型id") private Long alarmTypeId; + @ApiModelProperty("报警规则id") + private Long alarmRuleId; + @ApiModelProperty("报警类型名称") private String alarmTypeName; + @ApiModelProperty("报警规则名称") + private String alarmRuleName; + @ApiModelProperty("报警阈值") private String alarmThreshold; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/PrincipalDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/PrincipalDTO.java index 6827906..434a009 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/PrincipalDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/PrincipalDTO.java @@ -18,7 +18,7 @@ @ApiModelProperty("联系方式") private String telephone; - @ApiModelProperty("同步人员id") - private String synId; + @ApiModelProperty("人员编码") + private String account; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java index 0225611..6205a0d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java @@ -40,6 +40,10 @@ @TableField("ALARM_LEVEL_ID") private Long alarmLevelId; + @ApiModelProperty("报警规则ID") + @TableField("ALARM_RULE_ID") + private Long alarmRuleId; + @ApiModelProperty("报警阈值") @TableField("ALARM_THRESHOLD") private String alarmThreshold; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 6c99ff9..115eecf 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -23,6 +24,7 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; +import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; @@ -56,6 +58,7 @@ private final SuspendLogMapper suspendLogMapper; private final RemindLogMapper remindLogMapper; private final AbstractDictService abstractDictService; + private final AbstractDeptService abstractDeptService; private final IAlarmLevelControlService iAlarmLevelControlService; private final IMessageLogService iMessageLogService; private final WebSocket webSocket; @@ -145,7 +148,19 @@ @Override public List getPrincipals(Long id) { - this.baseMapper.getPrincipals(id); + Map resultMap = new HashMap<>(); + Dept dept = abstractDeptService.getById(id); + if(dept!=null){ + if("grid".equals(dept.getTips())){ + List principalDTOList = this.baseMapper.getPrincipals(id); + resultMap.put("grid",principalDTOList); + if(null!=dept.getPid()){ + + } + + } + } + return null; } @@ -213,6 +228,8 @@ } resultMap.put("alarmCategory", abstractDictService.getDictNameByCode("alarmCategory", resultMap.get("alarmCategory").toString())); resultMap.put("processStatusName", ApprovalStatusEnum.getValue(resultMap.get("PROCESS_STATUS").toString())); + resultMap.put("deptName", ObjectUtil.isNotEmpty(resultMap.get("DEPTID"))&&CommonUtil.isNumber(resultMap.get("DEPTID").toString())? + commonServer.getDeptNamesByDeptId(Long.valueOf(resultMap.get("DEPTID").toString())):""); //0：自有，1：自管 resultMap.put("manageType", DictEnum.MANAGE_TYPE.equals(resultMap.get("manageType").toString()) ? "自有" : "自管"); //设置确认上个处置内容 @@ -575,9 +592,9 @@ try { AlarmRecords alarmRecords = new AlarmRecords(devCode, busLedgerDTO.getLedgerCode(), busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.getAlarmTypeId(), - alarmRuleResponseDTO.getAlarmTypeName(), data, + "燃气浓度达到".concat(data).concat("%LEL"), data, alarmRuleResponseDTO.getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)), - alarmRuleResponseDTO.getAlarmTypeName(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0"); + "燃气浓度达到".concat(data).concat("%LEL"), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0"); this.save(alarmRecords); alarmId = alarmRecords.getId(); } catch (Exception e) { @@ -588,9 +605,9 @@ //保存消息通知 iMessageLogService.save(new MessageLog(alarmId, DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(), ObjectUtil.isNotEmpty(busWellDTOList) ? busWellDTOList.get(0).getTagNumber(). + concat("|"). concat(busWellDTOList.get(0).getLedgerName()). - concat(alarmRuleResponseDTO.getAlarmTypeName()). - concat("，浓度值为").concat(data).concat("%LEL") : "", + concat("发现浓度超限，浓度值为").concat(data).concat("%LEL") : "", ObjectUtil.isNotEmpty(busWellDTOList) ? busWellDTOList.get(0).getTagNumber() : "")); final Long alarmIds = alarmId; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java index 37e4a9a..1d9a090 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java @@ -8,8 +8,10 @@ import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRule; import com.casic.missiles.modular.alarm.entity.AlarmRuleDevice; +import com.casic.missiles.modular.alarm.entity.AlarmType; import com.casic.missiles.modular.alarm.service.IAlarmRuleDeviceService; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; +import com.casic.missiles.modular.alarm.service.IAlarmTypeService; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -31,6 +33,7 @@ public class AlarmRuleServiceImpl extends ServiceImpl implements IAlarmRuleService { private final IAlarmRuleDeviceService iAlarmRuleDeviceService; + private final IAlarmTypeService iAlarmTypeService; @Transactional @Override @@ -90,7 +93,10 @@ alarmRuleResponseDTO.setAlarmThreshold(alarmRuleDevice.getAlarmThreshold()); alarmRuleResponseDTO.setAlarmLevelId(alarmRuleDevice.getAlarmLevelId()); alarmRuleResponseDTO.setAlarmTypeId(alarmRuleDevice.getAlarmTypeId()); - alarmRuleResponseDTO.setAlarmTypeName(alarmRuleDevice.getAlarmRule()); + if(null!=alarmRuleDevice.getAlarmTypeId()){ + AlarmType alarmType = iAlarmTypeService.getById(alarmRuleDevice.getAlarmTypeId()); + alarmRuleResponseDTO.setAlarmTypeName(alarmType!=null?alarmType.getAlarmType():""); + } alarmRuleResponseDTOS.add(alarmRuleResponseDTO); } }