diff --git a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java index 6ea06df..668c258 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java @@ -12,10 +12,12 @@ import com.zcloud.key.project.domain.model.hidden.HiddenAcceptRecordE; import com.zcloud.key.project.domain.model.inspection.SafetyEnvironmentalInspectionUserE; import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordAcceptCmd; import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordUpdateCmd; +import com.zcloud.key.project.persistence.dataobject.ai.AiAlarmDO; import com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO; import com.zcloud.key.project.persistence.dataobject.hidden.HiddenFindUserDO; import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO; import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO; +import com.zcloud.key.project.persistence.repository.ai.AiAlarmRepository; import com.zcloud.key.project.persistence.repository.hidden.HiddenFindUserRepository; import com.zcloud.key.project.persistence.repository.hidden.HiddenRepository; import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionRepository; @@ -47,6 +49,7 @@ public class HiddenAcceptRecordUpdateExe { private final SafetyEnvironmentalInspectionRepository safetyEnvironmentalInspectionRepository; private final SafetyEnvironmentalInspectionUserRepository safetyEnvironmentalInspectionUserRepository; private final SafetyEnvironmentalInspectionUserGateway safetyEnvironmentalInspectionUserGateway; + private final AiAlarmRepository aiAlarmRepository; private final HiddenFindUserRepository hiddenFindUserRepository; private final MessageNoticeExe messageNoticeExe; private final MessageTemplateConfig messageTemplateConfig; @@ -134,19 +137,34 @@ public class HiddenAcceptRecordUpdateExe { // 驳回给整改人发代办 if(cmd.getState() == 0){ - // 这块 hiddenDO.source = 1时,SafetyEnvironmentalInspectionDO查不到数据,需要关联ai_alarm表 - SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionRepository.getByInspectionId(hiddenDO.getForeignKey()); - // todo 报错 java.lang.NullPointerException: null - // HiddenAcceptRecordUpdateExe.acceptExecute(HiddenAcceptRecordUpdateExe.java:138) - if (inspectionDO != null) { - Map sendParamsPigeonhole = new HashMap<>(); - sendParamsPigeonhole.put("checkTitle", inspectionDO.getProjectName()); - messageNoticeExe.messageNotice(hiddenDO.getRectificationUserId(), messageTemplateConfig.getCheckInitiatorApplyAcceptanceNotPass(), sendParamsPigeonhole); + if (hiddenDO.getSource() == 1) { + // 视频识别隐患 + // hiddenDO.source = 1时,SafetyEnvironmentalInspectionDO查不到数据,需要关联ai_alarm表 + AiAlarmDO aiAlarmDO = aiAlarmRepository.getByAiAlarmId(hiddenDO.getForeignKey()); + if (aiAlarmDO != null) { + Map sendParamsPigeonhole = new HashMap<>(); + sendParamsPigeonhole.put("checkTitle", aiAlarmDO.getProjectName()); + messageNoticeExe.messageNotice(hiddenDO.getRectificationUserId(), messageTemplateConfig.getCheckInitiatorApplyAcceptanceNotPass(), sendParamsPigeonhole); - List userList = safetyEnvironmentalInspectionUserRepository.listAllByInspectionId(hiddenDO.getForeignKey(), 7); - if (userList != null && userList.size() > 0){ - messageNoticeExe.sendMessageAddEvent(userList.get(0).getUserId(), "您有一条安全检查任务的隐患验收未通过,请及时处理。","验收被驳回", hiddenDO.getId(), hiddenDO.getId()); + if (aiAlarmDO.getDisposeUserId() != null) { + messageNoticeExe.sendMessageAddEvent(aiAlarmDO.getDisposeUserId(), "您有一条视频识别的隐患验收未通过,请及时处理。","验收被驳回", hiddenDO.getId(), hiddenDO.getId()); + } } + + } else { + + SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionRepository.getByInspectionId(hiddenDO.getForeignKey()); + if (inspectionDO != null) { + Map sendParamsPigeonhole = new HashMap<>(); + sendParamsPigeonhole.put("checkTitle", inspectionDO.getProjectName()); + messageNoticeExe.messageNotice(hiddenDO.getRectificationUserId(), messageTemplateConfig.getCheckInitiatorApplyAcceptanceNotPass(), sendParamsPigeonhole); + + List userList = safetyEnvironmentalInspectionUserRepository.listAllByInspectionId(hiddenDO.getForeignKey(), 7); + if (userList != null && userList.size() > 0){ + messageNoticeExe.sendMessageAddEvent(userList.get(0).getUserId(), "您有一条安全检查任务的隐患验收未通过,请及时处理。","验收被驳回", hiddenDO.getId(), hiddenDO.getId()); + } + } + } } diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/ai/AiAlarmQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/ai/AiAlarmQueryExe.java index 9863588..4ae4711 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/query/ai/AiAlarmQueryExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/query/ai/AiAlarmQueryExe.java @@ -6,6 +6,7 @@ import com.zcloud.key.project.command.convertor.ai.AiAlarmCoConvertor; import com.zcloud.key.project.dto.ai.AiAlarmPageQry; import com.zcloud.key.project.dto.clientobject.ai.AiAlarmCO; import com.zcloud.key.project.persistence.dataobject.ai.AiAlarmDO; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO; import com.zcloud.key.project.persistence.repository.ai.AiAlarmRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/ai/AiAlarmMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/ai/AiAlarmMapper.java index df3660d..7dcd41b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/ai/AiAlarmMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/ai/AiAlarmMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.datascope.annotation.DataScope; import com.jjb.saas.framework.datascope.annotation.DataScopes; import com.zcloud.key.project.persistence.dataobject.ai.AiAlarmDO; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO; import org.apache.ibatis.annotations.Mapper; import java.util.Map; @@ -22,6 +23,8 @@ import java.util.Map; public interface AiAlarmMapper extends BaseMapper { IPage selectListPage(IPage iPage, Map params, String menuPerms); + AiAlarmDO getByAiAlarmId(String aiAlarmId); + AiAlarmDO findById(Long id); } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/ai/AiAlarmRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/ai/AiAlarmRepository.java index 8d6b40b..bf242e8 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/ai/AiAlarmRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/ai/AiAlarmRepository.java @@ -3,6 +3,7 @@ package com.zcloud.key.project.persistence.repository.ai; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; import com.zcloud.key.project.persistence.dataobject.ai.AiAlarmDO; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO; import java.util.Map; @@ -15,6 +16,8 @@ import java.util.Map; public interface AiAlarmRepository extends BaseRepository { PageResponse listPage(Map params); + AiAlarmDO getByAiAlarmId(String aiAlarmId); + AiAlarmDO findById(Long id); } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/ai/AiAlarmRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/ai/AiAlarmRepositoryImpl.java index 7e4fc10..2ba0f78 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/ai/AiAlarmRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/ai/AiAlarmRepositoryImpl.java @@ -39,6 +39,12 @@ public class AiAlarmRepositoryImpl extends BaseRepositoryImpl + +