diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index 76bedfd..000366b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -11,12 +11,12 @@ import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO; -import com.casic.missiles.modular.alarm.dto.RemindDTO; +import com.casic.missiles.modular.alarm.dto.HandleDTO; import com.casic.missiles.modular.alarm.dto.SuspendDTO; -import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.util.ReturnUtil; import io.swagger.annotations.Api; @@ -66,13 +66,13 @@ @ApiOperation("查看") - @PostMapping("/view") + @PostMapping("/deviceAlarmView") @ResponseBody public ReturnDTO view(@RequestBody IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId(), DictEnum.DEVICE_EXCEPTION)); } @ApiOperation("批量删除") @@ -95,24 +95,14 @@ return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO)); } - @ApiOperation("已读") - @PostMapping("/read") + @ApiOperation("报警处置") + @PostMapping("/handle") @ResponseBody - public ReturnDTO read(@RequestBody IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + public ReturnDTO remind(@RequestBody HandleDTO handleDTO) { + Assert.isFalse(Objects.isNull(handleDTO.getAlarmId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId())); - } - - @ApiOperation("提醒责任人") - @PostMapping("/remind") - @ResponseBody - public ReturnDTO remind(@RequestBody RemindDTO remindDTO) { - Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO)); + return ReturnUtil.success(iAlarmRecordsService.handle(handleDTO)); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index 76bedfd..000366b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -11,12 +11,12 @@ import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO; -import com.casic.missiles.modular.alarm.dto.RemindDTO; +import com.casic.missiles.modular.alarm.dto.HandleDTO; import com.casic.missiles.modular.alarm.dto.SuspendDTO; -import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.util.ReturnUtil; import io.swagger.annotations.Api; @@ -66,13 +66,13 @@ @ApiOperation("查看") - @PostMapping("/view") + @PostMapping("/deviceAlarmView") @ResponseBody public ReturnDTO view(@RequestBody IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId(), DictEnum.DEVICE_EXCEPTION)); } @ApiOperation("批量删除") @@ -95,24 +95,14 @@ return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO)); } - @ApiOperation("已读") - @PostMapping("/read") + @ApiOperation("报警处置") + @PostMapping("/handle") @ResponseBody - public ReturnDTO read(@RequestBody IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + public ReturnDTO remind(@RequestBody HandleDTO handleDTO) { + Assert.isFalse(Objects.isNull(handleDTO.getAlarmId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId())); - } - - @ApiOperation("提醒责任人") - @PostMapping("/remind") - @ResponseBody - public ReturnDTO remind(@RequestBody RemindDTO remindDTO) { - Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO)); + return ReturnUtil.success(iAlarmRecordsService.handle(handleDTO)); } } 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 272d850..3644556 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 @@ -12,6 +12,7 @@ import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.dto.RemindDTO; @@ -82,7 +83,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId(), DictEnum.DATA_EXCEPTION)); } @ApiOperation("批量删除") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index 76bedfd..000366b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -11,12 +11,12 @@ import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO; -import com.casic.missiles.modular.alarm.dto.RemindDTO; +import com.casic.missiles.modular.alarm.dto.HandleDTO; import com.casic.missiles.modular.alarm.dto.SuspendDTO; -import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.util.ReturnUtil; import io.swagger.annotations.Api; @@ -66,13 +66,13 @@ @ApiOperation("查看") - @PostMapping("/view") + @PostMapping("/deviceAlarmView") @ResponseBody public ReturnDTO view(@RequestBody IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId(), DictEnum.DEVICE_EXCEPTION)); } @ApiOperation("批量删除") @@ -95,24 +95,14 @@ return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO)); } - @ApiOperation("已读") - @PostMapping("/read") + @ApiOperation("报警处置") + @PostMapping("/handle") @ResponseBody - public ReturnDTO read(@RequestBody IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + public ReturnDTO remind(@RequestBody HandleDTO handleDTO) { + Assert.isFalse(Objects.isNull(handleDTO.getAlarmId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId())); - } - - @ApiOperation("提醒责任人") - @PostMapping("/remind") - @ResponseBody - public ReturnDTO remind(@RequestBody RemindDTO remindDTO) { - Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO)); + return ReturnUtil.success(iAlarmRecordsService.handle(handleDTO)); } } 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 272d850..3644556 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 @@ -12,6 +12,7 @@ import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.dto.RemindDTO; @@ -82,7 +83,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId(), DictEnum.DATA_EXCEPTION)); } @ApiOperation("批量删除") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/HandleDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/HandleDTO.java new file mode 100644 index 0000000..3798ed0 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/HandleDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.alarm.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class HandleDTO { + + @ApiModelProperty(value = "报警主键id",required = true) + private Long alarmId; + + @ApiModelProperty("处置人员") + private String handlePerson; + + @ApiModelProperty("处置人员id") + private Long handlePersonId; + + @ApiModelProperty("是否误报(0,误报，1真实报警)") + private String realAlarm; + + @ApiModelProperty("处置情况") + private String handleContent; + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index 76bedfd..000366b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -11,12 +11,12 @@ import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO; -import com.casic.missiles.modular.alarm.dto.RemindDTO; +import com.casic.missiles.modular.alarm.dto.HandleDTO; import com.casic.missiles.modular.alarm.dto.SuspendDTO; -import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.util.ReturnUtil; import io.swagger.annotations.Api; @@ -66,13 +66,13 @@ @ApiOperation("查看") - @PostMapping("/view") + @PostMapping("/deviceAlarmView") @ResponseBody public ReturnDTO view(@RequestBody IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId(), DictEnum.DEVICE_EXCEPTION)); } @ApiOperation("批量删除") @@ -95,24 +95,14 @@ return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO)); } - @ApiOperation("已读") - @PostMapping("/read") + @ApiOperation("报警处置") + @PostMapping("/handle") @ResponseBody - public ReturnDTO read(@RequestBody IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + public ReturnDTO remind(@RequestBody HandleDTO handleDTO) { + Assert.isFalse(Objects.isNull(handleDTO.getAlarmId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId())); - } - - @ApiOperation("提醒责任人") - @PostMapping("/remind") - @ResponseBody - public ReturnDTO remind(@RequestBody RemindDTO remindDTO) { - Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO)); + return ReturnUtil.success(iAlarmRecordsService.handle(handleDTO)); } } 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 272d850..3644556 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 @@ -12,6 +12,7 @@ import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.dto.RemindDTO; @@ -82,7 +83,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId(), DictEnum.DATA_EXCEPTION)); } @ApiOperation("批量删除") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/HandleDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/HandleDTO.java new file mode 100644 index 0000000..3798ed0 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/HandleDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.alarm.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class HandleDTO { + + @ApiModelProperty(value = "报警主键id",required = true) + private Long alarmId; + + @ApiModelProperty("处置人员") + private String handlePerson; + + @ApiModelProperty("处置人员id") + private Long handlePersonId; + + @ApiModelProperty("是否误报(0,误报，1真实报警)") + private String realAlarm; + + @ApiModelProperty("处置情况") + private String handleContent; + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java index 31e584f..b3fe40c 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java @@ -44,6 +44,10 @@ @TableField("APPROVAL_PERSON") private String approvalPerson; + @ApiModelProperty("审批人ID") + @TableField("APPROVAL_PERSON_ID") + private Long approvalPersonId; + @ApiModelProperty("审批时间") @TableField("APPROVAL_TIME") private Date approvalTime; @@ -59,10 +63,11 @@ public ApprovalLog() { } - public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus) { + public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus,Long approvalPersonId) { this.alarmId = alarmId; this.approvalStatus = approvalStatus; this.approvalPerson = approvalPerson; this.flowStatus = flowStatus; + this.approvalPersonId = approvalPersonId; } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index 76bedfd..000366b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -11,12 +11,12 @@ import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO; -import com.casic.missiles.modular.alarm.dto.RemindDTO; +import com.casic.missiles.modular.alarm.dto.HandleDTO; import com.casic.missiles.modular.alarm.dto.SuspendDTO; -import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.util.ReturnUtil; import io.swagger.annotations.Api; @@ -66,13 +66,13 @@ @ApiOperation("查看") - @PostMapping("/view") + @PostMapping("/deviceAlarmView") @ResponseBody public ReturnDTO view(@RequestBody IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId(), DictEnum.DEVICE_EXCEPTION)); } @ApiOperation("批量删除") @@ -95,24 +95,14 @@ return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO)); } - @ApiOperation("已读") - @PostMapping("/read") + @ApiOperation("报警处置") + @PostMapping("/handle") @ResponseBody - public ReturnDTO read(@RequestBody IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + public ReturnDTO remind(@RequestBody HandleDTO handleDTO) { + Assert.isFalse(Objects.isNull(handleDTO.getAlarmId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId())); - } - - @ApiOperation("提醒责任人") - @PostMapping("/remind") - @ResponseBody - public ReturnDTO remind(@RequestBody RemindDTO remindDTO) { - Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO)); + return ReturnUtil.success(iAlarmRecordsService.handle(handleDTO)); } } 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 272d850..3644556 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 @@ -12,6 +12,7 @@ import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.dto.RemindDTO; @@ -82,7 +83,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId(), DictEnum.DATA_EXCEPTION)); } @ApiOperation("批量删除") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/HandleDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/HandleDTO.java new file mode 100644 index 0000000..3798ed0 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/HandleDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.alarm.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class HandleDTO { + + @ApiModelProperty(value = "报警主键id",required = true) + private Long alarmId; + + @ApiModelProperty("处置人员") + private String handlePerson; + + @ApiModelProperty("处置人员id") + private Long handlePersonId; + + @ApiModelProperty("是否误报(0,误报，1真实报警)") + private String realAlarm; + + @ApiModelProperty("处置情况") + private String handleContent; + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java index 31e584f..b3fe40c 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java @@ -44,6 +44,10 @@ @TableField("APPROVAL_PERSON") private String approvalPerson; + @ApiModelProperty("审批人ID") + @TableField("APPROVAL_PERSON_ID") + private Long approvalPersonId; + @ApiModelProperty("审批时间") @TableField("APPROVAL_TIME") private Date approvalTime; @@ -59,10 +63,11 @@ public ApprovalLog() { } - public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus) { + public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus,Long approvalPersonId) { this.alarmId = alarmId; this.approvalStatus = approvalStatus; this.approvalPerson = approvalPerson; this.flowStatus = flowStatus; + this.approvalPersonId = approvalPersonId; } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java index e373fd9..3573fd5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java @@ -40,6 +40,10 @@ @TableField("REMIND_PERSON") private String remindPerson; + @ApiModelProperty("提醒人员id") + @TableField("REMIND_PERSON_ID") + private Long remindPersonId; + @ApiModelProperty("联系方式") @TableField("TELEPHONE") private String telephone; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index 76bedfd..000366b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -11,12 +11,12 @@ import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO; -import com.casic.missiles.modular.alarm.dto.RemindDTO; +import com.casic.missiles.modular.alarm.dto.HandleDTO; import com.casic.missiles.modular.alarm.dto.SuspendDTO; -import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.util.ReturnUtil; import io.swagger.annotations.Api; @@ -66,13 +66,13 @@ @ApiOperation("查看") - @PostMapping("/view") + @PostMapping("/deviceAlarmView") @ResponseBody public ReturnDTO view(@RequestBody IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId(), DictEnum.DEVICE_EXCEPTION)); } @ApiOperation("批量删除") @@ -95,24 +95,14 @@ return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO)); } - @ApiOperation("已读") - @PostMapping("/read") + @ApiOperation("报警处置") + @PostMapping("/handle") @ResponseBody - public ReturnDTO read(@RequestBody IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + public ReturnDTO remind(@RequestBody HandleDTO handleDTO) { + Assert.isFalse(Objects.isNull(handleDTO.getAlarmId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId())); - } - - @ApiOperation("提醒责任人") - @PostMapping("/remind") - @ResponseBody - public ReturnDTO remind(@RequestBody RemindDTO remindDTO) { - Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO)); + return ReturnUtil.success(iAlarmRecordsService.handle(handleDTO)); } } 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 272d850..3644556 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 @@ -12,6 +12,7 @@ import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.dto.RemindDTO; @@ -82,7 +83,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId(), DictEnum.DATA_EXCEPTION)); } @ApiOperation("批量删除") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/HandleDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/HandleDTO.java new file mode 100644 index 0000000..3798ed0 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/HandleDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.alarm.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class HandleDTO { + + @ApiModelProperty(value = "报警主键id",required = true) + private Long alarmId; + + @ApiModelProperty("处置人员") + private String handlePerson; + + @ApiModelProperty("处置人员id") + private Long handlePersonId; + + @ApiModelProperty("是否误报(0,误报，1真实报警)") + private String realAlarm; + + @ApiModelProperty("处置情况") + private String handleContent; + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java index 31e584f..b3fe40c 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java @@ -44,6 +44,10 @@ @TableField("APPROVAL_PERSON") private String approvalPerson; + @ApiModelProperty("审批人ID") + @TableField("APPROVAL_PERSON_ID") + private Long approvalPersonId; + @ApiModelProperty("审批时间") @TableField("APPROVAL_TIME") private Date approvalTime; @@ -59,10 +63,11 @@ public ApprovalLog() { } - public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus) { + public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus,Long approvalPersonId) { this.alarmId = alarmId; this.approvalStatus = approvalStatus; this.approvalPerson = approvalPerson; this.flowStatus = flowStatus; + this.approvalPersonId = approvalPersonId; } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java index e373fd9..3573fd5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java @@ -40,6 +40,10 @@ @TableField("REMIND_PERSON") private String remindPerson; + @ApiModelProperty("提醒人员id") + @TableField("REMIND_PERSON_ID") + private Long remindPersonId; + @ApiModelProperty("联系方式") @TableField("TELEPHONE") private String telephone; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java index 9b8b2d5..85a2cac 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java @@ -48,6 +48,10 @@ @TableField("CREATE_PERSON") private String createPerson; + @ApiModelProperty("创建人id") + @TableField("CREATE_PERSON_ID") + private Long createPersonId; + @ApiModelProperty("截止日期") @TableField("EXPIRE_TIME") @@ -68,11 +72,12 @@ public SuspendLog() { } - public SuspendLog(Long alarmId, String suspendReason, String suspendTime, String createPerson,Date expireTime) { + public SuspendLog(Long alarmId, String suspendReason, String suspendTime, String createPerson,Long createPersonId,Date expireTime) { this.alarmId = alarmId; this.suspendReason = suspendReason; this.suspendTime = suspendTime; this.createPerson = createPerson; this.expireTime = expireTime; + this.createPersonId = createPersonId; } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index 76bedfd..000366b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -11,12 +11,12 @@ import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO; -import com.casic.missiles.modular.alarm.dto.RemindDTO; +import com.casic.missiles.modular.alarm.dto.HandleDTO; import com.casic.missiles.modular.alarm.dto.SuspendDTO; -import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.util.ReturnUtil; import io.swagger.annotations.Api; @@ -66,13 +66,13 @@ @ApiOperation("查看") - @PostMapping("/view") + @PostMapping("/deviceAlarmView") @ResponseBody public ReturnDTO view(@RequestBody IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId(), DictEnum.DEVICE_EXCEPTION)); } @ApiOperation("批量删除") @@ -95,24 +95,14 @@ return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO)); } - @ApiOperation("已读") - @PostMapping("/read") + @ApiOperation("报警处置") + @PostMapping("/handle") @ResponseBody - public ReturnDTO read(@RequestBody IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + public ReturnDTO remind(@RequestBody HandleDTO handleDTO) { + Assert.isFalse(Objects.isNull(handleDTO.getAlarmId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId())); - } - - @ApiOperation("提醒责任人") - @PostMapping("/remind") - @ResponseBody - public ReturnDTO remind(@RequestBody RemindDTO remindDTO) { - Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO)); + return ReturnUtil.success(iAlarmRecordsService.handle(handleDTO)); } } 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 272d850..3644556 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 @@ -12,6 +12,7 @@ import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.dto.RemindDTO; @@ -82,7 +83,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId(), DictEnum.DATA_EXCEPTION)); } @ApiOperation("批量删除") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/HandleDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/HandleDTO.java new file mode 100644 index 0000000..3798ed0 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/HandleDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.alarm.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class HandleDTO { + + @ApiModelProperty(value = "报警主键id",required = true) + private Long alarmId; + + @ApiModelProperty("处置人员") + private String handlePerson; + + @ApiModelProperty("处置人员id") + private Long handlePersonId; + + @ApiModelProperty("是否误报(0,误报，1真实报警)") + private String realAlarm; + + @ApiModelProperty("处置情况") + private String handleContent; + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java index 31e584f..b3fe40c 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java @@ -44,6 +44,10 @@ @TableField("APPROVAL_PERSON") private String approvalPerson; + @ApiModelProperty("审批人ID") + @TableField("APPROVAL_PERSON_ID") + private Long approvalPersonId; + @ApiModelProperty("审批时间") @TableField("APPROVAL_TIME") private Date approvalTime; @@ -59,10 +63,11 @@ public ApprovalLog() { } - public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus) { + public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus,Long approvalPersonId) { this.alarmId = alarmId; this.approvalStatus = approvalStatus; this.approvalPerson = approvalPerson; this.flowStatus = flowStatus; + this.approvalPersonId = approvalPersonId; } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java index e373fd9..3573fd5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java @@ -40,6 +40,10 @@ @TableField("REMIND_PERSON") private String remindPerson; + @ApiModelProperty("提醒人员id") + @TableField("REMIND_PERSON_ID") + private Long remindPersonId; + @ApiModelProperty("联系方式") @TableField("TELEPHONE") private String telephone; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java index 9b8b2d5..85a2cac 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java @@ -48,6 +48,10 @@ @TableField("CREATE_PERSON") private String createPerson; + @ApiModelProperty("创建人id") + @TableField("CREATE_PERSON_ID") + private Long createPersonId; + @ApiModelProperty("截止日期") @TableField("EXPIRE_TIME") @@ -68,11 +72,12 @@ public SuspendLog() { } - public SuspendLog(Long alarmId, String suspendReason, String suspendTime, String createPerson,Date expireTime) { + public SuspendLog(Long alarmId, String suspendReason, String suspendTime, String createPerson,Long createPersonId,Date expireTime) { this.alarmId = alarmId; this.suspendReason = suspendReason; this.suspendTime = suspendTime; this.createPerson = createPerson; this.expireTime = expireTime; + this.createPersonId = createPersonId; } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 3160355..af572ad 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -3,10 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; -import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO; -import com.casic.missiles.modular.alarm.dto.RemindDTO; -import com.casic.missiles.modular.alarm.dto.SuspendDTO; +import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import java.util.List; @@ -32,12 +29,14 @@ Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); - AlarmRecords view(Long id); + AlarmRecords view(Long id,String exceptionType); boolean suspend(SuspendDTO suspendDTO); boolean remind(RemindDTO remindDTO); + boolean handle(HandleDTO handleDTO); + boolean read(Long id); List changeProcessStatus(List ids); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index 76bedfd..000366b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -11,12 +11,12 @@ import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO; -import com.casic.missiles.modular.alarm.dto.RemindDTO; +import com.casic.missiles.modular.alarm.dto.HandleDTO; import com.casic.missiles.modular.alarm.dto.SuspendDTO; -import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.util.ReturnUtil; import io.swagger.annotations.Api; @@ -66,13 +66,13 @@ @ApiOperation("查看") - @PostMapping("/view") + @PostMapping("/deviceAlarmView") @ResponseBody public ReturnDTO view(@RequestBody IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId(), DictEnum.DEVICE_EXCEPTION)); } @ApiOperation("批量删除") @@ -95,24 +95,14 @@ return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO)); } - @ApiOperation("已读") - @PostMapping("/read") + @ApiOperation("报警处置") + @PostMapping("/handle") @ResponseBody - public ReturnDTO read(@RequestBody IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + public ReturnDTO remind(@RequestBody HandleDTO handleDTO) { + Assert.isFalse(Objects.isNull(handleDTO.getAlarmId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId())); - } - - @ApiOperation("提醒责任人") - @PostMapping("/remind") - @ResponseBody - public ReturnDTO remind(@RequestBody RemindDTO remindDTO) { - Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO)); + return ReturnUtil.success(iAlarmRecordsService.handle(handleDTO)); } } 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 272d850..3644556 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 @@ -12,6 +12,7 @@ import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.dto.RemindDTO; @@ -82,7 +83,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId(), DictEnum.DATA_EXCEPTION)); } @ApiOperation("批量删除") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/HandleDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/HandleDTO.java new file mode 100644 index 0000000..3798ed0 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/HandleDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.alarm.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class HandleDTO { + + @ApiModelProperty(value = "报警主键id",required = true) + private Long alarmId; + + @ApiModelProperty("处置人员") + private String handlePerson; + + @ApiModelProperty("处置人员id") + private Long handlePersonId; + + @ApiModelProperty("是否误报(0,误报，1真实报警)") + private String realAlarm; + + @ApiModelProperty("处置情况") + private String handleContent; + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java index 31e584f..b3fe40c 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java @@ -44,6 +44,10 @@ @TableField("APPROVAL_PERSON") private String approvalPerson; + @ApiModelProperty("审批人ID") + @TableField("APPROVAL_PERSON_ID") + private Long approvalPersonId; + @ApiModelProperty("审批时间") @TableField("APPROVAL_TIME") private Date approvalTime; @@ -59,10 +63,11 @@ public ApprovalLog() { } - public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus) { + public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus,Long approvalPersonId) { this.alarmId = alarmId; this.approvalStatus = approvalStatus; this.approvalPerson = approvalPerson; this.flowStatus = flowStatus; + this.approvalPersonId = approvalPersonId; } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java index e373fd9..3573fd5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java @@ -40,6 +40,10 @@ @TableField("REMIND_PERSON") private String remindPerson; + @ApiModelProperty("提醒人员id") + @TableField("REMIND_PERSON_ID") + private Long remindPersonId; + @ApiModelProperty("联系方式") @TableField("TELEPHONE") private String telephone; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java index 9b8b2d5..85a2cac 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java @@ -48,6 +48,10 @@ @TableField("CREATE_PERSON") private String createPerson; + @ApiModelProperty("创建人id") + @TableField("CREATE_PERSON_ID") + private Long createPersonId; + @ApiModelProperty("截止日期") @TableField("EXPIRE_TIME") @@ -68,11 +72,12 @@ public SuspendLog() { } - public SuspendLog(Long alarmId, String suspendReason, String suspendTime, String createPerson,Date expireTime) { + public SuspendLog(Long alarmId, String suspendReason, String suspendTime, String createPerson,Long createPersonId,Date expireTime) { this.alarmId = alarmId; this.suspendReason = suspendReason; this.suspendTime = suspendTime; this.createPerson = createPerson; this.expireTime = expireTime; + this.createPersonId = createPersonId; } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 3160355..af572ad 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -3,10 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; -import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO; -import com.casic.missiles.modular.alarm.dto.RemindDTO; -import com.casic.missiles.modular.alarm.dto.SuspendDTO; +import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import java.util.List; @@ -32,12 +29,14 @@ Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); - AlarmRecords view(Long id); + AlarmRecords view(Long id,String exceptionType); boolean suspend(SuspendDTO suspendDTO); boolean remind(RemindDTO remindDTO); + boolean handle(HandleDTO handleDTO); + boolean read(Long id); List changeProcessStatus(List ids); 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 36ba638..6a1ffe1 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 @@ -8,6 +8,7 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.DictEnum; @@ -15,10 +16,7 @@ import com.casic.missiles.modular.alarm.dao.ApprovalLogMapper; import com.casic.missiles.modular.alarm.dao.RemindLogMapper; import com.casic.missiles.modular.alarm.dao.SuspendLogMapper; -import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; -import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO; -import com.casic.missiles.modular.alarm.dto.RemindDTO; -import com.casic.missiles.modular.alarm.dto.SuspendDTO; +import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.entity.ApprovalLog; import com.casic.missiles.modular.alarm.entity.RemindLog; @@ -56,7 +54,7 @@ @Override public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope,getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope, getDeptIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); @@ -66,7 +64,7 @@ @Override public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope,getDeptIds(request.getDeptId())); + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope, getDeptIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -89,7 +87,7 @@ @Override public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope,getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope, getDeptIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "否" : "是"); @@ -99,7 +97,7 @@ @Override public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, dataScope,getDeptIds(request.getDeptId())); + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, dataScope, getDeptIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -108,9 +106,28 @@ return deviceAlarmListPage; } + /*** + * + * @param id + * @param exceptionType 为1时设备异常，0时数据异常,查看后流程不一样 + * @return + */ @Override - public AlarmRecords view(Long id) { + public AlarmRecords view(Long id, String exceptionType) { AlarmRecords alarmRecords = this.baseMapper.view(id); + //若状态为未读时，改为已读 + if (ApprovalStatusEnum.UNREAD.getCode().equals(alarmRecords.getProcessStatus())) { + String processStatus = DictEnum.DATA_EXCEPTION.equals(exceptionType) ? + ApprovalStatusEnum.READ.getCode() : ApprovalStatusEnum.UNPROCESS.getCode(); + //1、更新报警状态 + alarmRecords.setProcessStatus(processStatus); + updateById(alarmRecords); + //2、写入流程日志 + AuthUser user = permissionContext.getAuthService().getLoginUser(); + approvalLogMapper.insert(new ApprovalLog(id, "1", + user != null ? user.getName() : "", processStatus, + user != null ? user.getId() : null)); + } alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); //0：自有，1：自管 alarmRecords.setManageType(DictEnum.MANAGE_TYPE.equals(alarmRecords.getManageType()) ? "自有" : "自管"); @@ -127,11 +144,19 @@ alarmRecords.setProcessStatus(ApprovalStatusEnum.SUSPEND.getCode()); this.baseMapper.updateById(alarmRecords); //2、写入流程日志 - String loginPersonName = permissionContext.getAuthService().getLoginUser().getName(); - approvalLogMapper.insert(new ApprovalLog(suspendDTO.getAlarmId(), "1", loginPersonName, ApprovalStatusEnum.SUSPEND.getCode())); + AuthUser user = permissionContext.getAuthService().getLoginUser(); + approvalLogMapper.insert(new ApprovalLog(suspendDTO.getAlarmId(), "1", + user != null ? user.getName() : "", ApprovalStatusEnum.SUSPEND.getCode(), + user != null ? user.getId() : null)); //3、写入挂起日志表 Date expireTime = DateUtil.offsetHour(new Date(), Integer.decode(suspendDTO.getSuspendTime())); - return suspendLogMapper.insert(new SuspendLog(suspendDTO.getAlarmId(), suspendDTO.getSuspendReason(), suspendDTO.getSuspendTime(), loginPersonName, expireTime)) > 0 ? true : false; + return suspendLogMapper.insert(new SuspendLog(suspendDTO.getAlarmId(), + suspendDTO.getSuspendReason(), + suspendDTO.getSuspendTime(), + user != null ? user.getName() : "", + user != null ? user.getId() : null, + expireTime)) + > 0 ? true : false; } @Transactional @@ -143,7 +168,12 @@ alarmRecords.setProcessStatus(ApprovalStatusEnum.READ.getCode()); this.baseMapper.updateById(alarmRecords); //2、写入流程日志 - return approvalLogMapper.insert(new ApprovalLog(id, "1", permissionContext.getAuthService().getLoginUser().getName(), ApprovalStatusEnum.READ.getCode())) > 0 ? true : false; + AuthUser user = permissionContext.getAuthService().getLoginUser(); + return approvalLogMapper.insert(new ApprovalLog(id, "1", + user != null ? user.getName() : "", + ApprovalStatusEnum.READ.getCode(), + user != null ? user.getId() : null)) + > 0 ? true : false; } @@ -158,15 +188,19 @@ alarmRecords.setProcessStatus(ApprovalStatusEnum.UNCONFIRM.getCode()); this.baseMapper.updateById(alarmRecords); //3、写入流程日志 - String loginPersonName = permissionContext.getAuthService().getLoginUser().getName(); - approvalLogMapper.insert(new ApprovalLog(remindDTO.getAlarmId(), "1", loginPersonName, ApprovalStatusEnum.UNCONFIRM.getCode())); + AuthUser user = permissionContext.getAuthService().getLoginUser(); + approvalLogMapper.insert(new ApprovalLog(remindDTO.getAlarmId(), "1", + user != null ? user.getName() : "", ApprovalStatusEnum.UNCONFIRM.getCode(), + user != null ? user.getId() : null)); //4、写入提醒日志表 return remindLogMapper.insert(RemindLog.builder() .alarmId(remindDTO.getAlarmId()) .remindContent(remindDTO.getRemindContent()) .remindPerson(remindDTO.getRemindPerson()) .telephone(remindDTO.getTelephone()) - .remindPerson(loginPersonName).build()) > 0 ? true : false; + .remindPersonId(user != null ? user.getId() : null) + .remindPerson(user != null ? user.getName() : "").build()) + > 0 ? true : false; } @@ -181,6 +215,23 @@ } @Override + public boolean handle(HandleDTO handleDTO) { + //1、更新报警表流程状态 + AlarmRecords alarmRecords = getById(handleDTO.getAlarmId()); + alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus()); + alarmRecords.setProcessStatus(ApprovalStatusEnum.PROCESSED.getCode()); + alarmRecords.setRealAlarm(handleDTO.getRealAlarm()); + this.baseMapper.updateById(alarmRecords); + //2、写入流程日志 + AuthUser user = permissionContext.getAuthService().getLoginUser(); + approvalLogMapper.insert(new ApprovalLog(handleDTO.getAlarmId(), "1", + user != null ? user.getName() : "", + ApprovalStatusEnum.UNCONFIRM.getCode(), + user != null ? user.getId() : null)); + return false; + } + + @Override public boolean processByApp(Map resultParams) { return false; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index 76bedfd..000366b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -11,12 +11,12 @@ import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO; -import com.casic.missiles.modular.alarm.dto.RemindDTO; +import com.casic.missiles.modular.alarm.dto.HandleDTO; import com.casic.missiles.modular.alarm.dto.SuspendDTO; -import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.util.ReturnUtil; import io.swagger.annotations.Api; @@ -66,13 +66,13 @@ @ApiOperation("查看") - @PostMapping("/view") + @PostMapping("/deviceAlarmView") @ResponseBody public ReturnDTO view(@RequestBody IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId(), DictEnum.DEVICE_EXCEPTION)); } @ApiOperation("批量删除") @@ -95,24 +95,14 @@ return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO)); } - @ApiOperation("已读") - @PostMapping("/read") + @ApiOperation("报警处置") + @PostMapping("/handle") @ResponseBody - public ReturnDTO read(@RequestBody IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + public ReturnDTO remind(@RequestBody HandleDTO handleDTO) { + Assert.isFalse(Objects.isNull(handleDTO.getAlarmId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId())); - } - - @ApiOperation("提醒责任人") - @PostMapping("/remind") - @ResponseBody - public ReturnDTO remind(@RequestBody RemindDTO remindDTO) { - Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO)); + return ReturnUtil.success(iAlarmRecordsService.handle(handleDTO)); } } 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 272d850..3644556 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 @@ -12,6 +12,7 @@ import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.dto.RemindDTO; @@ -82,7 +83,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId(), DictEnum.DATA_EXCEPTION)); } @ApiOperation("批量删除") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/HandleDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/HandleDTO.java new file mode 100644 index 0000000..3798ed0 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/HandleDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.alarm.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class HandleDTO { + + @ApiModelProperty(value = "报警主键id",required = true) + private Long alarmId; + + @ApiModelProperty("处置人员") + private String handlePerson; + + @ApiModelProperty("处置人员id") + private Long handlePersonId; + + @ApiModelProperty("是否误报(0,误报，1真实报警)") + private String realAlarm; + + @ApiModelProperty("处置情况") + private String handleContent; + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java index 31e584f..b3fe40c 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java @@ -44,6 +44,10 @@ @TableField("APPROVAL_PERSON") private String approvalPerson; + @ApiModelProperty("审批人ID") + @TableField("APPROVAL_PERSON_ID") + private Long approvalPersonId; + @ApiModelProperty("审批时间") @TableField("APPROVAL_TIME") private Date approvalTime; @@ -59,10 +63,11 @@ public ApprovalLog() { } - public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus) { + public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus,Long approvalPersonId) { this.alarmId = alarmId; this.approvalStatus = approvalStatus; this.approvalPerson = approvalPerson; this.flowStatus = flowStatus; + this.approvalPersonId = approvalPersonId; } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java index e373fd9..3573fd5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java @@ -40,6 +40,10 @@ @TableField("REMIND_PERSON") private String remindPerson; + @ApiModelProperty("提醒人员id") + @TableField("REMIND_PERSON_ID") + private Long remindPersonId; + @ApiModelProperty("联系方式") @TableField("TELEPHONE") private String telephone; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java index 9b8b2d5..85a2cac 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java @@ -48,6 +48,10 @@ @TableField("CREATE_PERSON") private String createPerson; + @ApiModelProperty("创建人id") + @TableField("CREATE_PERSON_ID") + private Long createPersonId; + @ApiModelProperty("截止日期") @TableField("EXPIRE_TIME") @@ -68,11 +72,12 @@ public SuspendLog() { } - public SuspendLog(Long alarmId, String suspendReason, String suspendTime, String createPerson,Date expireTime) { + public SuspendLog(Long alarmId, String suspendReason, String suspendTime, String createPerson,Long createPersonId,Date expireTime) { this.alarmId = alarmId; this.suspendReason = suspendReason; this.suspendTime = suspendTime; this.createPerson = createPerson; this.expireTime = expireTime; + this.createPersonId = createPersonId; } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 3160355..af572ad 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -3,10 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; -import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO; -import com.casic.missiles.modular.alarm.dto.RemindDTO; -import com.casic.missiles.modular.alarm.dto.SuspendDTO; +import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import java.util.List; @@ -32,12 +29,14 @@ Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); - AlarmRecords view(Long id); + AlarmRecords view(Long id,String exceptionType); boolean suspend(SuspendDTO suspendDTO); boolean remind(RemindDTO remindDTO); + boolean handle(HandleDTO handleDTO); + boolean read(Long id); List changeProcessStatus(List ids); 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 36ba638..6a1ffe1 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 @@ -8,6 +8,7 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.DictEnum; @@ -15,10 +16,7 @@ import com.casic.missiles.modular.alarm.dao.ApprovalLogMapper; import com.casic.missiles.modular.alarm.dao.RemindLogMapper; import com.casic.missiles.modular.alarm.dao.SuspendLogMapper; -import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; -import com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO; -import com.casic.missiles.modular.alarm.dto.RemindDTO; -import com.casic.missiles.modular.alarm.dto.SuspendDTO; +import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.entity.ApprovalLog; import com.casic.missiles.modular.alarm.entity.RemindLog; @@ -56,7 +54,7 @@ @Override public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope,getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope, getDeptIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); @@ -66,7 +64,7 @@ @Override public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope,getDeptIds(request.getDeptId())); + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope, getDeptIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -89,7 +87,7 @@ @Override public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope,getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope, getDeptIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "否" : "是"); @@ -99,7 +97,7 @@ @Override public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, dataScope,getDeptIds(request.getDeptId())); + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, dataScope, getDeptIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -108,9 +106,28 @@ return deviceAlarmListPage; } + /*** + * + * @param id + * @param exceptionType 为1时设备异常，0时数据异常,查看后流程不一样 + * @return + */ @Override - public AlarmRecords view(Long id) { + public AlarmRecords view(Long id, String exceptionType) { AlarmRecords alarmRecords = this.baseMapper.view(id); + //若状态为未读时，改为已读 + if (ApprovalStatusEnum.UNREAD.getCode().equals(alarmRecords.getProcessStatus())) { + String processStatus = DictEnum.DATA_EXCEPTION.equals(exceptionType) ? + ApprovalStatusEnum.READ.getCode() : ApprovalStatusEnum.UNPROCESS.getCode(); + //1、更新报警状态 + alarmRecords.setProcessStatus(processStatus); + updateById(alarmRecords); + //2、写入流程日志 + AuthUser user = permissionContext.getAuthService().getLoginUser(); + approvalLogMapper.insert(new ApprovalLog(id, "1", + user != null ? user.getName() : "", processStatus, + user != null ? user.getId() : null)); + } alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); //0：自有，1：自管 alarmRecords.setManageType(DictEnum.MANAGE_TYPE.equals(alarmRecords.getManageType()) ? "自有" : "自管"); @@ -127,11 +144,19 @@ alarmRecords.setProcessStatus(ApprovalStatusEnum.SUSPEND.getCode()); this.baseMapper.updateById(alarmRecords); //2、写入流程日志 - String loginPersonName = permissionContext.getAuthService().getLoginUser().getName(); - approvalLogMapper.insert(new ApprovalLog(suspendDTO.getAlarmId(), "1", loginPersonName, ApprovalStatusEnum.SUSPEND.getCode())); + AuthUser user = permissionContext.getAuthService().getLoginUser(); + approvalLogMapper.insert(new ApprovalLog(suspendDTO.getAlarmId(), "1", + user != null ? user.getName() : "", ApprovalStatusEnum.SUSPEND.getCode(), + user != null ? user.getId() : null)); //3、写入挂起日志表 Date expireTime = DateUtil.offsetHour(new Date(), Integer.decode(suspendDTO.getSuspendTime())); - return suspendLogMapper.insert(new SuspendLog(suspendDTO.getAlarmId(), suspendDTO.getSuspendReason(), suspendDTO.getSuspendTime(), loginPersonName, expireTime)) > 0 ? true : false; + return suspendLogMapper.insert(new SuspendLog(suspendDTO.getAlarmId(), + suspendDTO.getSuspendReason(), + suspendDTO.getSuspendTime(), + user != null ? user.getName() : "", + user != null ? user.getId() : null, + expireTime)) + > 0 ? true : false; } @Transactional @@ -143,7 +168,12 @@ alarmRecords.setProcessStatus(ApprovalStatusEnum.READ.getCode()); this.baseMapper.updateById(alarmRecords); //2、写入流程日志 - return approvalLogMapper.insert(new ApprovalLog(id, "1", permissionContext.getAuthService().getLoginUser().getName(), ApprovalStatusEnum.READ.getCode())) > 0 ? true : false; + AuthUser user = permissionContext.getAuthService().getLoginUser(); + return approvalLogMapper.insert(new ApprovalLog(id, "1", + user != null ? user.getName() : "", + ApprovalStatusEnum.READ.getCode(), + user != null ? user.getId() : null)) + > 0 ? true : false; } @@ -158,15 +188,19 @@ alarmRecords.setProcessStatus(ApprovalStatusEnum.UNCONFIRM.getCode()); this.baseMapper.updateById(alarmRecords); //3、写入流程日志 - String loginPersonName = permissionContext.getAuthService().getLoginUser().getName(); - approvalLogMapper.insert(new ApprovalLog(remindDTO.getAlarmId(), "1", loginPersonName, ApprovalStatusEnum.UNCONFIRM.getCode())); + AuthUser user = permissionContext.getAuthService().getLoginUser(); + approvalLogMapper.insert(new ApprovalLog(remindDTO.getAlarmId(), "1", + user != null ? user.getName() : "", ApprovalStatusEnum.UNCONFIRM.getCode(), + user != null ? user.getId() : null)); //4、写入提醒日志表 return remindLogMapper.insert(RemindLog.builder() .alarmId(remindDTO.getAlarmId()) .remindContent(remindDTO.getRemindContent()) .remindPerson(remindDTO.getRemindPerson()) .telephone(remindDTO.getTelephone()) - .remindPerson(loginPersonName).build()) > 0 ? true : false; + .remindPersonId(user != null ? user.getId() : null) + .remindPerson(user != null ? user.getName() : "").build()) + > 0 ? true : false; } @@ -181,6 +215,23 @@ } @Override + public boolean handle(HandleDTO handleDTO) { + //1、更新报警表流程状态 + AlarmRecords alarmRecords = getById(handleDTO.getAlarmId()); + alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus()); + alarmRecords.setProcessStatus(ApprovalStatusEnum.PROCESSED.getCode()); + alarmRecords.setRealAlarm(handleDTO.getRealAlarm()); + this.baseMapper.updateById(alarmRecords); + //2、写入流程日志 + AuthUser user = permissionContext.getAuthService().getLoginUser(); + approvalLogMapper.insert(new ApprovalLog(handleDTO.getAlarmId(), "1", + user != null ? user.getName() : "", + ApprovalStatusEnum.UNCONFIRM.getCode(), + user != null ? user.getId() : null)); + return false; + } + + @Override public boolean processByApp(Map resultParams) { return false; } diff --git a/casic-public/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/DictEnum.java index 8262ca9..5df59f4 100644 --- a/casic-public/src/main/java/com/casic/missiles/enums/DictEnum.java +++ b/casic-public/src/main/java/com/casic/missiles/enums/DictEnum.java @@ -52,6 +52,10 @@ String REAL_ALARM= "0"; //0：自有，1：自管 String MANAGE_TYPE= "0"; + //设备异常 + String DEVICE_EXCEPTION= "1"; + //数据异常 + String DATA_EXCEPTION= "0"; }