From ab7b7e0aad2c6e1fbe78bdc8c213d0950eafab77 Mon Sep 17 00:00:00 2001 From: zhangyue Date: Fri, 10 Apr 2026 11:03:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0AI=E5=91=8A=E8=AD=A6=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=A4=84=E7=90=86=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../key/project/web/ai/AiAlarmController.java | 14 ++++- .../project/command/ai/AiAlarmUpdateExe.java | 23 +++++++ .../hidden/HiddenAcceptRecordUpdateExe.java | 60 ++++++++++--------- .../HiddenRectificationRecordUpdateExe.java | 45 +++++++------- .../service/ai/AiAlarmServiceImpl.java | 6 ++ .../key/project/api/ai/AiAlarmServiceI.java | 3 + .../project/dto/ai/AiAlarmBatchDealCmd.java | 30 ++++++++++ .../key/project/dto/ai/AiAlarmPageQry.java | 3 + .../key/project/dto/ai/AiAlarmUpdateCmd.java | 38 ++---------- .../dto/clientobject/ai/AiAlarmCO.java | 6 ++ .../key/project/domain/model/ai/AiAlarmE.java | 3 + .../persistence/dataobject/ai/AiAlarmDO.java | 8 +++ .../persistence/mapper/HiddenMapper.java | 2 + .../persistence/mapper/ai/AiAlarmMapper.java | 5 +- .../repository/hidden/HiddenRepository.java | 2 + .../impl/ai/AiAlarmRepositoryImpl.java | 5 +- .../impl/hidden/HiddenRepositoryImpl.java | 7 +++ .../resources/mapper/ai/AiAlarmMapper.xml | 21 ++++++- 18 files changed, 190 insertions(+), 91 deletions(-) create mode 100644 web-client/src/main/java/com/zcloud/key/project/dto/ai/AiAlarmBatchDealCmd.java diff --git a/web-adapter/src/main/java/com/zcloud/key/project/web/ai/AiAlarmController.java b/web-adapter/src/main/java/com/zcloud/key/project/web/ai/AiAlarmController.java index bb2437c..3f15fc1 100644 --- a/web-adapter/src/main/java/com/zcloud/key/project/web/ai/AiAlarmController.java +++ b/web-adapter/src/main/java/com/zcloud/key/project/web/ai/AiAlarmController.java @@ -9,6 +9,7 @@ import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.key.project.api.ai.AiAlarmServiceI; import com.zcloud.key.project.dto.ai.AiAlarmAddCmd; +import com.zcloud.key.project.dto.ai.AiAlarmBatchDealCmd; import com.zcloud.key.project.dto.ai.AiAlarmPageQry; import com.zcloud.key.project.dto.ai.AiAlarmUpdateCmd; import com.zcloud.key.project.dto.clientobject.ai.AiAlarmCO; @@ -72,11 +73,18 @@ public class AiAlarmController { return SingleResponse.buildSuccess(); } - @ApiOperation("修改") - @PutMapping("/edit") - public SingleResponse edit(@Validated @RequestBody AiAlarmUpdateCmd aiAlarmUpdateCmd) { + @ApiOperation("单个处理") + @PostMapping("/deal") + public SingleResponse deal(@Validated @RequestBody AiAlarmUpdateCmd aiAlarmUpdateCmd) { aiAlarmService.edit(aiAlarmUpdateCmd); return SingleResponse.buildSuccess(); } + + @ApiOperation("批量处理") + @PostMapping("/batchDeal") + public SingleResponse batchDeal(@Validated @RequestBody AiAlarmBatchDealCmd aiAlarmBatchDealCmd) { + aiAlarmService.dealBatch(aiAlarmBatchDealCmd); + return SingleResponse.buildSuccess(); + } } diff --git a/web-app/src/main/java/com/zcloud/key/project/command/ai/AiAlarmUpdateExe.java b/web-app/src/main/java/com/zcloud/key/project/command/ai/AiAlarmUpdateExe.java index 1893e43..a2ddaac 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/ai/AiAlarmUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/ai/AiAlarmUpdateExe.java @@ -1,14 +1,22 @@ package com.zcloud.key.project.command.ai; +import cn.hutool.core.bean.BeanUtil; import com.alibaba.cola.exception.BizException; import com.zcloud.key.project.domain.gateway.ai.AiAlarmGateway; import com.zcloud.key.project.domain.model.ai.AiAlarmE; +import com.zcloud.key.project.dto.ai.AiAlarmBatchDealCmd; import com.zcloud.key.project.dto.ai.AiAlarmUpdateCmd; +import com.zcloud.key.project.persistence.dataobject.ai.AiAlarmDO; +import com.zcloud.key.project.persistence.repository.ai.AiAlarmRepository; 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.ArrayList; +import java.util.List; + /** * web-app @@ -20,15 +28,30 @@ import org.springframework.transaction.annotation.Transactional; @AllArgsConstructor public class AiAlarmUpdateExe { private final AiAlarmGateway aiAlarmGateway; + private final AiAlarmRepository aiAlarmRepository; @Transactional(rollbackFor = Exception.class) public void execute(AiAlarmUpdateCmd aiAlarmUpdateCmd) { AiAlarmE aiAlarmE = new AiAlarmE(); BeanUtils.copyProperties(aiAlarmUpdateCmd, aiAlarmE); + aiAlarmE.setState(1); boolean res = aiAlarmGateway.update(aiAlarmE); if (!res) { throw new BizException("修改失败"); } } + + @Transactional(rollbackFor = Exception.class) + public void dealBatch(AiAlarmBatchDealCmd aiAlarmBatchDealCmd) { + List aiAlarmEList = new ArrayList<>(); + for (Long id : aiAlarmBatchDealCmd.getIds()) { + AiAlarmE aiAlarmE = new AiAlarmE(); + aiAlarmE.setId(id); + aiAlarmE.setState(1); + aiAlarmE.setHasHidden(0); + aiAlarmEList.add(aiAlarmE); + } + aiAlarmRepository.updateBatchById(BeanUtil.copyToList(aiAlarmEList, AiAlarmDO.class)); + } } 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 bd151f7..e39099e 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 @@ -10,6 +10,7 @@ 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.hidden.HiddenDO; 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.hidden.HiddenRepository; @@ -67,41 +68,44 @@ public class HiddenAcceptRecordUpdateExe { hiddenState = 4; } hiddenRepository.updateState(cmd.getHiddenId(), hiddenState); + HiddenDO hiddenDO = hiddenRepository.getInfoByHiddenId(cmd.getHiddenId()); - if (cmd.getState() == 1){ // 验收通过 - // 判断隐患是否全部验收完成， - List stateList = new ArrayList<>(); - stateList.add(1); - stateList.add(2); - stateList.add(4); - Long count = hiddenRepository.countByForeignKey(cmd.getForeignKey(), stateList); - if(count == 0) { - // 修改安全环保检查隐患验收操作记录为完成 + // 如果隐患来源是安全环保检查，那么安全环保检查相关处理流程 + if (hiddenDO != null && (hiddenDO.getSource() == 2 || hiddenDO.getSource() == 3)){ + if (cmd.getState() == 1){ // 验收通过 + // 判断隐患是否全部验收完成， + List stateList = new ArrayList<>(); + stateList.add(1); + stateList.add(2); + stateList.add(4); + Long count = hiddenRepository.countByForeignKey(cmd.getForeignKey(), stateList); + if(count == 0) { + // 修改安全环保检查隐患验收操作记录为完成 + SafetyEnvironmentalInspectionUserDO inspectionUserDO = new SafetyEnvironmentalInspectionUserDO(); + inspectionUserDO.setInspectionId(cmd.getForeignKey()); + inspectionUserDO.setUserId(ssoUser.getUserId()); + inspectionUserDO.setType(8); + inspectionUserDO.setStatus(1); + inspectionUserDO.setSignatureTime(LocalDateTime.now()); + safetyEnvironmentalInspectionUserRepository.editUserInfo(inspectionUserDO); + // 生成安全环保检查归档操作记录（直接完成） + SafetyEnvironmentalInspectionUserE inspectionUserFileE = new SafetyEnvironmentalInspectionUserE(); + inspectionUserFileE.init(cmd.getForeignKey(), 1, 9, ssoUser.getTenantId(), ssoUser.getOrgId(), ssoUser.getUserId()); + safetyEnvironmentalInspectionUserGateway.add(inspectionUserFileE); + // 如果是修改安全环保检查状态为归档 + safetyEnvironmentalInspectionRepository.updateStatus(cmd.getForeignKey(), 5); + } + } else if (cmd.getState() == 0){ // 验收未通过 + // 将修改安全环保检查隐患整改操作记录改为未完成 SafetyEnvironmentalInspectionUserDO inspectionUserDO = new SafetyEnvironmentalInspectionUserDO(); inspectionUserDO.setInspectionId(cmd.getForeignKey()); inspectionUserDO.setUserId(ssoUser.getUserId()); - inspectionUserDO.setType(8); - inspectionUserDO.setStatus(1); - inspectionUserDO.setSignatureTime(LocalDateTime.now()); + inspectionUserDO.setType(7); + inspectionUserDO.setStatus(0); + inspectionUserDO.setSignatureTime(null); safetyEnvironmentalInspectionUserRepository.editUserInfo(inspectionUserDO); - // 生成安全环保检查归档操作记录（直接完成） - SafetyEnvironmentalInspectionUserE inspectionUserFileE = new SafetyEnvironmentalInspectionUserE(); - inspectionUserFileE.init(cmd.getForeignKey(), 1, 9, ssoUser.getTenantId(), ssoUser.getOrgId(), ssoUser.getUserId()); - safetyEnvironmentalInspectionUserGateway.add(inspectionUserFileE); - // 如果是修改安全环保检查状态为归档 - safetyEnvironmentalInspectionRepository.updateStatus(cmd.getForeignKey(), 5); } - } else if (cmd.getState() == 0){ // 验收未通过 - // 将修改安全环保检查隐患整改操作记录改为未完成 - SafetyEnvironmentalInspectionUserDO inspectionUserDO = new SafetyEnvironmentalInspectionUserDO(); - inspectionUserDO.setInspectionId(cmd.getForeignKey()); - inspectionUserDO.setUserId(ssoUser.getUserId()); - inspectionUserDO.setType(7); - inspectionUserDO.setStatus(0); - inspectionUserDO.setSignatureTime(null); - safetyEnvironmentalInspectionUserRepository.editUserInfo(inspectionUserDO); } - if (!res) { throw new BizException("修改失败"); } diff --git a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenRectificationRecordUpdateExe.java b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenRectificationRecordUpdateExe.java index 2d166da..7d101a0 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenRectificationRecordUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenRectificationRecordUpdateExe.java @@ -8,6 +8,7 @@ import com.zcloud.key.project.domain.gateway.inspection.SafetyEnvironmentalInspe import com.zcloud.key.project.domain.model.hidden.HiddenRectificationRecordE; import com.zcloud.key.project.domain.model.inspection.SafetyEnvironmentalInspectionUserE; import com.zcloud.key.project.dto.hidden.HiddenRectificationRecordUpdateCmd; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO; import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO; import com.zcloud.key.project.persistence.repository.hidden.HiddenRepository; import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionRepository; @@ -52,30 +53,34 @@ public class HiddenRectificationRecordUpdateExe { SSOUser ssoUser = AuthContext.getCurrentUser(); BeanUtils.copyProperties(cmd, hiddenRectificationRecordE); hiddenRectificationRecordE.init(ssoUser); + HiddenDO hiddenDO = hiddenRepository.getInfoByHiddenId(cmd.getHiddenId()); boolean res = hiddenRectificationRecordGateway.add(hiddenRectificationRecordE); hiddenRepository.updateState(cmd.getHiddenId(), 2); // 增加安全环保检查隐患验收操作记录 - Long acceptCount = safetyEnvironmentalInspectionUserRepository.countByInspectionId(cmd.getForeignKey(), null, 8); - if (acceptCount == 0){ - SafetyEnvironmentalInspectionUserE inspectionUserAcceptE = new SafetyEnvironmentalInspectionUserE(); - inspectionUserAcceptE.init(cmd.getForeignKey(), 0, 8, ssoUser.getTenantId(), ssoUser.getOrgId(), ssoUser.getUserId()); - safetyEnvironmentalInspectionUserGateway.add(inspectionUserAcceptE); - } - // 判断隐患是否全部整改完成， - List stateList = new ArrayList<>(); - stateList.add(1); - stateList.add(4); - Long count = hiddenRepository.countByForeignKey(cmd.getForeignKey(), stateList); - if (count == 0){// 全部整改完成 - // 修改安全环保检查隐患整改操作记录为完成 - SafetyEnvironmentalInspectionUserDO inspectionUserDO = new SafetyEnvironmentalInspectionUserDO(); - inspectionUserDO.setInspectionId(cmd.getForeignKey()); - inspectionUserDO.setUserId(ssoUser.getUserId()); - inspectionUserDO.setType(7); - inspectionUserDO.setStatus(1); - inspectionUserDO.setSignatureTime(LocalDateTime.now()); - safetyEnvironmentalInspectionUserRepository.editUserInfo(inspectionUserDO); + if (hiddenDO != null && (hiddenDO.getSource() == 2 || hiddenDO.getSource() == 3)){ + Long acceptCount = safetyEnvironmentalInspectionUserRepository.countByInspectionId(cmd.getForeignKey(), null, 8); + if (acceptCount == 0){ + SafetyEnvironmentalInspectionUserE inspectionUserAcceptE = new SafetyEnvironmentalInspectionUserE(); + inspectionUserAcceptE.init(cmd.getForeignKey(), 0, 8, ssoUser.getTenantId(), ssoUser.getOrgId(), ssoUser.getUserId()); + safetyEnvironmentalInspectionUserGateway.add(inspectionUserAcceptE); + } + // 判断隐患是否全部整改完成， + List stateList = new ArrayList<>(); + stateList.add(1); + stateList.add(4); + Long count = hiddenRepository.countByForeignKey(cmd.getForeignKey(), stateList); + if (count == 0){// 全部整改完成 + // 修改安全环保检查隐患整改操作记录为完成 + SafetyEnvironmentalInspectionUserDO inspectionUserDO = new SafetyEnvironmentalInspectionUserDO(); + inspectionUserDO.setInspectionId(cmd.getForeignKey()); + inspectionUserDO.setUserId(ssoUser.getUserId()); + inspectionUserDO.setType(7); + inspectionUserDO.setStatus(1); + inspectionUserDO.setSignatureTime(LocalDateTime.now()); + safetyEnvironmentalInspectionUserRepository.editUserInfo(inspectionUserDO); + } } + if (!res) { throw new BizException("修改失败"); } diff --git a/web-app/src/main/java/com/zcloud/key/project/service/ai/AiAlarmServiceImpl.java b/web-app/src/main/java/com/zcloud/key/project/service/ai/AiAlarmServiceImpl.java index 2c057df..29aa2fc 100644 --- a/web-app/src/main/java/com/zcloud/key/project/service/ai/AiAlarmServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/key/project/service/ai/AiAlarmServiceImpl.java @@ -8,6 +8,7 @@ import com.zcloud.key.project.command.ai.AiAlarmRemoveExe; import com.zcloud.key.project.command.ai.AiAlarmUpdateExe; import com.zcloud.key.project.command.query.ai.AiAlarmQueryExe; import com.zcloud.key.project.dto.ai.AiAlarmAddCmd; +import com.zcloud.key.project.dto.ai.AiAlarmBatchDealCmd; import com.zcloud.key.project.dto.ai.AiAlarmPageQry; import com.zcloud.key.project.dto.ai.AiAlarmUpdateCmd; import com.zcloud.key.project.dto.clientobject.ai.AiAlarmCO; @@ -60,5 +61,10 @@ public class AiAlarmServiceImpl implements AiAlarmServiceI { public void removeBatch(Long[] ids) { aiAlarmRemoveExe.execute(ids); } + + @Override + public void dealBatch(AiAlarmBatchDealCmd cmd) { + aiAlarmUpdateExe.dealBatch(cmd); + } } diff --git a/web-client/src/main/java/com/zcloud/key/project/api/ai/AiAlarmServiceI.java b/web-client/src/main/java/com/zcloud/key/project/api/ai/AiAlarmServiceI.java index 73e3f5e..90993f3 100644 --- a/web-client/src/main/java/com/zcloud/key/project/api/ai/AiAlarmServiceI.java +++ b/web-client/src/main/java/com/zcloud/key/project/api/ai/AiAlarmServiceI.java @@ -3,6 +3,7 @@ package com.zcloud.key.project.api.ai; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.key.project.dto.ai.AiAlarmAddCmd; +import com.zcloud.key.project.dto.ai.AiAlarmBatchDealCmd; import com.zcloud.key.project.dto.ai.AiAlarmPageQry; import com.zcloud.key.project.dto.ai.AiAlarmUpdateCmd; import com.zcloud.key.project.dto.clientobject.ai.AiAlarmCO; @@ -25,5 +26,7 @@ public interface AiAlarmServiceI { void remove(Long id); void removeBatch(Long[] ids); + + void dealBatch(AiAlarmBatchDealCmd cmd); } diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/ai/AiAlarmBatchDealCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/ai/AiAlarmBatchDealCmd.java new file mode 100644 index 0000000..867595a --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/ai/AiAlarmBatchDealCmd.java @@ -0,0 +1,30 @@ +package com.zcloud.key.project.dto.ai; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * web-client + * + * @Author zhangyue + * @Date 2026-04-08 10:09:34 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class AiAlarmBatchDealCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private List ids; + + +} + diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/ai/AiAlarmPageQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/ai/AiAlarmPageQry.java index a002c75..dc7adc3 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/ai/AiAlarmPageQry.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/ai/AiAlarmPageQry.java @@ -24,5 +24,8 @@ public class AiAlarmPageQry extends PageQuery { * - `ne`: 不等比较查询，对应SQL的!=操作符 */ private String likeAiAlarmId; + private String videoName; + private String keyProjectName; + private Integer state; } diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/ai/AiAlarmUpdateCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/ai/AiAlarmUpdateCmd.java index d9f3b90..0b8def3 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/ai/AiAlarmUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/ai/AiAlarmUpdateCmd.java @@ -26,40 +26,10 @@ public class AiAlarmUpdateCmd extends Command { @ApiModelProperty(value = "主键", name = "id", required = true) @NotNull(message = "主键不能为空") private Long id; - @ApiModelProperty(value = "业务主键id", name = "aiAlarmId", required = true) - @NotEmpty(message = "业务主键id不能为空") - private String aiAlarmId; - @ApiModelProperty(value = "重点作业id", name = "keyProjectId", required = true) - @NotEmpty(message = "重点作业id不能为空") - private String keyProjectId; - @ApiModelProperty(value = "视频id", name = "videoId", required = true) - @NotEmpty(message = "视频id不能为空") - private String videoId; - @ApiModelProperty(value = "视频名称", name = "videoName", required = true) - @NotEmpty(message = "视频名称不能为空") - private String videoName; - @ApiModelProperty(value = "报警类型", name = "type", required = true) - @NotEmpty(message = "报警类型不能为空") - private String type; - @ApiModelProperty(value = "报警类型名称", name = "typeName", required = true) - @NotEmpty(message = "报警类型名称不能为空") - private String typeName; - @ApiModelProperty(value = "报警时间", name = "alarmTime", required = true) - @NotNull(message = "报警时间不能为空") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime alarmTime; - @ApiModelProperty(value = "处置状态 0-待处理 1-已处理", name = "state", required = true) - @NotNull(message = "处置状态 0-待处理 1-已处理不能为空") - private Integer state; - @ApiModelProperty(value = "所属企业", name = "corpinfoId", required = true) - @NotNull(message = "所属企业不能为空") - private Long corpinfoId; - @ApiModelProperty(value = "所属部门", name = "departmentId", required = true) - @NotNull(message = "所属部门不能为空") - private Long departmentId; - @ApiModelProperty(value = "处置人", name = "disposeUserId", required = true) - @NotNull(message = "处置人不能为空") - private Long disposeUserId; + @ApiModelProperty(value = "是否存在隐患 0-否 1-是", name = "hasHidden", required = true) + @NotNull(message = "是否存在隐患 0-否 1-是") + private Integer hasHidden; + } diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/ai/AiAlarmCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/ai/AiAlarmCO.java index b21d96b..f30fb7a 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/ai/AiAlarmCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/ai/AiAlarmCO.java @@ -1,6 +1,7 @@ package com.zcloud.key.project.dto.clientobject.ai; import com.alibaba.cola.dto.ClientObject; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -26,6 +27,11 @@ public class AiAlarmCO extends ClientObject { //重点作业id @ApiModelProperty(value = "重点作业id") private String keyProjectId; + @ApiModelProperty(value = "项目名称") + private String projectName; + + @ApiModelProperty(value = "是否存在隐患 0-否 1-是") + private Integer hasHidden; //视频id @ApiModelProperty(value = "视频id") private String videoId; diff --git a/web-domain/src/main/java/com/zcloud/key/project/domain/model/ai/AiAlarmE.java b/web-domain/src/main/java/com/zcloud/key/project/domain/model/ai/AiAlarmE.java index ccf9c24..8f40e4f 100644 --- a/web-domain/src/main/java/com/zcloud/key/project/domain/model/ai/AiAlarmE.java +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/model/ai/AiAlarmE.java @@ -1,8 +1,10 @@ package com.zcloud.key.project.domain.model.ai; import com.jjb.saas.framework.domain.model.BaseE; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; import java.time.LocalDateTime; /** @@ -29,6 +31,7 @@ public class AiAlarmE extends BaseE { private LocalDateTime alarmTime; //处置状态 0-待处理 1-已处理 private Integer state; + private Integer hasHidden; //所属企业 private Long corpinfoId; //所属部门 diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/ai/AiAlarmDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/ai/AiAlarmDO.java index fc4e446..038a865 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/ai/AiAlarmDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/ai/AiAlarmDO.java @@ -1,5 +1,6 @@ package com.zcloud.key.project.persistence.dataobject.ai; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.jjb.saas.framework.repository.basedo.BaseDO; import io.swagger.annotations.ApiModelProperty; @@ -7,6 +8,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotNull; import java.time.LocalDateTime; /** @@ -26,6 +28,12 @@ public class AiAlarmDO extends BaseDO { //重点作业id @ApiModelProperty(value = "重点作业id") private String keyProjectId; + + @ApiModelProperty(value = "项目名称") + @TableField(exist = false) + private String projectName; + @ApiModelProperty(value = "是否存在隐患 0-否 1-是") + private Integer hasHidden; //视频id @ApiModelProperty(value = "视频id") private String videoId; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenMapper.java index aef67df..2957e65 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenMapper.java @@ -23,5 +23,7 @@ public interface HiddenMapper extends BaseMapper { HiddenDO getInfoById(Long id); List listAllByForeignId(@Param("params") Map params); + + } 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 d1c3d47..377f807 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 @@ -1,9 +1,12 @@ package com.zcloud.key.project.persistence.mapper.ai; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.zcloud.key.project.persistence.dataobject.ai.AiAlarmDO; import org.apache.ibatis.annotations.Mapper; +import java.util.Map; + /** * web-infrastructure * @@ -12,6 +15,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface AiAlarmMapper extends BaseMapper { - + IPage selectListPage(IPage iPage, Map params, String menuPerms); } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenRepository.java index 133349c..9b72944 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenRepository.java @@ -29,5 +29,7 @@ public interface HiddenRepository extends BaseRepository { Long countByForeignKey(String foreignKey, List state); HiddenDO getInfoById(Long id); + + HiddenDO getInfoByHiddenId(String hiddenId); } 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 0fbc7ae..43b4878 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 @@ -29,10 +29,7 @@ public class AiAlarmRepositoryImpl extends BaseRepositoryImpl listPage(Map params) { IPage iPage = new Query().getPage(params); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); - queryWrapper.orderByDesc("create_time"); - IPage result = aiAlarmMapper.selectPage(iPage, queryWrapper); + IPage result = aiAlarmMapper.selectListPage(iPage, params, null); return PageHelper.pageToResponse(result, result.getRecords()); } } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenRepositoryImpl.java index 419d2a5..2e9e4f1 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenRepositoryImpl.java @@ -98,5 +98,12 @@ public class HiddenRepositoryImpl extends BaseRepositoryImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("hidden_id", hiddenId); + return hiddenMapper.selectOne(queryWrapper); + } } diff --git a/web-infrastructure/src/main/resources/mapper/ai/AiAlarmMapper.xml b/web-infrastructure/src/main/resources/mapper/ai/AiAlarmMapper.xml index 38ec1fd..d27cd54 100644 --- a/web-infrastructure/src/main/resources/mapper/ai/AiAlarmMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/ai/AiAlarmMapper.xml @@ -3,6 +3,25 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - +