From 125c3a626caa4079762d556e666a7bd869cc82c2 Mon Sep 17 00:00:00 2001 From: zhangyue Date: Mon, 13 Apr 2026 11:33:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=89=E5=85=A8=E7=8E=AF?= =?UTF-8?q?=E4=BF=9D=E6=A3=80=E6=9F=A5=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...fetyEnvironmentalInspectionController.java | 8 +- ...etyEnvironmentalInspectionCoConvertor.java | 3 + .../command/query/ai/AiAlarmQueryExe.java | 2 +- ...SafetyEnvironmentalInspectionQueryExe.java | 27 ++++++- ...etyEnvironmentalInspectionServiceImpl.java | 7 ++ ...SafetyEnvironmentalInspectionServiceI.java | 4 + .../dto/clientobject/ai/AiAlarmCO.java | 8 ++ .../persistence/dataobject/ai/AiAlarmDO.java | 19 +++++ .../persistence/mapper/ai/AiAlarmMapper.java | 2 + .../SafetyEnvironmentalInspectionMapper.java | 3 + .../repository/ai/AiAlarmRepository.java | 2 + .../impl/ai/AiAlarmRepositoryImpl.java | 5 ++ ...EnvironmentalInspectionRepositoryImpl.java | 6 ++ ...fetyEnvironmentalInspectionRepository.java | 3 + .../resources/mapper/ai/AiAlarmMapper.xml | 16 ++++ .../SafetyEnvironmentalInspectionMapper.xml | 77 +++++++++++++++++++ 16 files changed, 186 insertions(+), 6 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/key/project/web/inspection/SafetyEnvironmentalInspectionController.java b/web-adapter/src/main/java/com/zcloud/key/project/web/inspection/SafetyEnvironmentalInspectionController.java index 1dcb6c6..b335fcd 100644 --- a/web-adapter/src/main/java/com/zcloud/key/project/web/inspection/SafetyEnvironmentalInspectionController.java +++ b/web-adapter/src/main/java/com/zcloud/key/project/web/inspection/SafetyEnvironmentalInspectionController.java @@ -5,6 +5,7 @@ import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; +import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.key.project.api.inspection.SafetyEnvironmentalInspectionServiceI; import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionCO; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionAddCmd; @@ -17,6 +18,7 @@ import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; /** @@ -70,7 +72,11 @@ public class SafetyEnvironmentalInspectionController { public PageResponse page(@RequestBody SafetyEnvironmentalInspectionPageQry qry) { return safetyEnvironmentalInspectionService.listPage(qry); } - + @ApiOperation("导出") + @GetMapping("/export") + public void export(@RequestParam(value = "ids") Long[] ids, HttpServletResponse httpServletResponse) { + safetyEnvironmentalInspectionService.export(ids, httpServletResponse); + } @ApiOperation("所有数据") @GetMapping("/listAll") public MultiResponse listAll() { diff --git a/web-app/src/main/java/com/zcloud/key/project/command/convertor/inspection/SafetyEnvironmentalInspectionCoConvertor.java b/web-app/src/main/java/com/zcloud/key/project/command/convertor/inspection/SafetyEnvironmentalInspectionCoConvertor.java index d7a25df..ae43df0 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/convertor/inspection/SafetyEnvironmentalInspectionCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/convertor/inspection/SafetyEnvironmentalInspectionCoConvertor.java @@ -1,5 +1,6 @@ package com.zcloud.key.project.command.convertor.inspection; +import com.zcloud.gbscommon.excelEntity.SafetyEnvironmentalInspectionExportEntity; import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionCO; import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO; import org.mapstruct.Mapper; @@ -22,5 +23,7 @@ public interface SafetyEnvironmentalInspectionCoConvertor { List converDOsToCOs(List safetyEnvironmentalInspectionDOs); SafetyEnvironmentalInspectionCO converDOToCO(SafetyEnvironmentalInspectionDO safetyEnvironmentalInspectionDO); + + List converDOsToExcelEntitys(List safetyEnvironmentalInspectionDOs); } 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 f6ca342..9863588 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 @@ -33,7 +33,7 @@ public class AiAlarmQueryExe { * @return */ public AiAlarmCO queryById(Long id) { - return aiAlarmCoConvertor.converDOToCO(aiAlarmRepository.getById(id)); + return aiAlarmCoConvertor.converDOToCO(aiAlarmRepository.findById(id)); } /** diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionQueryExe.java index 3b2f559..e40b368 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionQueryExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionQueryExe.java @@ -1,6 +1,10 @@ package com.zcloud.key.project.command.query.inspection; import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.exception.BizException; +import com.zcloud.gbscommon.excelEntity.SafetyEnvironmentalInspectionExportEntity; +import com.zcloud.gbscommon.excelEntity.UserExcelExportEntity; +import com.zcloud.gbscommon.utils.ExcelUtils; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.key.project.command.convertor.hidden.HiddenCoConvertor; import com.zcloud.key.project.command.convertor.hidden.HiddenFindUserCoConvertor; @@ -18,6 +22,7 @@ import com.zcloud.key.project.persistence.dataobject.hidden.HiddenFindUserDO; import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionContentDO; import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO; import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO; +import com.zcloud.key.project.persistence.mapper.inspection.SafetyEnvironmentalInspectionMapper; 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.SafetyEnvironmentalInspectionContentRepository; @@ -27,10 +32,9 @@ import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.util.ObjectUtils; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.*; import java.util.stream.Collectors; @@ -126,5 +130,20 @@ public class SafetyEnvironmentalInspectionQueryExe { List examCenterCOS = safetyEnvironmentalInspectionCoConvertor.converDOsToCOs(pageResponse.getData()); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + + public void export(Long[] ids, HttpServletResponse httpServletResponse) { + if (ids == null || ids.length == 0){ + throw new BizException("请勾选要导出的数据"); + } + Map params = new HashMap<>(); + params.put("ids", ids); + List safetyEnvironmentalInspectionDOs = safetyEnvironmentalInspectionRepository.listAll(params); + List safetyEnvironmentalInspectionExportEntities = safetyEnvironmentalInspectionCoConvertor.converDOsToExcelEntitys(safetyEnvironmentalInspectionDOs); + try { + ExcelUtils.exportExcel(httpServletResponse, SafetyEnvironmentalInspectionExportEntity.class, "安全环保检查信息", safetyEnvironmentalInspectionExportEntities); + } catch (IOException e) { + throw new RuntimeException(e); + } + } } diff --git a/web-app/src/main/java/com/zcloud/key/project/service/inspection/SafetyEnvironmentalInspectionServiceImpl.java b/web-app/src/main/java/com/zcloud/key/project/service/inspection/SafetyEnvironmentalInspectionServiceImpl.java index b297429..ae2c887 100644 --- a/web-app/src/main/java/com/zcloud/key/project/service/inspection/SafetyEnvironmentalInspectionServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/key/project/service/inspection/SafetyEnvironmentalInspectionServiceImpl.java @@ -15,6 +15,8 @@ import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUpdate import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletResponse; + /** * web-app * @@ -70,5 +72,10 @@ public class SafetyEnvironmentalInspectionServiceImpl implements SafetyEnvironme public void removeBatch(Long[] ids) { safetyEnvironmentalInspectionRemoveExe.execute(ids); } + + @Override + public void export(Long[] ids, HttpServletResponse httpServletResponse) { + safetyEnvironmentalInspectionQueryExe.export(ids, httpServletResponse); + } } diff --git a/web-client/src/main/java/com/zcloud/key/project/api/inspection/SafetyEnvironmentalInspectionServiceI.java b/web-client/src/main/java/com/zcloud/key/project/api/inspection/SafetyEnvironmentalInspectionServiceI.java index adc70e2..4889514 100644 --- a/web-client/src/main/java/com/zcloud/key/project/api/inspection/SafetyEnvironmentalInspectionServiceI.java +++ b/web-client/src/main/java/com/zcloud/key/project/api/inspection/SafetyEnvironmentalInspectionServiceI.java @@ -8,6 +8,8 @@ import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionAuditD import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionPageQry; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUpdateCmd; +import javax.servlet.http.HttpServletResponse; + /** * web-client * @@ -30,5 +32,7 @@ public interface SafetyEnvironmentalInspectionServiceI { void remove(Long id); void removeBatch(Long[] ids); + + void export(Long[] ids, HttpServletResponse httpServletResponse); } 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 f30fb7a..9b5b320 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 @@ -50,6 +50,14 @@ public class AiAlarmCO extends ClientObject { private LocalDateTime alarmTime; + @ApiModelProperty(value = "相关方单位负责人id") + private String xgfMasterUserId; + @ApiModelProperty(value = "相关方单位负责人名称") + private String xgfMasterUserName; + @ApiModelProperty(value = "相关方单位负责人部门id") + private String xgfMasterDepartmentId; + @ApiModelProperty(value = "相关方单位负责人部门名称") + private String xgfMasterDepartmentName; //处置状态 0-待处理 1-已处理 @ApiModelProperty(value = "处置状态 0-待处理 1-已处理") private Integer state; 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 038a865..29089b7 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 @@ -62,6 +62,25 @@ public class AiAlarmDO extends BaseDO { @ApiModelProperty(value = "处置人") private Long disposeUserId; + +// kp.xgf_master_user_id, +// xgfu.name as xgf_master_user_name, +// xgfu.department_id as xgf_master_department_id, +// xgfd.name as xgf_master_department_name + + @ApiModelProperty(value = "相关方单位负责人id") + @TableField(exist = false) + private String xgfMasterUserId; + @ApiModelProperty(value = "相关方单位负责人名称") + @TableField(exist = false) + private String xgfMasterUserName; + @ApiModelProperty(value = "相关方单位负责人部门id") + @TableField(exist = false) + private String xgfMasterDepartmentId; + @ApiModelProperty(value = "相关方单位负责人部门名称") + @TableField(exist = false) + private String xgfMasterDepartmentName; + public AiAlarmDO(String aiAlarmId) { this.aiAlarmId = aiAlarmId; } 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 377f807..f2e0099 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 @@ -16,5 +16,7 @@ import java.util.Map; @Mapper public interface AiAlarmMapper extends BaseMapper { IPage selectListPage(IPage iPage, Map params, String menuPerms); + + AiAlarmDO findById(Long id); } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java index 211366f..95030f8 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java @@ -8,6 +8,7 @@ import com.zcloud.key.project.persistence.dataobject.project.KeyProjectDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; import java.util.Map; /** @@ -24,5 +25,7 @@ public interface SafetyEnvironmentalInspectionMapper extends BaseMapper listAll(@Param("params") Map params); } 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 c2c02c6..8d6b40b 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 @@ -14,5 +14,7 @@ import java.util.Map; */ public interface AiAlarmRepository extends BaseRepository { PageResponse listPage(Map params); + + 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 43b4878..27f05f5 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 @@ -32,5 +32,10 @@ public class AiAlarmRepositoryImpl extends BaseRepositoryImpl result = aiAlarmMapper.selectListPage(iPage, params, null); return PageHelper.pageToResponse(result, result.getRecords()); } + + @Override + public AiAlarmDO findById(Long id) { + return aiAlarmMapper.findById(id); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionRepositoryImpl.java index 6cfc12b..05761d9 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionRepositoryImpl.java @@ -14,6 +14,7 @@ import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmen import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Map; /** @@ -61,5 +62,10 @@ public class SafetyEnvironmentalInspectionRepositoryImpl extends BaseRepositoryI public SafetyEnvironmentalInspectionDO getInfoById(Long id) { return safetyEnvironmentalInspectionMapper.getInfoById(id); } + + @Override + public List listAll(Map params) { + return safetyEnvironmentalInspectionMapper.listAll(params); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionRepository.java index d7c7318..6617025 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionRepository.java @@ -5,6 +5,7 @@ import com.jjb.saas.framework.repository.repo.BaseRepository; import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO; import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO; +import java.util.List; import java.util.Map; /** @@ -22,5 +23,7 @@ public interface SafetyEnvironmentalInspectionRepository extends BaseRepository< SafetyEnvironmentalInspectionDO getByInspectionId(String inspectionId); SafetyEnvironmentalInspectionDO getInfoById(Long id); + + List listAll(Map params); } diff --git a/web-infrastructure/src/main/resources/mapper/ai/AiAlarmMapper.xml b/web-infrastructure/src/main/resources/mapper/ai/AiAlarmMapper.xml index d27cd54..a3f3d92 100644 --- a/web-infrastructure/src/main/resources/mapper/ai/AiAlarmMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/ai/AiAlarmMapper.xml @@ -23,5 +23,21 @@ + + diff --git a/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml b/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml index cf05fbf..34b6689 100644 --- a/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml @@ -142,5 +142,82 @@ left join department ad on ad.id = i.department_id where i.id = #{id} + +