feat(): 隐患处罚消息通知流程

start/src/main/resources/sdk-prod.yml

@@ -73,6 +73,8 @@ message:
     checkedPersonApplyDefendNotPass: MS000139
     hiddenDangerRectifyPersonApplyRectify: MS000140
     hiddenDangerAcceptancePersonApplyAcceptance: MS000141
+    hiddenDangerPenaltyPersonApplyPenalty: MS000145
+    hiddenDangerPenaltyFeedbackPersonApplyFeedback: MS000146
     checkInitiatorApplyAcceptancePass: MS000142
     checkInitiatorApplyAcceptanceNotPass: MS000143
     hiddenDangerRectifyPersonApplyRectifyPass: MS000144

start/src/main/resources/sdk.yml

@@ -73,5 +73,7 @@ message:
     checkedPersonApplyDefendNotPass: MS000139
     hiddenDangerRectifyPersonApplyRectify: MS000140
     hiddenDangerAcceptancePersonApplyAcceptance: MS000141
+    hiddenDangerPenaltyPersonApplyPenalty: MS000145
+    hiddenDangerPenaltyFeedbackPersonApplyFeedback: MS000146
     checkInitiatorApplyAcceptancePass: MS000142
     checkInitiatorApplyAcceptanceNotPass: MS000143

web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenPenaltyController.java

@@ -14,6 +14,7 @@ import com.zcloud.key.project.dto.hidden.HiddenPenaltyUpdateCmd;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -28,6 +29,7 @@ public class HiddenPenaltyController {
 
     @ApiOperation("处罚分页列表")
     @PostMapping("/list")
+    @PreAuthorize("@pms.hasAnyPermission('jgd-cfgl','fgs-cfgl')")
     public PageResponse<HiddenPenaltyCO> listPage(@RequestBody HiddenPenaltyPageQry qry) {
         return hiddenPenaltyService.listPage(qry);
     }

web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java

@@ -3,7 +3,6 @@ package com.zcloud.key.project.command.hidden;
 import com.alibaba.cola.exception.BizException;
 import com.jjb.saas.framework.auth.model.SSOUser;
 import com.jjb.saas.framework.auth.utils.AuthContext;
-import com.zcloud.gbscommon.utils.Tools;
 import com.zcloud.key.project.command.project.MessageNoticeExe;
 import com.zcloud.key.project.domain.config.MessageTemplateConfig;
 import com.zcloud.key.project.domain.gateway.hidden.HiddenAcceptRecordGateway;
@@ -22,7 +21,7 @@ import com.zcloud.key.project.persistence.repository.hidden.HiddenFindUserReposi
 import com.zcloud.key.project.persistence.repository.hidden.HiddenRepository;
 import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionRepository;
 import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionUserRepository;
-import io.swagger.models.auth.In;
+import com.zcloud.key.project.persistence.repository.project.KeyProjectPenaltyPersonnelRepository;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
@@ -51,6 +50,7 @@ public class HiddenAcceptRecordUpdateExe {
     private final SafetyEnvironmentalInspectionUserGateway safetyEnvironmentalInspectionUserGateway;
     private final AiAlarmRepository aiAlarmRepository;
     private final HiddenFindUserRepository hiddenFindUserRepository;
+    private final KeyProjectPenaltyPersonnelRepository keyProjectPenaltyPersonnelRepository;
     private final MessageNoticeExe messageNoticeExe;
     private final MessageTemplateConfig messageTemplateConfig;
 
@@ -127,6 +127,7 @@ public class HiddenAcceptRecordUpdateExe {
                 safetyEnvironmentalInspectionUserRepository.editUserInfo(inspectionUserDO);
             }
         }
+
         Map<String, Object> params = new HashMap<>();
         params.put("hiddenId", cmd.getHiddenId());
         List<HiddenFindUserDO> findList = hiddenFindUserRepository.listAll(params);
@@ -134,9 +135,10 @@ public class HiddenAcceptRecordUpdateExe {
             // TODO 完成该隐患的待办
             messageNoticeExe.sendMessageCompleteEvent(findUserDO.getId());
         }
-        // 驳回给整改人发代办
+        if (cmd.getState() == 1 && hiddenDO != null) {
-        if(cmd.getState() == 0){
+            notifyPenaltyUsers(hiddenDO);
-
+        }
+        if (cmd.getState() == 0 && hiddenDO != null) {
             if (hiddenDO.getSource() == 1) {
                 // 视频识别隐患
                 // hiddenDO.source = 1时，SafetyEnvironmentalInspectionDO查不到数据，需要关联ai_alarm表
@@ -173,5 +175,38 @@ public class HiddenAcceptRecordUpdateExe {
             throw new BizException("修改失败");
         }
     }
+
+    private void notifyPenaltyUsers(HiddenDO hiddenDO) {
+        String keyProjectId = null;
+        String projectName = null;
+        if (hiddenDO.getSource() == 1) {
+            AiAlarmDO aiAlarmDO = aiAlarmRepository.getByAiAlarmId(hiddenDO.getForeignKey());
+            if (aiAlarmDO != null) {
+                keyProjectId = aiAlarmDO.getKeyProjectId();
+                projectName = aiAlarmDO.getProjectName();
+            }
+        } else if (hiddenDO.getSource() == 2 || hiddenDO.getSource() == 3) {
+            SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionRepository.getByInspectionId(hiddenDO.getForeignKey());
+            if (inspectionDO != null) {
+                keyProjectId = inspectionDO.getKeyProjectId();
+                projectName = inspectionDO.getProjectName();
+            }
+        }
+        if (keyProjectId == null || keyProjectId.isEmpty()) {
+            return;
         }
 
+        Map<String, Object> sendParams = new HashMap<>();
+        if (projectName != null && !projectName.isEmpty()) {
+            sendParams.put("checkTitle", projectName);
+        }
+        keyProjectPenaltyPersonnelRepository.getListByProjectId(keyProjectId).stream()
+                .map(item -> item.getUserId())
+                .filter(userId -> userId != null)
+                .distinct()
+                .forEach(userId -> {
+                    messageNoticeExe.messageNotice(userId, messageTemplateConfig.getHiddenDangerPenaltyPersonApplyPenalty(), sendParams);
+                    messageNoticeExe.sendMessageAddEvent(userId, "您有一条待处罚隐患，请及时发起处罚。", "待处罚", hiddenDO.getId(), hiddenDO.getId());
+                });
+    }
+}

web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenPenaltyAddExe.java

@@ -4,18 +4,24 @@ import com.alibaba.cola.dto.SingleResponse;
 import com.alibaba.cola.exception.BizException;
 import com.zcloud.gbscommon.utils.Tools;
 import com.zcloud.key.project.command.convertor.hidden.HiddenPenaltyCoConvertor;
+import com.zcloud.key.project.command.project.MessageNoticeExe;
+import com.zcloud.key.project.domain.config.MessageTemplateConfig;
 import com.zcloud.key.project.domain.gateway.hidden.HiddenPenaltyGateway;
 import com.zcloud.key.project.domain.model.hidden.HiddenPenaltyE;
 import com.zcloud.key.project.dto.clientobject.hidden.HiddenPenaltyCO;
 import com.zcloud.key.project.dto.hidden.HiddenPenaltyAddCmd;
+import com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO;
 import com.zcloud.key.project.persistence.dataobject.hidden.HiddenPenaltyDO;
 import com.zcloud.key.project.persistence.repository.hidden.HiddenPenaltyRepository;
+import com.zcloud.key.project.persistence.repository.hidden.HiddenRepository;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
 
 @Component
 @AllArgsConstructor
@@ -23,6 +29,9 @@ public class HiddenPenaltyAddExe {
     private final HiddenPenaltyGateway hiddenPenaltyGateway;
     private final HiddenPenaltyRepository hiddenPenaltyRepository;
     private final HiddenPenaltyCoConvertor hiddenPenaltyCoConvertor;
+    private final HiddenRepository hiddenRepository;
+    private final MessageNoticeExe messageNoticeExe;
+    private final MessageTemplateConfig messageTemplateConfig;
 
     @Transactional(rollbackFor = Exception.class)
     public SingleResponse<HiddenPenaltyCO> execute(HiddenPenaltyAddCmd cmd) {
@@ -44,6 +53,7 @@ public class HiddenPenaltyAddExe {
                     throw new BizException("保存失败");
                 }
                 HiddenPenaltyDO updated = hiddenPenaltyRepository.getByHiddenId(cmd.getHiddenId());
+                handlePenaltyIssued(updated);
                 return SingleResponse.of(hiddenPenaltyCoConvertor.converDOToCO(updated));
             }
             throw new BizException("无法重复处罚");
@@ -61,6 +71,24 @@ public class HiddenPenaltyAddExe {
             throw new BizException("保存失败");
         }
         HiddenPenaltyDO saved = hiddenPenaltyRepository.getByHiddenId(cmd.getHiddenId());
+        handlePenaltyIssued(saved);
         return SingleResponse.of(hiddenPenaltyCoConvertor.converDOToCO(saved));
     }
+
+    private void handlePenaltyIssued(HiddenPenaltyDO penaltyDO) {
+        HiddenDO hiddenDO = hiddenRepository.getInfoByHiddenId(penaltyDO.getHiddenId());
+        if (hiddenDO != null) {
+            messageNoticeExe.sendMessageCompleteEvent(hiddenDO.getId());
+        }
+        if (!Integer.valueOf(1).equals(penaltyDO.getFineFlag()) || penaltyDO.getPenalizedUserId() == null) {
+            return;
+        }
+
+        Map<String, Object> sendParams = new HashMap<>();
+        if (penaltyDO.getProjectName() != null && !penaltyDO.getProjectName().isEmpty()) {
+            sendParams.put("checkTitle", penaltyDO.getProjectName());
+        }
+        messageNoticeExe.messageNotice(penaltyDO.getPenalizedUserId(), messageTemplateConfig.getHiddenDangerPenaltyFeedbackPersonApplyFeedback(), sendParams);
+        messageNoticeExe.sendMessageAddEvent(penaltyDO.getPenalizedUserId(), "您有一条待反馈处罚，请及时缴纳处罚金并上传凭证。", "待反馈处罚", penaltyDO.getId(), penaltyDO.getId());
+    }
 }

web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenPenaltyFeedbackAddExe.java

@@ -2,8 +2,10 @@ package com.zcloud.key.project.command.hidden;
 
 import com.alibaba.cola.dto.SingleResponse;
 import com.alibaba.cola.exception.BizException;
+import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.zcloud.gbscommon.utils.Tools;
 import com.zcloud.key.project.command.convertor.hidden.HiddenPenaltyCoConvertor;
+import com.zcloud.key.project.command.project.MessageNoticeExe;
 import com.zcloud.key.project.domain.gateway.hidden.HiddenPenaltyGateway;
 import com.zcloud.key.project.domain.model.hidden.HiddenPenaltyE;
 import com.zcloud.key.project.dto.clientobject.hidden.HiddenPenaltyFeedbackCO;
@@ -11,7 +13,6 @@ import com.zcloud.key.project.dto.hidden.HiddenPenaltyFeedbackAddCmd;
 import com.zcloud.key.project.persistence.dataobject.hidden.HiddenPenaltyDO;
 import com.zcloud.key.project.persistence.dataobject.hidden.HiddenPenaltyFeedbackDO;
 import com.zcloud.key.project.persistence.repository.hidden.HiddenPenaltyRepository;
-import com.jjb.saas.framework.auth.utils.AuthContext;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
@@ -25,6 +26,7 @@ public class HiddenPenaltyFeedbackAddExe {
     private final HiddenPenaltyRepository hiddenPenaltyRepository;
     private final HiddenPenaltyCoConvertor hiddenPenaltyCoConvertor;
     private final HiddenPenaltyGateway hiddenPenaltyGateway;
+    private final MessageNoticeExe messageNoticeExe;
 
     @Transactional(rollbackFor = Exception.class)
     public SingleResponse<HiddenPenaltyFeedbackCO> execute(HiddenPenaltyFeedbackAddCmd cmd) {
@@ -55,6 +57,7 @@ public class HiddenPenaltyFeedbackAddExe {
         e.setFeedbackStatus(1);
         hiddenPenaltyGateway.update(e);
 
+        messageNoticeExe.sendMessageCompleteEvent(penalty.getId());
         d.setFeedbackUserName(AuthContext.getCurrentUser().getName());
         return SingleResponse.of(hiddenPenaltyCoConvertor.converFeedbackDOToCO(d));
     }

web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenPenaltyUpdateExe.java

@@ -3,6 +3,8 @@ package com.zcloud.key.project.command.hidden;
 import com.alibaba.cola.dto.SingleResponse;
 import com.alibaba.cola.exception.BizException;
 import com.zcloud.key.project.command.convertor.hidden.HiddenPenaltyCoConvertor;
+import com.zcloud.key.project.command.project.MessageNoticeExe;
+import com.zcloud.key.project.domain.config.MessageTemplateConfig;
 import com.zcloud.key.project.domain.gateway.hidden.HiddenPenaltyGateway;
 import com.zcloud.key.project.domain.model.hidden.HiddenPenaltyE;
 import com.zcloud.key.project.dto.clientobject.hidden.HiddenPenaltyCO;
@@ -14,6 +16,8 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
 
 @Component
 @AllArgsConstructor
@@ -21,6 +25,8 @@ public class HiddenPenaltyUpdateExe {
     private final HiddenPenaltyGateway hiddenPenaltyGateway;
     private final HiddenPenaltyRepository hiddenPenaltyRepository;
     private final HiddenPenaltyCoConvertor hiddenPenaltyCoConvertor;
+    private final MessageNoticeExe messageNoticeExe;
+    private final MessageTemplateConfig messageTemplateConfig;
 
     @Transactional(rollbackFor = Exception.class)
     public SingleResponse<HiddenPenaltyCO> execute(HiddenPenaltyUpdateCmd cmd) {
@@ -54,6 +60,20 @@ public class HiddenPenaltyUpdateExe {
         }
 
         HiddenPenaltyDO updated = hiddenPenaltyRepository.getByHiddenId(existing.getHiddenId());
+        handleFeedbackTodo(updated);
         return SingleResponse.of(hiddenPenaltyCoConvertor.converDOToCO(updated));
     }
+
+    private void handleFeedbackTodo(HiddenPenaltyDO penaltyDO) {
+        if (Integer.valueOf(1).equals(penaltyDO.getFineFlag()) && penaltyDO.getPenalizedUserId() != null) {
+            Map<String, Object> sendParams = new HashMap<>();
+            if (penaltyDO.getProjectName() != null && !penaltyDO.getProjectName().isEmpty()) {
+                sendParams.put("checkTitle", penaltyDO.getProjectName());
+            }
+            messageNoticeExe.messageNotice(penaltyDO.getPenalizedUserId(), messageTemplateConfig.getHiddenDangerPenaltyFeedbackPersonApplyFeedback(), sendParams);
+            messageNoticeExe.sendMessageAddEvent(penaltyDO.getPenalizedUserId(), "您有一条待反馈处罚，请及时缴纳处罚金并上传凭证。", "待反馈处罚", penaltyDO.getId(), penaltyDO.getId());
+            return;
+        }
+        messageNoticeExe.sendMessageCompleteEvent(penaltyDO.getId());
+    }
 }

web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectCameraQueryExe.java

@@ -63,7 +63,7 @@ public class KeyProjectCameraQueryExe {
             pageResponse = keyProjectCameraRepository.listAllCamera(params);
         }
         List<CameraInfoCO> examCenterCOS = keyProjectCameraCoConvertor.converCameraDOsToCOs(pageResponse.getData());
-
+        pageResponse.setPageSize(examCenterCOS.size());
         return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
 
 

web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenPenaltyFeedbackCO.java

@@ -28,6 +28,9 @@ public class HiddenPenaltyFeedbackCO extends ClientObject {
     @ApiModelProperty(value = "隐患来源ID外键")
     private String foreignKey;
 
+    @ApiModelProperty(value = "隐患来源名称")
+    private Integer hiddenSource;
+
     @ApiModelProperty(value = "处罚反馈状态")
     private Integer feedbackStatus;
 

web-domain/src/main/java/com/zcloud/key/project/domain/config/MessageTemplateConfig.java

@@ -47,6 +47,10 @@ public class MessageTemplateConfig {
     private String hiddenDangerRectifyPersonApplyRectify;
     // 重点作业-隐患验收人-验收
     private String hiddenDangerAcceptancePersonApplyAcceptance;
+    // 重点作业-处罚人-发起处罚
+    private String hiddenDangerPenaltyPersonApplyPenalty;
+    // 重点作业-被处罚人-处罚反馈
+    private String hiddenDangerPenaltyFeedbackPersonApplyFeedback;
     // 重点作业-检查发起人-验收通过
     private String checkInitiatorApplyAcceptancePass;
     // 重点作业-检查发起人-验收未通过

web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenPenaltyFeedbackDO.java

@@ -36,6 +36,10 @@ public class HiddenPenaltyFeedbackDO extends BaseDO {
     @TableField(exist = false)
     private String foreignKey;
 
+    @ApiModelProperty(value = "隐患来源名称")
+    @TableField(exist = false)
+    private Integer hiddenSource;
+
     @ApiModelProperty(value = "处罚反馈状态")
     @TableField(exist = false)
     private Integer feedbackStatus;

web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenPenaltyMapper.java

@@ -14,7 +14,7 @@ import java.util.Map;
 @Mapper
 @DataScopes({
         @DataScope(method = "listPage", menuPerms = ""),
-        @DataScope(method = "feedbackListPage", menuPerms = "")
+        @DataScope(method = "feedbackListPage", menuPerms = "xgf-cffk")
 })
 public interface HiddenPenaltyMapper extends BaseMapper<HiddenPenaltyDO> {
 

web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectCameraRepositoryImpl.java

@@ -68,6 +68,7 @@ public class KeyProjectCameraRepositoryImpl extends BaseRepositoryImpl<KeyProjec
     @Override
     public PageResponse<CameraInfoDO> listAllCamera(Map<String, Object> params) {
         IPage<CameraInfoDO> iPage = new Query<CameraInfoDO>().getPage(params);
+        iPage.setSize(50L);
         IPage<CameraInfoDO> result = keyProjectCameraMapper.listAllCamera(iPage, params);
         return PageHelper.pageToResponse(result, result.getRecords());
     }

web-infrastructure/src/main/resources/mapper/HiddenPenaltyMapper.xml

@@ -113,7 +113,8 @@
                h.hidden_id AS hidden_id,
                h.hidden_desc AS hidden_desc,
                h.create_name AS find_user_name,
-               h.foreign_key AS foreign_key
+               h.foreign_key AS foreign_key,
+               h.source AS hidden_source
         FROM hidden_penalty_feedback hpf
         INNER JOIN (
             SELECT MAX(id) AS id
@@ -166,6 +167,7 @@
                 AND hp.penalty_desc LIKE CONCAT('%', #{params.penaltyDesc}, '%')
             </if>
         </where>
+        GROUP BY hpf.id
         ORDER BY hpf.feedback_time DESC, hpf.create_time DESC, hpf.id DESC
     </select>
 

web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml

@@ -75,29 +75,16 @@
         SELECT mc.fixed_camera_id as cameraId, mc.video_name as cameraName, 1 as cameraType
         FROM fixed_camera mc
         WHERE mc.delete_enum = 'FALSE'
-        AND NOT EXISTS (SELECT 1
+        <if test="params.corpinfoId != null">
-            FROM key_project_camera kpc
+            AND mc.corpinfo_id = #{params.corpinfoId}
-            INNER JOIN key_project kp ON kpc.key_project_id = kp.key_project_id
+        </if>
-            WHERE kpc.camera_id = mc.fixed_camera_id
-            AND kp.delete_enum = 'FALSE'
-            AND kpc.delete_enum = 'FALSE'
-            AND kp.apply_status != 6
-        )
         UNION ALL
         SELECT mc.mobile_camera_id as cameraId, mc.video_name as cameraName, 2 as cameraType
         FROM mobile_camera mc
         WHERE mc.delete_enum = 'FALSE'
         <if test="params.corpinfoId != null">
-            and mc.xgf_id = #{params.corpinfoId}
+            AND mc.corpinfo_id = #{params.corpinfoId}
         </if>
-        AND NOT EXISTS (SELECT 1
-            FROM key_project_camera kpc
-            INNER JOIN key_project kp ON kpc.key_project_id = kp.key_project_id
-            WHERE kpc.camera_id = mc.mobile_camera_id
-            AND kp.delete_enum = 'FALSE'
-            AND kpc.delete_enum = 'FALSE'
-            AND kp.apply_status != 6
-        )
     </select>
 
     <select id="listCameraByProjectId" resultType="com.zcloud.key.project.persistence.dataobject.project.KeyProjectCameraAiDO">