From ba532c0afea97a672c630d189c2926bc13fe3b85 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Fri, 28 Nov 2025 10:30:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E9=98=B2=E6=A3=80=E6=9F=A5init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- start/src/main/resources/nacos.yml | 6 +- .../web/FireCheckStandardController.java | 93 ++++++ .../fire/check/web/FireDeviceController.java | 91 ++++++ .../fire/check/web/FirePointController.java | 92 ++++++ .../fire/check/web/FireRegionController.java | 91 ++++++ .../fire/check/web/RiskPointController.java | 78 ----- .../command/FireCheckStandardAddExe.java | 40 +++ ...e.java => FireCheckStandardRemoveExe.java} | 24 +- .../command/FireCheckStandardUpdateExe.java | 34 ++ .../fire/check/command/FireDeviceAddExe.java | 47 +++ .../check/command/FireDeviceRemoveExe.java | 53 ++++ .../check/command/FireDeviceUpdateExe.java | 34 ++ .../fire/check/command/FirePointAddExe.java | 46 +++ .../check/command/FirePointRemoveExe.java | 66 ++++ .../check/command/FirePointUpdateExe.java | 41 +++ .../fire/check/command/FireRegionAddExe.java | 46 +++ .../check/command/FireRegionRemoveExe.java | 62 ++++ .../check/command/FireRegionUpdateExe.java | 56 ++++ .../fire/check/command/RiskPointAddExe.java | 37 --- .../check/command/RiskPointUpdateExe.java | 31 -- .../FireCheckStandardCoConvertor.java | 24 ++ .../convertor/FireDeviceCoConvertor.java | 27 ++ .../convertor/FirePointCoConvertor.java | 27 ++ .../convertor/FireRegionCoConvertor.java | 24 ++ .../convertor/RiskPointCoConvertor.java | 16 - .../query/FireCheckStandardQueryExe.java | 82 +++++ .../command/query/FireDeviceQueryExe.java | 149 +++++++++ .../command/query/FirePointQueryExe.java | 92 ++++++ .../command/query/FireRegionQueryExe.java | 79 +++++ .../command/query/RiskPointQueryExe.java | 36 --- .../service/FireCheckStandardServiceImpl.java | 79 +++++ .../check/service/FireDeviceServiceImpl.java | 84 +++++ .../check/service/FirePointServiceImpl.java | 83 +++++ .../check/service/FireRegionServiceImpl.java | 76 +++++ .../check/service/RiskPointServiceImpl.java | 56 ---- .../check/api/FireCheckStandardServiceI.java | 38 +++ .../fire/check/api/FireDeviceServiceI.java | 40 +++ .../fire/check/api/FirePointServiceI.java | 39 +++ .../fire/check/api/FireRegionServiceI.java | 35 ++ .../fire/check/api/RiskPointServiceI.java | 20 -- .../check/dto/FireCheckStandardAddCmd.java | 48 +++ .../check/dto/FireCheckStandardImportCmd.java | 33 ++ .../check/dto/FireCheckStandardPageQry.java | 33 ++ .../check/dto/FireCheckStandardUpdateCmd.java | 45 +++ .../fire/check/dto/FireDeviceAddCmd.java | 67 ++++ .../fire/check/dto/FireDeviceListQry.java | 51 +++ .../fire/check/dto/FireDevicePageQry.java | 50 +++ .../fire/check/dto/FireDeviceRemoveCmd.java | 31 ++ .../fire/check/dto/FireDeviceUpdateCmd.java | 59 ++++ .../fire/check/dto/FirePointAddCmd.java | 54 ++++ .../fire/check/dto/FirePointPageQry.java | 45 +++ .../fire/check/dto/FirePointRemoveCmd.java | 29 ++ .../fire/check/dto/FirePointUpdateCmd.java | 48 +++ .../dto/FirePointUpdateDepartmentCmd.java | 31 ++ .../fire/check/dto/FireRegionAddCmd.java | 50 +++ .../fire/check/dto/FireRegionPageQry.java | 38 +++ .../fire/check/dto/FireRegionRemoveCmd.java | 29 ++ .../fire/check/dto/FireRegionUpdateCmd.java | 47 +++ .../dto/FireRegionUpdateDepartmentCmd.java | 31 ++ .../check/dto/FireRegionUpdateStatusCmd.java | 32 ++ .../fire/check/dto/RiskPointAddCmd.java | 30 -- .../fire/check/dto/RiskPointPageQry.java | 46 --- .../fire/check/dto/RiskPointUpdateCmd.java | 31 -- .../dto/clientobject/FireCheckStandardCO.java | 79 +++++ .../check/dto/clientobject/FireDeviceCO.java | 98 ++++++ .../check/dto/clientobject/FirePointCO.java | 83 +++++ .../check/dto/clientobject/FireRegionCO.java | 76 +++++ .../check/dto/clientobject/RiskPointCo.java | 17 - .../check/domain/enums/CommonFlagEnum.java | 17 + .../domain/enums/FireDeviceTypeEnum.java | 81 +++++ .../domain/enums/FireRegionStateEnum.java | 29 ++ .../gateway/FireCheckStandardGateway.java | 30 ++ .../domain/gateway/FireDeviceGateway.java | 33 ++ .../domain/gateway/FirePointGateway.java | 30 ++ .../domain/gateway/FireRegionGateway.java | 30 ++ .../domain/gateway/RiskPointGateway.java | 33 -- .../fire/check/domain/model/CorpInfoE.java | 167 ++++++++++ .../fire/check/domain/model/DepartmentE.java | 40 +++ .../domain/model/FireCheckStandardE.java | 123 +++++++ .../fire/check/domain/model/FireDeviceE.java | 299 ++++++++++++++++++ .../fire/check/domain/model/FirePointE.java | 86 +++++ .../fire/check/domain/model/FireRegionE.java | 65 ++++ .../fire/check/domain/model/RiskPointE.java | 20 -- .../zcloud/fire/check/domain/model/UserE.java | 113 +++++++ .../FireCheckStandardGatewayImpl.java | 59 ++++ .../gatewayimpl/FireDeviceGatewayImpl.java | 63 ++++ .../gatewayimpl/FirePointGatewayImpl.java | 63 ++++ .../gatewayimpl/FireRegionGatewayImpl.java | 63 ++++ .../gatewayimpl/RiskPointGatewayImpl.java | 51 --- .../persistence/dataobject/CorpInfoDO.java | 229 ++++++++++++++ .../persistence/dataobject/DepartmentDO.java | 50 +++ .../dataobject/FireCheckStandardDO.java | 48 +++ .../persistence/dataobject/FireDeviceDO.java | 87 +++++ .../dataobject/FireDeviceStatisticDO.java | 23 ++ .../persistence/dataobject/FirePointDO.java | 62 ++++ .../dataobject/FirePointStatisticDO.java | 27 ++ .../persistence/dataobject/FireRegionDO.java | 53 ++++ .../persistence/dataobject/RiskPointDO.java | 16 - .../check/persistence/dataobject/UserDO.java | 134 ++++++++ .../persistence/domainobject/RiskPointDO.java | 16 - .../persistence/mapper/CorpInfoMapper.java | 17 + .../persistence/mapper/DepartmentMapper.java | 17 + .../mapper/FireCheckStandardMapper.java | 17 + .../persistence/mapper/FireDeviceMapper.java | 28 ++ .../persistence/mapper/FirePointMapper.java | 25 ++ .../persistence/mapper/FireRegionMapper.java | 21 ++ .../persistence/mapper/RiskPointMapper.java | 9 - .../check/persistence/mapper/UserMapper.java | 16 + .../repository/CorpInfoRepository.java | 24 ++ .../repository/DepartmentRepository.java | 19 ++ .../FireCheckStandardRepository.java | 24 ++ .../repository/FireDeviceRepository.java | 32 ++ .../repository/FirePointRepository.java | 33 ++ .../repository/FireRegionRepository.java | 27 ++ .../repository/RiskPointRepository.java | 15 - .../repository/UserRepository.java | 18 ++ .../impl/CorpInfoRepositoryImpl.java | 70 ++++ .../impl/DepartmentRepositoryImpl.java | 32 ++ .../impl/FireCheckStandardRepositoryImpl.java | 54 ++++ .../impl/FireDeviceRepositoryImpl.java | 100 ++++++ .../impl/FirePointRepositoryImpl.java | 99 ++++++ .../impl/FireRegionRepositoryImpl.java | 74 +++++ .../impl/RiskPointRepositoryImpl.java | 35 -- .../repository/impl/UserRepositoryImpl.java | 30 ++ .../main/resources/mapper/CorpInfoMapper.xml | 8 + .../mapper/FireCheckStandardMapper.xml | 8 + .../resources/mapper/FireDeviceMapper.xml | 119 +++++++ .../main/resources/mapper/FirePointMapper.xml | 57 ++++ .../resources/mapper/FireRegionMapper.xml | 30 ++ 129 files changed, 6178 insertions(+), 605 deletions(-) create mode 100644 web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckStandardController.java create mode 100644 web-adapter/src/main/java/com/zcloud/fire/check/web/FireDeviceController.java create mode 100644 web-adapter/src/main/java/com/zcloud/fire/check/web/FirePointController.java create mode 100644 web-adapter/src/main/java/com/zcloud/fire/check/web/FireRegionController.java delete mode 100644 web-adapter/src/main/java/com/zcloud/fire/check/web/RiskPointController.java create mode 100644 web-app/src/main/java/com/zcloud/fire/check/command/FireCheckStandardAddExe.java rename web-app/src/main/java/com/zcloud/fire/check/command/{RiskPointRemoveExe.java => FireCheckStandardRemoveExe.java} (58%) create mode 100644 web-app/src/main/java/com/zcloud/fire/check/command/FireCheckStandardUpdateExe.java create mode 100644 web-app/src/main/java/com/zcloud/fire/check/command/FireDeviceAddExe.java create mode 100644 web-app/src/main/java/com/zcloud/fire/check/command/FireDeviceRemoveExe.java create mode 100644 web-app/src/main/java/com/zcloud/fire/check/command/FireDeviceUpdateExe.java create mode 100644 web-app/src/main/java/com/zcloud/fire/check/command/FirePointAddExe.java create mode 100644 web-app/src/main/java/com/zcloud/fire/check/command/FirePointRemoveExe.java create mode 100644 web-app/src/main/java/com/zcloud/fire/check/command/FirePointUpdateExe.java create mode 100644 web-app/src/main/java/com/zcloud/fire/check/command/FireRegionAddExe.java create mode 100644 web-app/src/main/java/com/zcloud/fire/check/command/FireRegionRemoveExe.java create mode 100644 web-app/src/main/java/com/zcloud/fire/check/command/FireRegionUpdateExe.java delete mode 100644 web-app/src/main/java/com/zcloud/fire/check/command/RiskPointAddExe.java delete mode 100644 web-app/src/main/java/com/zcloud/fire/check/command/RiskPointUpdateExe.java create mode 100644 web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckStandardCoConvertor.java create mode 100644 web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireDeviceCoConvertor.java create mode 100644 web-app/src/main/java/com/zcloud/fire/check/command/convertor/FirePointCoConvertor.java create mode 100644 web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireRegionCoConvertor.java delete mode 100644 web-app/src/main/java/com/zcloud/fire/check/command/convertor/RiskPointCoConvertor.java create mode 100644 web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckStandardQueryExe.java create mode 100644 web-app/src/main/java/com/zcloud/fire/check/command/query/FireDeviceQueryExe.java create mode 100644 web-app/src/main/java/com/zcloud/fire/check/command/query/FirePointQueryExe.java create mode 100644 web-app/src/main/java/com/zcloud/fire/check/command/query/FireRegionQueryExe.java delete mode 100644 web-app/src/main/java/com/zcloud/fire/check/command/query/RiskPointQueryExe.java create mode 100644 web-app/src/main/java/com/zcloud/fire/check/service/FireCheckStandardServiceImpl.java create mode 100644 web-app/src/main/java/com/zcloud/fire/check/service/FireDeviceServiceImpl.java create mode 100644 web-app/src/main/java/com/zcloud/fire/check/service/FirePointServiceImpl.java create mode 100644 web-app/src/main/java/com/zcloud/fire/check/service/FireRegionServiceImpl.java delete mode 100644 web-app/src/main/java/com/zcloud/fire/check/service/RiskPointServiceImpl.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/api/FireCheckStandardServiceI.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/api/FireDeviceServiceI.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/api/FirePointServiceI.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/api/FireRegionServiceI.java delete mode 100644 web-client/src/main/java/com/zcloud/fire/check/api/RiskPointServiceI.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckStandardAddCmd.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckStandardImportCmd.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckStandardPageQry.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckStandardUpdateCmd.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceAddCmd.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceListQry.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/FireDevicePageQry.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceRemoveCmd.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceUpdateCmd.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/FirePointAddCmd.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/FirePointPageQry.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/FirePointRemoveCmd.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/FirePointUpdateCmd.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/FirePointUpdateDepartmentCmd.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionAddCmd.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionPageQry.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionRemoveCmd.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionUpdateCmd.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionUpdateDepartmentCmd.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionUpdateStatusCmd.java delete mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/RiskPointAddCmd.java delete mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/RiskPointPageQry.java delete mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/RiskPointUpdateCmd.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckStandardCO.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireDeviceCO.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FirePointCO.java create mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireRegionCO.java delete mode 100644 web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/RiskPointCo.java create mode 100644 web-domain/src/main/java/com/zcloud/fire/check/domain/enums/CommonFlagEnum.java create mode 100644 web-domain/src/main/java/com/zcloud/fire/check/domain/enums/FireDeviceTypeEnum.java create mode 100644 web-domain/src/main/java/com/zcloud/fire/check/domain/enums/FireRegionStateEnum.java create mode 100644 web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckStandardGateway.java create mode 100644 web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireDeviceGateway.java create mode 100644 web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FirePointGateway.java create mode 100644 web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireRegionGateway.java delete mode 100644 web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/RiskPointGateway.java create mode 100644 web-domain/src/main/java/com/zcloud/fire/check/domain/model/CorpInfoE.java create mode 100644 web-domain/src/main/java/com/zcloud/fire/check/domain/model/DepartmentE.java create mode 100644 web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckStandardE.java create mode 100644 web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireDeviceE.java create mode 100644 web-domain/src/main/java/com/zcloud/fire/check/domain/model/FirePointE.java create mode 100644 web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireRegionE.java delete mode 100644 web-domain/src/main/java/com/zcloud/fire/check/domain/model/RiskPointE.java create mode 100644 web-domain/src/main/java/com/zcloud/fire/check/domain/model/UserE.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckStandardGatewayImpl.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireDeviceGatewayImpl.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FirePointGatewayImpl.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireRegionGatewayImpl.java delete mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/RiskPointGatewayImpl.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/CorpInfoDO.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/DepartmentDO.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckStandardDO.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireDeviceDO.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireDeviceStatisticDO.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FirePointDO.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FirePointStatisticDO.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireRegionDO.java delete mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/RiskPointDO.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/UserDO.java delete mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/domainobject/RiskPointDO.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/CorpInfoMapper.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/DepartmentMapper.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckStandardMapper.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireDeviceMapper.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FirePointMapper.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireRegionMapper.java delete mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/RiskPointMapper.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/UserMapper.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/CorpInfoRepository.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/DepartmentRepository.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckStandardRepository.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireDeviceRepository.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FirePointRepository.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireRegionRepository.java delete mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/RiskPointRepository.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/UserRepository.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/CorpInfoRepositoryImpl.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/DepartmentRepositoryImpl.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckStandardRepositoryImpl.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireDeviceRepositoryImpl.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FirePointRepositoryImpl.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireRegionRepositoryImpl.java delete mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/RiskPointRepositoryImpl.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/UserRepositoryImpl.java create mode 100644 web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml create mode 100644 web-infrastructure/src/main/resources/mapper/FireCheckStandardMapper.xml create mode 100644 web-infrastructure/src/main/resources/mapper/FireDeviceMapper.xml create mode 100644 web-infrastructure/src/main/resources/mapper/FirePointMapper.xml create mode 100644 web-infrastructure/src/main/resources/mapper/FireRegionMapper.xml diff --git a/start/src/main/resources/nacos.yml b/start/src/main/resources/nacos.yml index af260d4..95efe69 100644 --- a/start/src/main/resources/nacos.yml +++ b/start/src/main/resources/nacos.yml @@ -2,10 +2,10 @@ nacos: url: 192.168.20.100:30290 namespace: jjb-dragon application: - name: jjb-saas-zcloud-risk + name: jjb-saas-zcloud-fire-check version: - gateway: risk - cn-name: 风险中心 + gateway: fire-check + cn-name: 消防检查 spring: application: name: ${application.name}${application.version} diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckStandardController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckStandardController.java new file mode 100644 index 0000000..3ced341 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckStandardController.java @@ -0,0 +1,93 @@ +package com.zcloud.fire.check.web; + + +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.model.SSOUser; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.fire.check.api.FireCheckStandardServiceI; +import com.zcloud.fire.check.dto.FireCheckStandardAddCmd; +import com.zcloud.fire.check.dto.FireCheckStandardImportCmd; +import com.zcloud.fire.check.dto.FireCheckStandardPageQry; +import com.zcloud.fire.check.dto.FireCheckStandardUpdateCmd; +import com.zcloud.fire.check.dto.clientobject.FireCheckStandardCO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.validation.constraints.NotBlank; +import java.util.ArrayList; + +/** + * web-adapter + * + * @Author zhaokai + * @Date 2025-11-26 10:12:14 + */ +@Api(tags = "消防检查标准表") +@RequestMapping("/${application.gateway}/fireCheckStandard") +@RestController +@AllArgsConstructor +public class FireCheckStandardController { + private final FireCheckStandardServiceI fireCheckStandardService; + + @ApiOperation("消防检查标准新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody FireCheckStandardAddCmd cmd) { + return fireCheckStandardService.add(cmd); + } + + @ApiOperation("消防检查标准分页") + @PostMapping("/list") + public PageResponse page(@RequestBody FireCheckStandardPageQry qry) { + return fireCheckStandardService.listPage(qry); + } + + + @ApiOperation("消防检查标准-根据条件查询所有数据") + @PostMapping("/listAll") + public MultiResponse listAll(@RequestBody FireCheckStandardPageQry qry) { + return MultiResponse.of(fireCheckStandardService.listAll(qry)); + } + + @ApiOperation("消防检查标准详情") + @PostMapping("/info/{id}") + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(fireCheckStandardService.getInfoById(id)); + } + + @ApiOperation("消防检查标准-删除") + @PostMapping("/remove/{id}") + public Response remove(@PathVariable("id") Long id) { + fireCheckStandardService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("消防检查标准-删除多个") + @PostMapping("/remove/ids") + public Response removeBatch(@RequestParam Long[] ids) { + fireCheckStandardService.removeBatch(ids); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("消防检查标准-修改") + @PostMapping("/edit") + public SingleResponse edit(@Validated @RequestBody FireCheckStandardUpdateCmd fireCheckStandardUpdateCmd) { + fireCheckStandardService.edit(fireCheckStandardUpdateCmd); + return SingleResponse.buildSuccess(); + } + @ApiOperation("消防检查标准-导入") + @PostMapping("/importFireCheckStandardList") + public Response importFireCheckStandardList( @RequestPart(value = "file") MultipartFile file, + @Validated FireCheckStandardImportCmd fireCheckStandardImportCmd + ) { + fireCheckStandardService.importFireCheckStandardList(file,fireCheckStandardImportCmd); + return SingleResponse.buildSuccess(); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireDeviceController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireDeviceController.java new file mode 100644 index 0000000..05172b9 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireDeviceController.java @@ -0,0 +1,91 @@ +package com.zcloud.fire.check.web; + + +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.model.SSOUser; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.fire.check.api.FireDeviceServiceI; +import com.zcloud.fire.check.dto.*; +import com.zcloud.fire.check.dto.clientobject.FireDeviceCO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; + +/** + * web-adapter + * + * @Author zhaokai + * @Date 2025-11-26 10:12:34 + */ +@Api(tags = "消防器材维护表") +@RequestMapping("/${application.gateway}/fireDevice") +@RestController +@AllArgsConstructor +public class FireDeviceController { + private final FireDeviceServiceI fireDeviceService; + + @ApiOperation("消防器材新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody FireDeviceAddCmd cmd) { + return fireDeviceService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody FireDevicePageQry qry) { + return fireDeviceService.listPage(qry); + } + + @ApiOperation("消防器材详情") + @PostMapping("/info/{id}") + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(fireDeviceService.getInfoById(id)); + } + + @ApiOperation("删除") + @PostMapping("/remove/{id}") + public Response remove(@PathVariable("id") Long id) { + fireDeviceService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("删除多个") + @PostMapping("/remove/ids") + public Response removeBatch(@RequestBody FireDeviceRemoveCmd cmd) { + fireDeviceService.removeBatch(cmd.getIds()); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改") + @PostMapping("/edit") + public SingleResponse edit(@Validated @RequestBody FireDeviceUpdateCmd fireDeviceUpdateCmd) { + fireDeviceService.edit(fireDeviceUpdateCmd); + return SingleResponse.buildSuccess(); + } + @ApiOperation("消防器材-导出") + @GetMapping("/exportFireDevicePage") + public void exportFireDevicePage(@RequestParam(value = "ids") Long[] ids, HttpServletResponse httpServletResponse) { + fireDeviceService.exportFireDevicePage(ids, httpServletResponse); + } + @ApiOperation("消防器材-导入") + @PostMapping("/importFireDevicePage") + public void importFireDevicePage(@RequestPart(value = "file") MultipartFile file) { + fireDeviceService.importFireDevicePage(file); + } + @ApiOperation("根据条件获取所有消防器材") + @PostMapping("/getAllList") + public MultiResponse getAllList(@RequestBody FireDeviceListQry qry) { + return MultiResponse.of(fireDeviceService.getAllList(qry)); + } + +} + diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FirePointController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FirePointController.java new file mode 100644 index 0000000..f308186 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FirePointController.java @@ -0,0 +1,92 @@ +package com.zcloud.fire.check.web; + + +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.model.SSOUser; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.fire.check.api.FirePointServiceI; +import com.zcloud.fire.check.dto.*; +import com.zcloud.fire.check.dto.clientobject.FirePointCO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; + +/** + * web-adapter + * + * @Author zhaokai + * @Date 2025-11-26 10:12:54 + */ +@Api(tags = "消防点位维护表") +@RequestMapping("/${application.gateway}/firePoint") +@RestController +@AllArgsConstructor +public class FirePointController { + private final FirePointServiceI firePointService; + + @ApiOperation("消防点位新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody FirePointAddCmd cmd) { + return firePointService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody FirePointPageQry qry) { + return firePointService.listPage(qry); + } + + @ApiOperation("根据消防区域获取消防点位所有") + @PostMapping("/listByFireRegionId/{fireRegionId}") + public MultiResponse listByFireRegionId(@PathVariable("fireRegionId") String fireRegionId) { + return firePointService.listByFireRegionId(fireRegionId); + } + + @ApiOperation("消防点位详情") + @PostMapping("/info/{id}") + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(firePointService.getInfoById(id)); + } + + @ApiOperation("删除") + @PostMapping("/remove/{id}") + public Response remove(@PathVariable("id") Long id) { + firePointService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("删除多个") + @PostMapping("/remove/ids") + public Response removeBatch(@RequestBody FirePointRemoveCmd cmd) { + firePointService.removeBatch(cmd.getIds()); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改") + @PostMapping("/edit") + public SingleResponse edit(@Validated @RequestBody FirePointUpdateCmd firePointUpdateCmd) { + firePointService.edit(firePointUpdateCmd); + return SingleResponse.buildSuccess(); + } + @ApiOperation("批量修改负责部门") + @PostMapping("/editAllDepartment") + public SingleResponse editAllDepartment(@Validated @RequestBody FirePointUpdateDepartmentCmd firePointUpdateDepartmentCmd) { + firePointService.editAllDepartment(firePointUpdateDepartmentCmd); + return SingleResponse.buildSuccess(); + } + @ApiOperation("消防点位-导出") + @GetMapping("/exportFirePointPage") + public void exportFirePointPage(@RequestParam(value = "ids") Long[] ids, HttpServletResponse httpServletResponse) { + firePointService.exportFirePointPage(ids, httpServletResponse); + } + +} + diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireRegionController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireRegionController.java new file mode 100644 index 0000000..bcf8bce --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireRegionController.java @@ -0,0 +1,91 @@ +package com.zcloud.fire.check.web; + + +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.model.SSOUser; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.fire.check.api.FireRegionServiceI; +import com.zcloud.fire.check.dto.*; +import com.zcloud.fire.check.dto.clientobject.FireRegionCO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; + +/** + * web-adapter + * + * @Author zhaokai + * @Date 2025-11-26 10:13:09 + */ +@Api(tags = "消防区域表") +@RequestMapping("/${application.gateway}/fireRegion") +@RestController +@AllArgsConstructor +public class FireRegionController { + private final FireRegionServiceI fireRegionService; + + @ApiOperation("消防区域新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody FireRegionAddCmd cmd) { + return fireRegionService.add(cmd); + } + + @ApiOperation("消防区域列表分页") + @PostMapping("/list") + public PageResponse page(@RequestBody FireRegionPageQry qry) { + return fireRegionService.listPage(qry); + } + + @ApiOperation("详情") + @PostMapping("/info/{id}") + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(fireRegionService.getInfoById(id)); + } + + @ApiOperation("删除") + @PostMapping("/remove/{id}") + public Response remove(@PathVariable("id") Long id) { + fireRegionService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("删除多个") + @PostMapping("/remove/ids") + public Response removeBatch(@Validated @RequestBody FireRegionRemoveCmd cmd) { + fireRegionService.removeBatch(cmd.getIds()); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改") + @PostMapping("/edit") + public SingleResponse edit(@Validated @RequestBody FireRegionUpdateCmd fireRegionUpdateCmd) { + fireRegionService.edit(fireRegionUpdateCmd); + return SingleResponse.buildSuccess(); + } + @ApiOperation("修改启用禁用") + @PostMapping("/editStatus") + public SingleResponse editStatus(@Validated @RequestBody FireRegionUpdateStatusCmd fireRegionUpdateStatusCmd) { + fireRegionService.editStatus(fireRegionUpdateStatusCmd); + return SingleResponse.buildSuccess(); + } + @ApiOperation("批量修改负责部门") + @PostMapping("/editAllDepartment") + public SingleResponse editAllDepartment(@Validated @RequestBody FireRegionUpdateDepartmentCmd fireRegionUpdateDepartmentCmd) { + fireRegionService.editAllDepartment(fireRegionUpdateDepartmentCmd); + return SingleResponse.buildSuccess(); + } + //获取所有消防区域 + @ApiOperation("获取所有消防区域") + @PostMapping("/listAll/{corpinfoId}") + public MultiResponse listAll(@PathVariable("corpinfoId") Long corpinfoId) { + return MultiResponse.of(fireRegionService.listAll(corpinfoId)); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/RiskPointController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/RiskPointController.java deleted file mode 100644 index 1e59d29..0000000 --- a/web-adapter/src/main/java/com/zcloud/fire/check/web/RiskPointController.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.zcloud.fire.check.web; - - -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.zcloud.fire.check.api.RiskPointServiceI; -import com.zcloud.fire.check.dto.RiskPointAddCmd; -import com.zcloud.fire.check.dto.RiskPointPageQry; -import com.zcloud.fire.check.dto.RiskPointUpdateCmd; -import com.zcloud.fire.check.dto.clientobject.RiskPointCo; -import com.jjb.saas.framework.auth.model.SSOUser; -import com.jjb.saas.framework.auth.utils.AuthContext; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.ArrayList; - -/** - * @author lin - */ -@Api(tags = "风险点管理") -@RequestMapping("/risk/riskPoint") -@RestController -@AllArgsConstructor -public class RiskPointController { - private final RiskPointServiceI riskPointService; - - @ApiOperation("新增") - @PostMapping("/save") - public SingleResponse add(@Validated @RequestBody RiskPointAddCmd cmd) { - SSOUser ssoUser = AuthContext.getCurrentUser(); - return riskPointService.add(cmd); - } - - @ApiOperation("分页") - @PostMapping("/list") - public PageResponse page(@RequestBody RiskPointPageQry qry) { - return riskPointService.listPage(qry); - } - - @ApiOperation("所有数据") - @GetMapping("/listAll") - public MultiResponse listAll() { - return MultiResponse.of(new ArrayList()); - } - - @ApiOperation("详情") - @GetMapping("/{id}") - public SingleResponse getInfoById(@PathVariable("id") Long id) { - return SingleResponse.of(new RiskPointCo()); - } - - @ApiOperation("删除") - @DeleteMapping("/{id}") - public Response remove(@PathVariable("id") Long id) { - riskPointService.remove(id); - return SingleResponse.buildSuccess(); - } - - @ApiOperation("删除多个") - @DeleteMapping("/ids") - public Response removeBatch(@RequestParam Long[] ids) { - riskPointService.removeBatch(ids); - return SingleResponse.buildSuccess(); - } - - @ApiOperation("修改") - @PutMapping("/edit") - public SingleResponse edit(@Validated @RequestBody RiskPointUpdateCmd riskPointUpdateCmd) { - riskPointService.edit(riskPointUpdateCmd); - return SingleResponse.buildSuccess(); - } -} diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckStandardAddExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckStandardAddExe.java new file mode 100644 index 0000000..f9eb57a --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckStandardAddExe.java @@ -0,0 +1,40 @@ +package com.zcloud.fire.check.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.fire.check.domain.gateway.FireCheckStandardGateway; +import com.zcloud.fire.check.domain.model.FireCheckStandardE; +import com.zcloud.fire.check.dto.FireCheckStandardAddCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-11-26 10:12:14 + */ +@Component +@AllArgsConstructor +public class FireCheckStandardAddExe { + private final FireCheckStandardGateway fireCheckStandardGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(FireCheckStandardAddCmd cmd) { + FireCheckStandardE fireCheckStandardE = new FireCheckStandardE(); + BeanUtils.copyProperties(cmd, fireCheckStandardE); + boolean res = false; + try { + res = fireCheckStandardGateway.add(fireCheckStandardE); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("保存失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/RiskPointRemoveExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckStandardRemoveExe.java similarity index 58% rename from web-app/src/main/java/com/zcloud/fire/check/command/RiskPointRemoveExe.java rename to web-app/src/main/java/com/zcloud/fire/check/command/FireCheckStandardRemoveExe.java index 830c865..49fb27b 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/RiskPointRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckStandardRemoveExe.java @@ -1,33 +1,39 @@ package com.zcloud.fire.check.command; import com.alibaba.cola.exception.BizException; -import com.zcloud.fire.check.domain.gateway.RiskPointGateway; +import com.zcloud.fire.check.domain.gateway.FireCheckStandardGateway; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; + /** - * 风险点新增执行器 - * @author lin + * web-app + * + * @Author zhaokai + * @Date 2025-11-26 10:12:15 */ @Component @AllArgsConstructor -public class RiskPointRemoveExe { - private final RiskPointGateway riskPointGateway; +public class FireCheckStandardRemoveExe { + private final FireCheckStandardGateway fireCheckStandardGateway; + @Transactional(rollbackFor = Exception.class) public boolean execute(Long id) { - boolean res = riskPointGateway.deletedRiskPointById(id); - if(!res){ + boolean res = fireCheckStandardGateway.deletedFireCheckStandardById(id); + if (!res) { throw new BizException("删除失败"); } return true; } + @Transactional(rollbackFor = Exception.class) public boolean execute(Long[] ids) { - boolean res = riskPointGateway.deletedRiskPointByIds(ids); - if(!res){ + boolean res = fireCheckStandardGateway.deletedFireCheckStandardByIds(ids); + if (!res) { throw new BizException("删除失败"); } return true; } } + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckStandardUpdateExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckStandardUpdateExe.java new file mode 100644 index 0000000..6b629b4 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckStandardUpdateExe.java @@ -0,0 +1,34 @@ +package com.zcloud.fire.check.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.fire.check.domain.gateway.FireCheckStandardGateway; +import com.zcloud.fire.check.domain.model.FireCheckStandardE; +import com.zcloud.fire.check.dto.FireCheckStandardUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-11-26 10:12:15 + */ +@Component +@AllArgsConstructor +public class FireCheckStandardUpdateExe { + private final FireCheckStandardGateway fireCheckStandardGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(FireCheckStandardUpdateCmd fireCheckStandardUpdateCmd) { + FireCheckStandardE fireCheckStandardE = new FireCheckStandardE(); + BeanUtils.copyProperties(fireCheckStandardUpdateCmd, fireCheckStandardE); + boolean res = fireCheckStandardGateway.update(fireCheckStandardE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireDeviceAddExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireDeviceAddExe.java new file mode 100644 index 0000000..8bd6e8b --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireDeviceAddExe.java @@ -0,0 +1,47 @@ +package com.zcloud.fire.check.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.fire.check.domain.gateway.FireDeviceGateway; +import com.zcloud.fire.check.domain.model.FireDeviceE; +import com.zcloud.fire.check.dto.FireDeviceAddCmd; +import com.zcloud.fire.check.persistence.repository.FireDeviceRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-11-26 10:12:34 + */ +@Component +@AllArgsConstructor +public class FireDeviceAddExe { + private final FireDeviceGateway fireDeviceGateway; + private final FireDeviceRepository fireDeviceRepository; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(FireDeviceAddCmd cmd) { + // 校验消防器材编码是否重复 + if (fireDeviceRepository.existsByDeviceCode(cmd.getFireDeviceCode())) { + throw new BizException("消防器材编码已存在"); + } + + FireDeviceE fireDeviceE = new FireDeviceE(); + BeanUtils.copyProperties(cmd, fireDeviceE); + boolean res = false; + try { + res = fireDeviceGateway.add(fireDeviceE); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("保存失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireDeviceRemoveExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireDeviceRemoveExe.java new file mode 100644 index 0000000..46d556b --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireDeviceRemoveExe.java @@ -0,0 +1,53 @@ +package com.zcloud.fire.check.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.fire.check.domain.gateway.FireDeviceGateway; +import com.zcloud.fire.check.persistence.dataobject.FireDeviceDO; +import com.zcloud.fire.check.persistence.repository.FireDeviceRepository; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-11-26 10:12:34 + */ +@Component +@AllArgsConstructor +public class FireDeviceRemoveExe { + private final FireDeviceGateway fireDeviceGateway; + private final FireDeviceRepository fireDeviceRepository; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long id) { + FireDeviceDO fireDeviceDO = fireDeviceRepository.getById( id); + if (fireDeviceDO == null) { + throw new BizException("设备不存在"); + } + boolean res = fireDeviceGateway.deletedFireDeviceById(id); + if (!res) { + throw new BizException("删除失败"); + } + //TODO 级联删除关联的检查表记录 + + + + return true; + } + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long[] ids) { + boolean res = fireDeviceGateway.deletedFireDeviceByIds(ids); + if (!res) { + throw new BizException("删除失败"); + } + //TODO 级联删除关联的检查表记录 + + + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireDeviceUpdateExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireDeviceUpdateExe.java new file mode 100644 index 0000000..f0d53b6 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireDeviceUpdateExe.java @@ -0,0 +1,34 @@ +package com.zcloud.fire.check.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.fire.check.domain.gateway.FireDeviceGateway; +import com.zcloud.fire.check.domain.model.FireDeviceE; +import com.zcloud.fire.check.dto.FireDeviceUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-11-26 10:12:35 + */ +@Component +@AllArgsConstructor +public class FireDeviceUpdateExe { + private final FireDeviceGateway fireDeviceGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(FireDeviceUpdateCmd fireDeviceUpdateCmd) { + FireDeviceE fireDeviceE = new FireDeviceE(); + BeanUtils.copyProperties(fireDeviceUpdateCmd, fireDeviceE); + boolean res = fireDeviceGateway.update(fireDeviceE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FirePointAddExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FirePointAddExe.java new file mode 100644 index 0000000..c4e8029 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FirePointAddExe.java @@ -0,0 +1,46 @@ +package com.zcloud.fire.check.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.fire.check.domain.gateway.FirePointGateway; +import com.zcloud.fire.check.domain.model.FirePointE; +import com.zcloud.fire.check.dto.FirePointAddCmd; +import com.zcloud.fire.check.persistence.repository.FirePointRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-11-26 10:12:54 + */ +@Component +@AllArgsConstructor +public class FirePointAddExe { + private final FirePointGateway firePointGateway; + private final FirePointRepository firePointRepository; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(FirePointAddCmd cmd) { + //点位编码唯一 + if (firePointRepository.existsByFirePointCode(cmd.getFirePointCode())) { + throw new BizException("点位编码已存在"); + } + FirePointE firePointE = new FirePointE(); + BeanUtils.copyProperties(cmd, firePointE); + boolean res = false; + try { + res = firePointGateway.add(firePointE); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("保存失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FirePointRemoveExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FirePointRemoveExe.java new file mode 100644 index 0000000..b9664de --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FirePointRemoveExe.java @@ -0,0 +1,66 @@ +package com.zcloud.fire.check.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.fire.check.domain.gateway.FirePointGateway; +import com.zcloud.fire.check.domain.model.FirePointE; +import com.zcloud.fire.check.domain.model.FireRegionE; +import com.zcloud.fire.check.persistence.dataobject.FirePointDO; +import com.zcloud.fire.check.persistence.dataobject.FireRegionDO; +import com.zcloud.fire.check.persistence.repository.FireDeviceRepository; +import com.zcloud.fire.check.persistence.repository.FirePointRepository; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-11-26 10:12:55 + */ +@Component +@AllArgsConstructor +public class FirePointRemoveExe { + private final FirePointGateway firePointGateway; + private final FirePointRepository firePointRepository; + private final FireDeviceRepository fireDeviceRepository; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long id) { + if (id == null) { + return true; + } + FirePointDO firePointDO = firePointRepository.getById(id); + if (firePointDO == null) { + return true; + } + //判断是否有点位数 + long count = fireDeviceRepository.countByFirePointId(firePointDO.getFirePointId()); + FirePointE.checkFirePoint(firePointDO.getFirePointName(),count); + boolean res = firePointGateway.deletedFirePointById(id); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long[] ids) { + for (Long id : ids) { + FirePointDO firePointDO = firePointRepository.getById(id); + if (firePointDO == null) { + continue; + } + //判断是否有点位数 + long count = fireDeviceRepository.countByFirePointId(firePointDO.getFirePointId()); + FirePointE.checkFirePoint(firePointDO.getFirePointName(),count); + } + boolean res = firePointGateway.deletedFirePointByIds(ids); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FirePointUpdateExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FirePointUpdateExe.java new file mode 100644 index 0000000..7c9f5d3 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FirePointUpdateExe.java @@ -0,0 +1,41 @@ +package com.zcloud.fire.check.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.fire.check.domain.gateway.FirePointGateway; +import com.zcloud.fire.check.domain.model.FirePointE; +import com.zcloud.fire.check.dto.FirePointUpdateCmd; +import com.zcloud.fire.check.dto.FirePointUpdateDepartmentCmd; +import com.zcloud.fire.check.persistence.repository.FirePointRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-11-26 10:12:55 + */ +@Component +@AllArgsConstructor +public class FirePointUpdateExe { + private final FirePointGateway firePointGateway; + private final FirePointRepository firePointRepository; + + @Transactional(rollbackFor = Exception.class) + public void execute(FirePointUpdateCmd firePointUpdateCmd) { + FirePointE firePointE = new FirePointE(); + BeanUtils.copyProperties(firePointUpdateCmd, firePointE); + boolean res = firePointGateway.update(firePointE); + if (!res) { + throw new BizException("修改失败"); + } + } + + public void editAllDepartment(FirePointUpdateDepartmentCmd firePointUpdateDepartmentCmd) { + firePointRepository.editAllDepartment(firePointUpdateDepartmentCmd.getIds(),firePointUpdateDepartmentCmd.getDepartmentId()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireRegionAddExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireRegionAddExe.java new file mode 100644 index 0000000..1292241 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireRegionAddExe.java @@ -0,0 +1,46 @@ +package com.zcloud.fire.check.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.fire.check.domain.gateway.FireRegionGateway; +import com.zcloud.fire.check.domain.model.FireRegionE; +import com.zcloud.fire.check.dto.FireRegionAddCmd; +import com.zcloud.fire.check.persistence.repository.FireRegionRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-11-26 10:13:09 + */ +@Component +@AllArgsConstructor +public class FireRegionAddExe { + private final FireRegionGateway fireRegionGateway; + private final FireRegionRepository fireRegionRepository; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(FireRegionAddCmd cmd) { + //区域编码唯一 + if (fireRegionRepository.existsByFireRegionCode(cmd.getFireRegionCode())) { + throw new BizException("区域编码已存在"); + } + FireRegionE fireRegionE = new FireRegionE(); + BeanUtils.copyProperties(cmd, fireRegionE); + boolean res = false; + try { + res = fireRegionGateway.add(fireRegionE); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("保存失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireRegionRemoveExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireRegionRemoveExe.java new file mode 100644 index 0000000..994cd74 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireRegionRemoveExe.java @@ -0,0 +1,62 @@ +package com.zcloud.fire.check.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.fire.check.domain.gateway.FireRegionGateway; +import com.zcloud.fire.check.domain.model.FireRegionE; +import com.zcloud.fire.check.persistence.dataobject.FireRegionDO; +import com.zcloud.fire.check.persistence.repository.FirePointRepository; +import com.zcloud.fire.check.persistence.repository.FireRegionRepository; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-11-26 10:13:09 + */ +@Component +@AllArgsConstructor +public class FireRegionRemoveExe { + private final FireRegionGateway fireRegionGateway; + private final FireRegionRepository fireRegionRepository; + private final FirePointRepository firePointRepository; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long id) { + FireRegionDO fireRegionDO = fireRegionRepository.getById(id); + if (fireRegionDO == null) { + throw new BizException("区域不存在"); + } + //判断是否有点位数 + long count = firePointRepository.countByFireRegionId(fireRegionDO.getFireRegionId()); + FireRegionE.checkFireRegion(fireRegionDO.getFireRegionName(),count); + + boolean res = fireRegionGateway.deletedFireRegionById(id); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long[] ids) { + for (Long id : ids) { + FireRegionDO fireRegionDO = fireRegionRepository.getById(id); + if (fireRegionDO == null) { + throw new BizException("区域不存在"); + } + //判断是否有点位数 + long count = firePointRepository.countByFireRegionId(fireRegionDO.getFireRegionId()); + FireRegionE.checkFireRegion(fireRegionDO.getFireRegionName(),count); + } + boolean res = fireRegionGateway.deletedFireRegionByIds(ids); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireRegionUpdateExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireRegionUpdateExe.java new file mode 100644 index 0000000..1995a89 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireRegionUpdateExe.java @@ -0,0 +1,56 @@ +package com.zcloud.fire.check.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.fire.check.domain.enums.FireRegionStateEnum; +import com.zcloud.fire.check.domain.gateway.FireRegionGateway; +import com.zcloud.fire.check.domain.model.FireRegionE; +import com.zcloud.fire.check.dto.FireRegionUpdateCmd; +import com.zcloud.fire.check.dto.FireRegionUpdateDepartmentCmd; +import com.zcloud.fire.check.dto.FireRegionUpdateStatusCmd; +import com.zcloud.fire.check.persistence.repository.FireRegionRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-11-26 10:13:10 + */ +@Component +@AllArgsConstructor +public class FireRegionUpdateExe { + private final FireRegionGateway fireRegionGateway; + private final FireRegionRepository fireRegionRepository; + + @Transactional(rollbackFor = Exception.class) + public void execute(FireRegionUpdateCmd fireRegionUpdateCmd) { + FireRegionE fireRegionE = new FireRegionE(); + BeanUtils.copyProperties(fireRegionUpdateCmd, fireRegionE); + boolean res = fireRegionGateway.update(fireRegionE); + if (!res) { + throw new BizException("修改失败"); + } + } + + public void editStatus(FireRegionUpdateStatusCmd fireRegionUpdateStatusCmd) { + FireRegionE listManagerE = new FireRegionE(); + if(!FireRegionStateEnum.contains(fireRegionUpdateStatusCmd.getState())){ + throw new BizException("状态错误"); + } + BeanUtils.copyProperties(fireRegionUpdateStatusCmd, listManagerE); + boolean res = fireRegionGateway.update(listManagerE); + if (!res) { + throw new BizException("修改失败"); + } + } + + public void editAllDepartment(FireRegionUpdateDepartmentCmd fireRegionUpdateDepartmentCmd) { + + fireRegionRepository.editAllDepartment(fireRegionUpdateDepartmentCmd.getIds(),fireRegionUpdateDepartmentCmd.getDepartmentId()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/RiskPointAddExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/RiskPointAddExe.java deleted file mode 100644 index c59a059..0000000 --- a/web-app/src/main/java/com/zcloud/fire/check/command/RiskPointAddExe.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.zcloud.fire.check.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.fire.check.domain.gateway.RiskPointGateway; -import com.zcloud.fire.check.domain.model.RiskPointE; -import com.zcloud.fire.check.dto.RiskPointAddCmd; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - -/** - * 风险点新增执行器 - * - * @author lin - */ -@Component -@AllArgsConstructor -public class RiskPointAddExe { - private final RiskPointGateway riskPointGateway; - - @Transactional(rollbackFor = Exception.class) - public boolean execute(RiskPointAddCmd cmd) { - RiskPointE examTypeE = new RiskPointE(); - BeanUtils.copyProperties(cmd, examTypeE); - boolean res = false; - try { - res = riskPointGateway.add(examTypeE); - } catch (Exception e) { - throw new RuntimeException(e); - } - if (!res) { - throw new BizException("保存失败"); - } - return true; - } -} diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/RiskPointUpdateExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/RiskPointUpdateExe.java deleted file mode 100644 index 0187b26..0000000 --- a/web-app/src/main/java/com/zcloud/fire/check/command/RiskPointUpdateExe.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.zcloud.fire.check.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.fire.check.domain.gateway.RiskPointGateway; -import com.zcloud.fire.check.domain.model.RiskPointE; -import com.zcloud.fire.check.dto.RiskPointUpdateCmd; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - -/** - * 风险点修改执行器 - * - * @author lin - */ -@Component -@AllArgsConstructor -public class RiskPointUpdateExe { - private final RiskPointGateway riskPointGateway; - - @Transactional(rollbackFor = Exception.class) - public void execute(RiskPointUpdateCmd riskPointUpdateCmd) { - RiskPointE riskPointE = new RiskPointE(); - BeanUtils.copyProperties(riskPointUpdateCmd, riskPointE); - boolean res = riskPointGateway.update(riskPointE); - if (!res) { - throw new BizException("修改失败"); - } - } -} diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckStandardCoConvertor.java b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckStandardCoConvertor.java new file mode 100644 index 0000000..acc4d06 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckStandardCoConvertor.java @@ -0,0 +1,24 @@ +package com.zcloud.fire.check.command.convertor; + +import com.zcloud.fire.check.dto.clientobject.FireCheckStandardCO; +import com.zcloud.fire.check.persistence.dataobject.FireCheckStandardDO; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-11-26 10:12:14 + */ +@Mapper(componentModel = "spring") +public interface FireCheckStandardCoConvertor { + /** + * @param fireCheckStandardDOs + * @return + */ + List converDOsToCOs(List fireCheckStandardDOs); +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireDeviceCoConvertor.java b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireDeviceCoConvertor.java new file mode 100644 index 0000000..a5a3dd8 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireDeviceCoConvertor.java @@ -0,0 +1,27 @@ +package com.zcloud.fire.check.command.convertor; + +import com.zcloud.fire.check.dto.clientobject.FireDeviceCO; +import com.zcloud.fire.check.persistence.dataobject.FireDeviceDO; +import com.zcloud.gbscommon.excelEntity.FireDeviceExcelExportEntity; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-11-26 10:12:34 + */ +@Mapper(componentModel = "spring") +public interface FireDeviceCoConvertor { + /** + * @param fireDeviceDOs + * @return + */ + List converDOsToCOs(List fireDeviceDOs); + + List converCOsToExcelEntitys(List data); +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FirePointCoConvertor.java b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FirePointCoConvertor.java new file mode 100644 index 0000000..6400a5f --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FirePointCoConvertor.java @@ -0,0 +1,27 @@ +package com.zcloud.fire.check.command.convertor; + +import com.zcloud.fire.check.dto.clientobject.FirePointCO; +import com.zcloud.fire.check.persistence.dataobject.FirePointDO; +import com.zcloud.gbscommon.excelEntity.FirePointExcelExportEntity; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-11-26 10:12:54 + */ +@Mapper(componentModel = "spring") +public interface FirePointCoConvertor { + /** + * @param firePointDOs + * @return + */ + List converDOsToCOs(List firePointDOs); + + List converCOsToExcelEntitys(List data); +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireRegionCoConvertor.java b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireRegionCoConvertor.java new file mode 100644 index 0000000..9a73abc --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireRegionCoConvertor.java @@ -0,0 +1,24 @@ +package com.zcloud.fire.check.command.convertor; + +import com.zcloud.fire.check.dto.clientobject.FireRegionCO; +import com.zcloud.fire.check.persistence.dataobject.FireRegionDO; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-11-26 10:13:09 + */ +@Mapper(componentModel = "spring") +public interface FireRegionCoConvertor { + /** + * @param fireRegionDOs + * @return + */ + List converDOsToCOs(List fireRegionDOs); +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/convertor/RiskPointCoConvertor.java b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/RiskPointCoConvertor.java deleted file mode 100644 index 1b514e3..0000000 --- a/web-app/src/main/java/com/zcloud/fire/check/command/convertor/RiskPointCoConvertor.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zcloud.fire.check.command.convertor; - -import com.zcloud.fire.check.dto.clientobject.RiskPointCo; -import com.zcloud.fire.check.persistence.dataobject.RiskPointDO; -import org.mapstruct.Mapper; - -import java.util.List; - -@Mapper(componentModel = "spring") -public interface RiskPointCoConvertor { - /** - * @param riskPointE - * @return - */ - List converDOsToCOs(List riskPointE); -} diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckStandardQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckStandardQueryExe.java new file mode 100644 index 0000000..3242778 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckStandardQueryExe.java @@ -0,0 +1,82 @@ +package com.zcloud.fire.check.command.query; + +import cn.hutool.core.bean.BeanUtil; +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.exception.BizException; +import com.zcloud.fire.check.command.convertor.FireCheckStandardCoConvertor; +import com.zcloud.fire.check.domain.model.FireCheckStandardE; +import com.zcloud.fire.check.dto.FireCheckStandardImportCmd; +import com.zcloud.fire.check.dto.FireCheckStandardPageQry; +import com.zcloud.fire.check.dto.clientobject.FireCheckStandardCO; +import com.zcloud.fire.check.persistence.dataobject.FireCheckStandardDO; +import com.zcloud.fire.check.persistence.repository.FireCheckStandardRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.web.multipart.MultipartFile; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-11-26 10:12:15 + */ +@Component +@AllArgsConstructor +public class FireCheckStandardQueryExe { + private final FireCheckStandardRepository fireCheckStandardRepository; + private final FireCheckStandardCoConvertor fireCheckStandardCoConvertor; + + /** + * 分页 + * + * @param fireCheckStandardPageQry + * @return + */ + public PageResponse execute(FireCheckStandardPageQry fireCheckStandardPageQry) { + Map params = PageQueryHelper.toHashMap(fireCheckStandardPageQry); + PageResponse pageResponse = fireCheckStandardRepository.listPage(params); + List examCenterCOS = fireCheckStandardCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + + public FireCheckStandardCO getInfoById(Long id) { + FireCheckStandardDO fireCheckStandardDO = fireCheckStandardRepository.getById(id); + if (fireCheckStandardDO == null) { + return null; + } + FireCheckStandardCO fireCheckStandardCO = new FireCheckStandardCO(); + BeanUtils.copyProperties(fireCheckStandardDO, fireCheckStandardCO); + return fireCheckStandardCO; + } + + public Collection listAll(FireCheckStandardPageQry fireCheckStandardPageQry) { + Map params = PageQueryHelper.toHashMap(fireCheckStandardPageQry); + List pageResponse = fireCheckStandardRepository.listAll(params); + List examCenterCOS = fireCheckStandardCoConvertor.converDOsToCOs(pageResponse); + return examCenterCOS; + } + + + public void importFireCheckStandardList(MultipartFile file, FireCheckStandardImportCmd fireCheckStandardImportCmd) { + List fireCheckStandardEs = FireCheckStandardE.importFireCheckStandardList(file, fireCheckStandardImportCmd.getFireDeviceType(), fireCheckStandardImportCmd.getFireDeviceTypeName()); + // 批量插入 + boolean res = false; + try { + res = fireCheckStandardRepository.addBatch(BeanUtil.copyToList(fireCheckStandardEs, FireCheckStandardDO.class)); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("导入失败"); + } + + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireDeviceQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireDeviceQueryExe.java new file mode 100644 index 0000000..017f9e4 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireDeviceQueryExe.java @@ -0,0 +1,149 @@ +package com.zcloud.fire.check.command.query; + +import cn.hutool.core.bean.BeanUtil; +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.exception.BizException; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.fire.check.command.convertor.FireDeviceCoConvertor; +import com.zcloud.fire.check.domain.gateway.FirePointGateway; +import com.zcloud.fire.check.domain.gateway.FireRegionGateway; +import com.zcloud.fire.check.domain.model.*; +import com.zcloud.fire.check.dto.FireDeviceListQry; +import com.zcloud.fire.check.dto.FireDevicePageQry; +import com.zcloud.fire.check.dto.FirePointPageQry; +import com.zcloud.fire.check.dto.clientobject.FireDeviceCO; +import com.zcloud.fire.check.dto.clientobject.FirePointCO; +import com.zcloud.fire.check.persistence.dataobject.*; +import com.zcloud.fire.check.persistence.repository.*; +import com.zcloud.gbscommon.excelEntity.FireDeviceExcelExportEntity; +import com.zcloud.gbscommon.excelEntity.FirePointExcelExportEntity; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import lombok.AllArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-11-26 10:12:34 + */ +@Component +@AllArgsConstructor +public class FireDeviceQueryExe { + private final FireDeviceRepository fireDeviceRepository; + private final FireDeviceCoConvertor fireDeviceCoConvertor; + private final DepartmentRepository departmentRepository; + private final UserRepository userRepository; + private final FireRegionRepository fireRegionRepository; + private final FirePointRepository firePointRepository; + private final FireRegionGateway fireRegionGateway; + private final FirePointGateway firePointGateway; + + /** + * 分页 + * + * @param fireDevicePageQry + * @return + */ + public PageResponse execute(FireDevicePageQry fireDevicePageQry) { + Map params = PageQueryHelper.toHashMap(fireDevicePageQry); + PageResponse pageResponse = fireDeviceRepository.listPage(params); + List examCenterCOS = fireDeviceCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + + public FireDeviceCO getInfoById(Long id) { + FireDeviceDO fireDeviceDO = fireDeviceRepository.getById(id); + if (fireDeviceDO == null) { + return null; + } + FireDeviceCO fireDeviceCO = new FireDeviceCO(); + BeanUtils.copyProperties(fireDeviceDO, fireDeviceCO); + return fireDeviceCO; + } + + public void exportFireDevicePage(Long[] ids, HttpServletResponse httpServletResponse) { + FireDevicePageQry fireDevicePageQry = new FireDevicePageQry(); + //Long[] 转换成list + List idList = Arrays.asList(ids); + fireDevicePageQry.setIds(idList); + fireDevicePageQry.setPageSize(100000); + + PageResponse fireDeviceCOPageResponse = execute(fireDevicePageQry); + List data = fireDeviceCOPageResponse.getData(); + List listManagerStatisticsExcelExportEntityList = fireDeviceCoConvertor.converCOsToExcelEntitys(data); + FireDeviceE fireDeviceE = new FireDeviceE(); + fireDeviceE.exportFireDeviceTable(httpServletResponse, listManagerStatisticsExcelExportEntityList); + } + + @Transactional(rollbackFor = Exception.class) + public void importFireDevicePage(MultipartFile file) { + // 查询所有部门 + List departmentDOS = departmentRepository.listByCorpinfoId(AuthContext.getTenantId()); + // 查询所有人员 + List userDOS = userRepository.listByCorpinfoId(AuthContext.getTenantId()); + List fireDeviceDOList = fireDeviceRepository.getDeviceList(); + // 查询所有区域 + List fireRegionDOS = fireRegionRepository.listByCorpinfoId(AuthContext.getTenantId()); + List firePointDOS = firePointRepository.listByCorpinfoId(AuthContext.getTenantId()); + List departmentEList = BeanUtil.copyToList(departmentDOS, DepartmentE.class); + List userEList = BeanUtil.copyToList(userDOS, UserE.class); + List fireDeviceEList = BeanUtil.copyToList(fireDeviceDOList, FireDeviceE.class); + List fireRegionEList = BeanUtil.copyToList(fireRegionDOS, FireRegionE.class); + List firePointEList = BeanUtil.copyToList(firePointDOS, FirePointE.class); + + fireDeviceEList = FireDeviceE.parseImportTemplateData(file, + departmentEList, + userEList, + fireDeviceEList, + fireRegionEList, + firePointEList); + + fireDeviceEList.forEach(fireDeviceE -> { + + if (StringUtils.isEmpty(fireDeviceE.getFireRegionId())) { + //新增区域 + FireRegionE fireRegionE = fireDeviceE.getFireRegionE(); + fireRegionGateway.add(fireRegionE); + fireDeviceE.setFireRegionId(fireRegionE.getFireRegionId()); + } + if (StringUtils.isEmpty(fireDeviceE.getFirePointId())) { + //新增点位 + FirePointE firePointE = fireDeviceE.getFirePointE(); + firePointE.setFireRegionId(fireDeviceE.getFireRegionId()); + firePointGateway.add(firePointE); + fireDeviceE.setFirePointId(firePointE.getFirePointId()); + } + + }); + // 批量插入 + boolean res = false; + try { + res = fireDeviceRepository.addBatch(BeanUtil.copyToList(fireDeviceEList, FireDeviceDO.class)); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("导入失败"); + } + } + + public Collection getAllList(FireDeviceListQry qry) { + Map params = PageQueryHelper.toHashMap(qry); + List pageResponse = fireDeviceRepository.getAllList(params); + List examCenterCOS = fireDeviceCoConvertor.converDOsToCOs(pageResponse); + return examCenterCOS; + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FirePointQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FirePointQueryExe.java new file mode 100644 index 0000000..29e5a73 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FirePointQueryExe.java @@ -0,0 +1,92 @@ +package com.zcloud.fire.check.command.query; + +import cn.hutool.core.collection.CollUtil; +import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.PageResponse; +import com.zcloud.fire.check.command.convertor.FirePointCoConvertor; +import com.zcloud.fire.check.domain.model.FirePointE; +import com.zcloud.fire.check.dto.FirePointPageQry; +import com.zcloud.fire.check.dto.clientobject.FirePointCO; +import com.zcloud.fire.check.dto.clientobject.FireRegionCO; +import com.zcloud.fire.check.persistence.dataobject.FirePointDO; +import com.zcloud.fire.check.persistence.repository.FireDeviceRepository; +import com.zcloud.fire.check.persistence.repository.FirePointRepository; +import com.zcloud.gbscommon.excelEntity.FirePointExcelExportEntity; +import com.zcloud.gbscommon.excelEntity.ListManagerStatisticExcelExportEntity; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-11-26 10:12:55 + */ +@Component +@AllArgsConstructor +public class FirePointQueryExe { + private final FirePointRepository firePointRepository; + private final FirePointCoConvertor firePointCoConvertor; + private final FireDeviceRepository fireDeviceRepository; + + /** + * 分页 + * + * @param firePointPageQry + * @return + */ + public PageResponse execute(FirePointPageQry firePointPageQry) { + Map params = PageQueryHelper.toHashMap(firePointPageQry); + PageResponse pageResponse = firePointRepository.listPage(params); + List examCenterCOS = firePointCoConvertor.converDOsToCOs(pageResponse.getData()); + if (CollUtil.isEmpty(examCenterCOS)){ + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + // + List firePointIds = examCenterCOS.stream().map(FirePointCO::getFirePointId).collect(Collectors.toList()); + Map deviceCountMap =fireDeviceRepository.countByFirePointIdIn(firePointIds); + examCenterCOS.forEach(examCenterCO -> examCenterCO.setDeivceCount(deviceCountMap.getOrDefault(examCenterCO.getFirePointId(),0L))); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + + public FirePointCO getInfoById(Long id) { + FirePointDO firePointDO = firePointRepository.getById(id); + if(firePointDO == null){ + return null; + } + FirePointCO firePointCO = new FirePointCO(); + BeanUtils.copyProperties(firePointDO, firePointCO); + return firePointCO; + } + + public void exportFirePointPage(Long[] ids, HttpServletResponse httpServletResponse) { + FirePointPageQry firePointPageQry = new FirePointPageQry(); + firePointPageQry.setIds(ids); + firePointPageQry.setPageSize(100000); + + + PageResponse firePointCOPageResponse = execute(firePointPageQry); + //TODO 组装二维码 + List data = firePointCOPageResponse.getData(); + List listManagerStatisticsExcelExportEntityList = firePointCoConvertor.converCOsToExcelEntitys(data); + FirePointE firePointE = new FirePointE(); + firePointE.exportFirePointTable(httpServletResponse, listManagerStatisticsExcelExportEntityList); + + + } + + public MultiResponse listByFireRegionId(String fireRegionId) { + List pageResponse = firePointRepository.listByFireRegionId(fireRegionId); + List examCenterCOS = firePointCoConvertor.converDOsToCOs(pageResponse); + return MultiResponse.of(examCenterCOS); + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireRegionQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireRegionQueryExe.java new file mode 100644 index 0000000..dafe14c --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireRegionQueryExe.java @@ -0,0 +1,79 @@ +package com.zcloud.fire.check.command.query; + +import cn.hutool.core.collection.CollUtil; +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.fire.check.command.convertor.FireRegionCoConvertor; +import com.zcloud.fire.check.dto.FireRegionPageQry; +import com.zcloud.fire.check.dto.clientobject.FireRegionCO; +import com.zcloud.fire.check.persistence.dataobject.FireRegionDO; +import com.zcloud.fire.check.persistence.repository.FirePointRepository; +import com.zcloud.fire.check.persistence.repository.FireRegionRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import lombok.AllArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; + +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-11-26 10:13:09 + */ +@Component +@AllArgsConstructor +public class FireRegionQueryExe { + private final FireRegionRepository fireRegionRepository; + private final FireRegionCoConvertor fireRegionCoConvertor; + private final FirePointRepository firePointRepository; + + /** + * 分页 + * + * @param fireRegionPageQry + * @return + */ + public PageResponse execute(FireRegionPageQry fireRegionPageQry) { + Map params = PageQueryHelper.toHashMap(fireRegionPageQry); + + PageResponse pageResponse = fireRegionRepository.listPage(params); + List examCenterCOS = fireRegionCoConvertor.converDOsToCOs(pageResponse.getData()); + if(CollUtil.isEmpty(examCenterCOS)){ + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + //获取区域下点位数 + //examCenterCOS获取id + List fireRegionIds = examCenterCOS.stream().map(FireRegionCO::getFireRegionId).collect(Collectors.toList()); + Map pointCountMap =firePointRepository.countByFireRegionIdIn(fireRegionIds); + examCenterCOS.forEach(examCenterCO -> examCenterCO.setPointCount(pointCountMap.getOrDefault(examCenterCO.getFireRegionId(),0L))); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + + public FireRegionCO getInfoById(Long id) { + + FireRegionDO fireRegionDO = fireRegionRepository.getById(id); + if(fireRegionDO == null){ + return null; + } + FireRegionCO fireRegionCO = new FireRegionCO(); + BeanUtils.copyProperties(fireRegionDO, fireRegionCO); + return fireRegionCO; + } + + public List listAll(Long corpinfoId) { + if(corpinfoId == null){ + corpinfoId = AuthContext.getTenantId(); + } + return fireRegionCoConvertor.converDOsToCOs(fireRegionRepository.listByCorpinfoId(corpinfoId)); + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/RiskPointQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/RiskPointQueryExe.java deleted file mode 100644 index cd6cc37..0000000 --- a/web-app/src/main/java/com/zcloud/fire/check/command/query/RiskPointQueryExe.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.zcloud.fire.check.command.query; - -import com.alibaba.cola.dto.PageResponse; -import com.zcloud.fire.check.command.convertor.RiskPointCoConvertor; -import com.zcloud.fire.check.dto.RiskPointPageQry; -import com.zcloud.fire.check.dto.clientobject.RiskPointCo; -import com.zcloud.fire.check.persistence.dataobject.RiskPointDO; -import com.zcloud.fire.check.persistence.repository.RiskPointRepository; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * 风险点新增执行器 - * - * @author lin - */ -@Component -@AllArgsConstructor -public class RiskPointQueryExe { - private final RiskPointRepository riskPointRepository; - private final RiskPointCoConvertor riskPointCoConvertor; - - /** - * 分页 - * - * @param riskPointPageQry - * @return - */ - public PageResponse execute(RiskPointPageQry riskPointPageQry) { - PageResponse pageResponse = riskPointRepository.listRiskPointPage(riskPointPageQry.toHashMap()); - List examCenterCOS = riskPointCoConvertor.converDOsToCOs(pageResponse.getData()); - return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); - } -} diff --git a/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckStandardServiceImpl.java b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckStandardServiceImpl.java new file mode 100644 index 0000000..795b1f2 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckStandardServiceImpl.java @@ -0,0 +1,79 @@ +package com.zcloud.fire.check.service; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.fire.check.api.FireCheckStandardServiceI; +import com.zcloud.fire.check.command.FireCheckStandardAddExe; +import com.zcloud.fire.check.command.FireCheckStandardRemoveExe; +import com.zcloud.fire.check.command.FireCheckStandardUpdateExe; +import com.zcloud.fire.check.command.query.FireCheckStandardQueryExe; +import com.zcloud.fire.check.dto.FireCheckStandardAddCmd; +import com.zcloud.fire.check.dto.FireCheckStandardImportCmd; +import com.zcloud.fire.check.dto.FireCheckStandardPageQry; +import com.zcloud.fire.check.dto.FireCheckStandardUpdateCmd; +import com.zcloud.fire.check.dto.clientobject.FireCheckStandardCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.util.Collection; + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-11-26 10:12:15 + */ +@Service +@AllArgsConstructor +public class FireCheckStandardServiceImpl implements FireCheckStandardServiceI { + private final FireCheckStandardAddExe fireCheckStandardAddExe; + private final FireCheckStandardUpdateExe fireCheckStandardUpdateExe; + private final FireCheckStandardRemoveExe fireCheckStandardRemoveExe; + private final FireCheckStandardQueryExe fireCheckStandardQueryExe; + + @Override + public PageResponse listPage(FireCheckStandardPageQry qry) { + + return fireCheckStandardQueryExe.execute(qry); + } + + @Override + public SingleResponse add(FireCheckStandardAddCmd cmd) { + + fireCheckStandardAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(FireCheckStandardUpdateCmd fireCheckStandardUpdateCmd) { + fireCheckStandardUpdateExe.execute(fireCheckStandardUpdateCmd); + } + + @Override + public void remove(Long id) { + fireCheckStandardRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + fireCheckStandardRemoveExe.execute(ids); + } + + @Override + public FireCheckStandardCO getInfoById(Long id) { + return fireCheckStandardQueryExe.getInfoById(id); + + } + + @Override + public Collection listAll(FireCheckStandardPageQry qry) { + return fireCheckStandardQueryExe.listAll(qry); + } + + @Override + public void importFireCheckStandardList(MultipartFile file, FireCheckStandardImportCmd fireCheckStandardImportCmd) { + fireCheckStandardQueryExe.importFireCheckStandardList(file,fireCheckStandardImportCmd); + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/service/FireDeviceServiceImpl.java b/web-app/src/main/java/com/zcloud/fire/check/service/FireDeviceServiceImpl.java new file mode 100644 index 0000000..17d697b --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/service/FireDeviceServiceImpl.java @@ -0,0 +1,84 @@ +package com.zcloud.fire.check.service; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.fire.check.api.FireDeviceServiceI; +import com.zcloud.fire.check.command.FireDeviceAddExe; +import com.zcloud.fire.check.command.FireDeviceRemoveExe; +import com.zcloud.fire.check.command.FireDeviceUpdateExe; +import com.zcloud.fire.check.command.query.FireDeviceQueryExe; +import com.zcloud.fire.check.dto.FireDeviceAddCmd; +import com.zcloud.fire.check.dto.FireDeviceListQry; +import com.zcloud.fire.check.dto.FireDevicePageQry; +import com.zcloud.fire.check.dto.FireDeviceUpdateCmd; +import com.zcloud.fire.check.dto.clientobject.FireDeviceCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.util.Collection; + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-11-26 10:12:35 + */ +@Service +@AllArgsConstructor +public class FireDeviceServiceImpl implements FireDeviceServiceI { + private final FireDeviceAddExe fireDeviceAddExe; + private final FireDeviceUpdateExe fireDeviceUpdateExe; + private final FireDeviceRemoveExe fireDeviceRemoveExe; + private final FireDeviceQueryExe fireDeviceQueryExe; + + @Override + public PageResponse listPage(FireDevicePageQry qry) { + + return fireDeviceQueryExe.execute(qry); + } + + @Override + public SingleResponse add(FireDeviceAddCmd cmd) { + + fireDeviceAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(FireDeviceUpdateCmd fireDeviceUpdateCmd) { + fireDeviceUpdateExe.execute(fireDeviceUpdateCmd); + } + + @Override + public void remove(Long id) { + fireDeviceRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + fireDeviceRemoveExe.execute(ids); + } + + @Override + public FireDeviceCO getInfoById(Long id) { + return fireDeviceQueryExe.getInfoById(id); + } + + @Override + public void exportFireDevicePage(Long[] ids, HttpServletResponse httpServletResponse) { + fireDeviceQueryExe.exportFireDevicePage(ids, httpServletResponse); + } + + @Override + public void importFireDevicePage(MultipartFile file) { + fireDeviceQueryExe.importFireDevicePage(file); + } + + @Override + public Collection getAllList(FireDeviceListQry qry) { + return fireDeviceQueryExe.getAllList(qry); + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/service/FirePointServiceImpl.java b/web-app/src/main/java/com/zcloud/fire/check/service/FirePointServiceImpl.java new file mode 100644 index 0000000..4efd409 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/service/FirePointServiceImpl.java @@ -0,0 +1,83 @@ +package com.zcloud.fire.check.service; + +import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.fire.check.api.FirePointServiceI; +import com.zcloud.fire.check.command.FirePointAddExe; +import com.zcloud.fire.check.command.FirePointRemoveExe; +import com.zcloud.fire.check.command.FirePointUpdateExe; +import com.zcloud.fire.check.command.query.FirePointQueryExe; +import com.zcloud.fire.check.dto.FirePointAddCmd; +import com.zcloud.fire.check.dto.FirePointPageQry; +import com.zcloud.fire.check.dto.FirePointUpdateCmd; +import com.zcloud.fire.check.dto.FirePointUpdateDepartmentCmd; +import com.zcloud.fire.check.dto.clientobject.FirePointCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-11-26 10:12:55 + */ +@Service +@AllArgsConstructor +public class FirePointServiceImpl implements FirePointServiceI { + private final FirePointAddExe firePointAddExe; + private final FirePointUpdateExe firePointUpdateExe; + private final FirePointRemoveExe firePointRemoveExe; + private final FirePointQueryExe firePointQueryExe; + + @Override + public PageResponse listPage(FirePointPageQry qry) { + + return firePointQueryExe.execute(qry); + } + + @Override + public SingleResponse add(FirePointAddCmd cmd) { + firePointAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(FirePointUpdateCmd firePointUpdateCmd) { + firePointUpdateExe.execute(firePointUpdateCmd); + } + + @Override + public void remove(Long id) { + firePointRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + firePointRemoveExe.execute(ids); + } + + @Override + public FirePointCO getInfoById(Long id) { + return firePointQueryExe.getInfoById(id); + } + + @Override + public void editAllDepartment(FirePointUpdateDepartmentCmd firePointUpdateDepartmentCmd) { + firePointUpdateExe.editAllDepartment(firePointUpdateDepartmentCmd); + } + + @Override + public void exportFirePointPage(Long[] ids, HttpServletResponse httpServletResponse) { + firePointQueryExe.exportFirePointPage(ids, httpServletResponse); + } + + @Override + public MultiResponse listByFireRegionId(String fireRegionId) { + return firePointQueryExe.listByFireRegionId(fireRegionId); + + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/service/FireRegionServiceImpl.java b/web-app/src/main/java/com/zcloud/fire/check/service/FireRegionServiceImpl.java new file mode 100644 index 0000000..65072ca --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/service/FireRegionServiceImpl.java @@ -0,0 +1,76 @@ +package com.zcloud.fire.check.service; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.fire.check.api.FireRegionServiceI; +import com.zcloud.fire.check.command.FireRegionAddExe; +import com.zcloud.fire.check.command.FireRegionRemoveExe; +import com.zcloud.fire.check.command.FireRegionUpdateExe; +import com.zcloud.fire.check.command.query.FireRegionQueryExe; +import com.zcloud.fire.check.dto.*; +import com.zcloud.fire.check.dto.clientobject.FireRegionCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * web-app + * + * @Author zhaokai + * @Date 2025-11-26 10:13:10 + */ +@Service +@AllArgsConstructor +public class FireRegionServiceImpl implements FireRegionServiceI { + private final FireRegionAddExe fireRegionAddExe; + private final FireRegionUpdateExe fireRegionUpdateExe; + private final FireRegionRemoveExe fireRegionRemoveExe; + private final FireRegionQueryExe fireRegionQueryExe; + + @Override + public PageResponse listPage(FireRegionPageQry qry) { + + return fireRegionQueryExe.execute(qry); + } + + @Override + public SingleResponse add(FireRegionAddCmd cmd) { + + fireRegionAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(FireRegionUpdateCmd fireRegionUpdateCmd) { + fireRegionUpdateExe.execute(fireRegionUpdateCmd); + } + + @Override + public void remove(Long id) { + fireRegionRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + fireRegionRemoveExe.execute(ids); + } + @Override + public FireRegionCO getInfoById(Long id) { + return fireRegionQueryExe.getInfoById(id); + } + + @Override + public void editStatus(FireRegionUpdateStatusCmd fireRegionUpdateStatusCmd) { + fireRegionUpdateExe.editStatus(fireRegionUpdateStatusCmd); + } + @Override + public void editAllDepartment(FireRegionUpdateDepartmentCmd fireRegionUpdateDepartmentCmd) { + fireRegionUpdateExe.editAllDepartment(fireRegionUpdateDepartmentCmd); + } + @Override + public List listAll(Long corpinfoId) { + return fireRegionQueryExe.listAll(corpinfoId); + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/service/RiskPointServiceImpl.java b/web-app/src/main/java/com/zcloud/fire/check/service/RiskPointServiceImpl.java deleted file mode 100644 index 316bae4..0000000 --- a/web-app/src/main/java/com/zcloud/fire/check/service/RiskPointServiceImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.zcloud.fire.check.service; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.fire.check.api.RiskPointServiceI; -import com.zcloud.fire.check.command.RiskPointAddExe; -import com.zcloud.fire.check.command.RiskPointRemoveExe; -import com.zcloud.fire.check.command.RiskPointUpdateExe; -import com.zcloud.fire.check.command.query.RiskPointQueryExe; -import com.zcloud.fire.check.dto.RiskPointAddCmd; -import com.zcloud.fire.check.dto.RiskPointPageQry; -import com.zcloud.fire.check.dto.RiskPointUpdateCmd; -import com.zcloud.fire.check.dto.clientobject.RiskPointCo; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; - -/** - * @author lin - */ -@Service -@AllArgsConstructor -public class RiskPointServiceImpl implements RiskPointServiceI { - private final RiskPointAddExe riskPointAddExe; - private final RiskPointUpdateExe riskPointUpdateExe; - private final RiskPointRemoveExe riskPointRemoveExe; - private final RiskPointQueryExe riskPointQueryExe; - - @Override - public PageResponse listPage(RiskPointPageQry qry){ - - return riskPointQueryExe.execute(qry); - } - - @Override - public SingleResponse add(RiskPointAddCmd cmd) { - - riskPointAddExe.execute(cmd); - return SingleResponse.buildSuccess(); - } - - @Override - public void edit(RiskPointUpdateCmd riskPointUpdateCmd) { - riskPointUpdateExe.execute(riskPointUpdateCmd); - } - - @Override - public void remove(Long id) { - riskPointRemoveExe.execute(id); - } - - @Override - public void removeBatch(Long[] ids) { - riskPointRemoveExe.execute(ids); - } - -} diff --git a/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckStandardServiceI.java b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckStandardServiceI.java new file mode 100644 index 0000000..538a991 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckStandardServiceI.java @@ -0,0 +1,38 @@ +package com.zcloud.fire.check.api; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.fire.check.dto.FireCheckStandardAddCmd; +import com.zcloud.fire.check.dto.FireCheckStandardImportCmd; +import com.zcloud.fire.check.dto.FireCheckStandardPageQry; +import com.zcloud.fire.check.dto.FireCheckStandardUpdateCmd; +import com.zcloud.fire.check.dto.clientobject.FireCheckStandardCO; +import org.springframework.web.multipart.MultipartFile; + +import java.util.Collection; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:12:15 + */ +public interface FireCheckStandardServiceI { + PageResponse listPage(FireCheckStandardPageQry qry); + + SingleResponse add(FireCheckStandardAddCmd cmd); + + void edit(FireCheckStandardUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); + + FireCheckStandardCO getInfoById(Long id); + + Collection listAll(FireCheckStandardPageQry qry); + + + void importFireCheckStandardList(MultipartFile file, FireCheckStandardImportCmd fireCheckStandardImportCmd); +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/api/FireDeviceServiceI.java b/web-client/src/main/java/com/zcloud/fire/check/api/FireDeviceServiceI.java new file mode 100644 index 0000000..e3cb4bf --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/api/FireDeviceServiceI.java @@ -0,0 +1,40 @@ +package com.zcloud.fire.check.api; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.fire.check.dto.FireDeviceAddCmd; +import com.zcloud.fire.check.dto.FireDeviceListQry; +import com.zcloud.fire.check.dto.FireDevicePageQry; +import com.zcloud.fire.check.dto.FireDeviceUpdateCmd; +import com.zcloud.fire.check.dto.clientobject.FireDeviceCO; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.util.Collection; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:12:34 + */ +public interface FireDeviceServiceI { + PageResponse listPage(FireDevicePageQry qry); + + SingleResponse add(FireDeviceAddCmd cmd); + + void edit(FireDeviceUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); + + FireDeviceCO getInfoById(Long id); + + void exportFireDevicePage(Long[] ids, HttpServletResponse httpServletResponse); + + void importFireDevicePage(MultipartFile file); + + Collection getAllList(FireDeviceListQry qry); +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/api/FirePointServiceI.java b/web-client/src/main/java/com/zcloud/fire/check/api/FirePointServiceI.java new file mode 100644 index 0000000..b82ffa3 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/api/FirePointServiceI.java @@ -0,0 +1,39 @@ +package com.zcloud.fire.check.api; + +import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.fire.check.dto.FirePointAddCmd; +import com.zcloud.fire.check.dto.FirePointPageQry; +import com.zcloud.fire.check.dto.FirePointUpdateCmd; +import com.zcloud.fire.check.dto.FirePointUpdateDepartmentCmd; +import com.zcloud.fire.check.dto.clientobject.FirePointCO; + +import javax.servlet.http.HttpServletResponse; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:12:55 + */ +public interface FirePointServiceI { + PageResponse listPage(FirePointPageQry qry); + + SingleResponse add(FirePointAddCmd cmd); + + void edit(FirePointUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); + + FirePointCO getInfoById(Long id); + + void editAllDepartment(FirePointUpdateDepartmentCmd firePointUpdateDepartmentCmd); + + void exportFirePointPage(Long[] ids, HttpServletResponse httpServletResponse); + + MultiResponse listByFireRegionId(String fireRegionId); +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/api/FireRegionServiceI.java b/web-client/src/main/java/com/zcloud/fire/check/api/FireRegionServiceI.java new file mode 100644 index 0000000..fe5a747 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/api/FireRegionServiceI.java @@ -0,0 +1,35 @@ +package com.zcloud.fire.check.api; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.fire.check.dto.*; +import com.zcloud.fire.check.dto.clientobject.FireRegionCO; + +import java.util.Collection; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:13:10 + */ +public interface FireRegionServiceI { + PageResponse listPage(FireRegionPageQry qry); + + SingleResponse add(FireRegionAddCmd cmd); + + void edit(FireRegionUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); + + FireRegionCO getInfoById(Long id); + + void editStatus(FireRegionUpdateStatusCmd fireRegionUpdateStatusCmd); + + void editAllDepartment(FireRegionUpdateDepartmentCmd fireRegionUpdateDepartmentCmd); + + Collection listAll(Long corpinfoId); +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/api/RiskPointServiceI.java b/web-client/src/main/java/com/zcloud/fire/check/api/RiskPointServiceI.java deleted file mode 100644 index 12f9634..0000000 --- a/web-client/src/main/java/com/zcloud/fire/check/api/RiskPointServiceI.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.zcloud.fire.check.api; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.fire.check.dto.RiskPointAddCmd; -import com.zcloud.fire.check.dto.RiskPointPageQry; -import com.zcloud.fire.check.dto.RiskPointUpdateCmd; -import com.zcloud.fire.check.dto.clientobject.RiskPointCo; - -public interface RiskPointServiceI { - PageResponse listPage(RiskPointPageQry qry); - SingleResponse add(RiskPointAddCmd cmd); - - void edit(RiskPointUpdateCmd riskPointUpdateCmd); - - void remove(Long id); - - void removeBatch(Long[] ids); - -} diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckStandardAddCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckStandardAddCmd.java new file mode 100644 index 0000000..1a9fb0b --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckStandardAddCmd.java @@ -0,0 +1,48 @@ +package com.zcloud.fire.check.dto; + +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.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:12:14 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FireCheckStandardAddCmd extends Command { + @ApiModelProperty(value = "企业id", name = "corpinfoId") + private Long corpinfoId; + + @ApiModelProperty(value = "消防器材类型", name = "fireDeviceType", required = true) + @NotEmpty(message = "消防器材类型不能为空") + private String fireDeviceType; + + @ApiModelProperty(value = "消防器材类型名称", name = "fireDeviceTypeName", required = true) + @NotEmpty(message = "消防器材类型名称不能为空") + private String fireDeviceTypeName; + + @ApiModelProperty(value = "消防器材名称", name = "deviceName", required = true) + @NotEmpty(message = "消防器材名称不能为空") + private String deviceName; + + @ApiModelProperty(value = "单位名称", name = "employer", required = true) + @NotEmpty(message = "单位名称不能为空") + private String employer; + + @ApiModelProperty(value = "检查项", name = "fireCheckStandardItem", required = true) + @NotEmpty(message = "检查项不能为空") + private String fireCheckStandardItem; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckStandardImportCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckStandardImportCmd.java new file mode 100644 index 0000000..43a640d --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckStandardImportCmd.java @@ -0,0 +1,33 @@ +package com.zcloud.fire.check.dto; + +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.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:12:15 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FireCheckStandardImportCmd implements Serializable { + + @ApiModelProperty(value = "消防器材类型", name = "fireDeviceType", required = true) + @NotEmpty(message = "消防器材类型不能为空") + private String fireDeviceType; + @ApiModelProperty(value = "消防器材类型名称", name = "fireDeviceTypeName", required = true) + @NotEmpty(message = "消防器材类型名称不能为空") + private String fireDeviceTypeName; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckStandardPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckStandardPageQry.java new file mode 100644 index 0000000..6033835 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckStandardPageQry.java @@ -0,0 +1,33 @@ +package com.zcloud.fire.check.dto; + +import com.alibaba.cola.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:12:15 + */ +@Data +public class FireCheckStandardPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + @ApiModelProperty(value = "检查项", name = "likeFireCheckStandardItem") + private String likeFireCheckStandardItem; + @ApiModelProperty(value = "消防器材类型", name = "eqFireDeviceType") + private String eqFireDeviceType; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckStandardUpdateCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckStandardUpdateCmd.java new file mode 100644 index 0000000..a490a29 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckStandardUpdateCmd.java @@ -0,0 +1,45 @@ +package com.zcloud.fire.check.dto; + +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.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:12:15 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FireCheckStandardUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "业务主键id", name = "fireCheckStandardId") + private String fireCheckStandardId; + @ApiModelProperty(value = "消防器材类型", name = "fireDeviceType", required = true) + @NotEmpty(message = "消防器材类型不能为空") + private String fireDeviceType; + @ApiModelProperty(value = "消防器材类型名称", name = "fireDeviceTypeName", required = true) + @NotEmpty(message = "消防器材类型名称不能为空") + private String fireDeviceTypeName; + @ApiModelProperty(value = "消防器材名称", name = "deviceName", required = true) + @NotEmpty(message = "消防器材名称不能为空") + private String deviceName; + @ApiModelProperty(value = "单位名称", name = "employer", required = true) + @NotEmpty(message = "单位名称不能为空") + private String employer; + @ApiModelProperty(value = "检查项", name = "fireCheckStandardItem", required = true) + @NotEmpty(message = "检查项不能为空") + private String fireCheckStandardItem; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceAddCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceAddCmd.java new file mode 100644 index 0000000..f6229b3 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceAddCmd.java @@ -0,0 +1,67 @@ +package com.zcloud.fire.check.dto; + +import com.alibaba.cola.dto.Command; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.codehaus.jackson.annotate.JsonProperty; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:12:34 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FireDeviceAddCmd extends Command { + @ApiModelProperty(value = "企业id", name = "corpinfoId") + private Long corpinfoId; + + @ApiModelProperty(value = "消防区域id", name = "fireRegionId", required = true) + @NotEmpty(message = "消防区域id不能为空") + private String fireRegionId; + + @ApiModelProperty(value = "消防点位id", name = "firePointId", required = true) + @NotEmpty(message = "消防点位id不能为空") + private String firePointId; + + @ApiModelProperty(value = "部门id", name = "departmentId", required = true) + @NotNull(message = "部门id不能为空") + private Long departmentId; + + @ApiModelProperty(value = "消防器材类型", name = "fireDeviceType", required = true) + @NotEmpty(message = "消防器材类型不能为空") + private String fireDeviceType; + + @ApiModelProperty(value = "消防器材类型名称", name = "fireDeviceTypeName", required = true) + @NotEmpty(message = "消防器材类型名称不能为空") + private String fireDeviceTypeName; + + @ApiModelProperty(value = "器材编号", name = "fireDeviceCode", required = true) + @NotEmpty(message = "器材编号不能为空") + private String fireDeviceCode; + + @ApiModelProperty(value = "有效期开始时间", name = "validityStartTime") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime validityStartTime; + + @ApiModelProperty(value = "有效期结束时间", name = "validityEndTime") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime validityEndTime; + + @ApiModelProperty(value = "存放地点", name = "storageLocation", required = true) + @NotEmpty(message = "存放地点不能为空") + private String storageLocation; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceListQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceListQry.java new file mode 100644 index 0000000..d254a96 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceListQry.java @@ -0,0 +1,51 @@ +package com.zcloud.fire.check.dto; + +import com.alibaba.cola.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:12:34 + */ +@Data +public class FireDeviceListQry implements Serializable { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + @ApiModelProperty(value = "消防器材主键ID", name = "ids",hidden = true) + private List ids; + + @ApiModelProperty(value = "消防器材类型", name = "fireDeviceType") + private String fireDeviceType; + + @ApiModelProperty(value = "消防区域ID", name = "fireRegionId") + private String fireRegionId; + @ApiModelProperty(value = "消防点ID", name = "firePointId") + private String firePointId; + @ApiModelProperty(value = "消防点名称", name = "firePointName") + private String firePointName; + @ApiModelProperty(value = "消防器材编码", name = "fireDeviceCode") + private String fireDeviceCode; + @ApiModelProperty(value = "负责部门id集合", name = "departmentIdList") + private List departmentIdList; + @ApiModelProperty(value = "负责部门名称", name = "departmentName") + private String departmentName; + @ApiModelProperty(value = "负责人", name = "userName") + private String userName; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireDevicePageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireDevicePageQry.java new file mode 100644 index 0000000..4ea066c --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireDevicePageQry.java @@ -0,0 +1,50 @@ +package com.zcloud.fire.check.dto; + +import com.alibaba.cola.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:12:34 + */ +@Data +public class FireDevicePageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + @ApiModelProperty(value = "消防器材主键ID", name = "ids",hidden = true) + private List ids; + + @ApiModelProperty(value = "消防器材类型", name = "fireDeviceType") + private String fireDeviceType; + + @ApiModelProperty(value = "消防区域ID", name = "fireRegionId") + private String fireRegionId; + @ApiModelProperty(value = "消防点ID", name = "firePointId") + private String firePointId; + @ApiModelProperty(value = "消防点名称", name = "firePointName") + private String firePointName; + @ApiModelProperty(value = "消防器材编码", name = "fireDeviceCode") + private String fireDeviceCode; + @ApiModelProperty(value = "负责部门id", name = "departmentId") + private Long departmentId; + @ApiModelProperty(value = "负责部门名称", name = "departmentName") + private String departmentName; + @ApiModelProperty(value = "负责人", name = "userName") + private String userName; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceRemoveCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceRemoveCmd.java new file mode 100644 index 0000000..21b9fbc --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceRemoveCmd.java @@ -0,0 +1,31 @@ +package com.zcloud.fire.check.dto; + +import com.alibaba.cola.dto.Command; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:12:35 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FireDeviceRemoveCmd implements Serializable { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long[] ids; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceUpdateCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceUpdateCmd.java new file mode 100644 index 0000000..cf85f46 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceUpdateCmd.java @@ -0,0 +1,59 @@ +package com.zcloud.fire.check.dto; + +import com.alibaba.cola.dto.Command; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:12:35 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FireDeviceUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "业务主键id", name = "fireDeviceId", required = true) + private String fireDeviceId; + @ApiModelProperty(value = "消防区域id", name = "fireRegionId", required = true) + @NotEmpty(message = "消防区域id不能为空") + private String fireRegionId; + @ApiModelProperty(value = "消防点位id", name = "firePointId", required = true) + @NotEmpty(message = "消防点位id不能为空") + private String firePointId; + @ApiModelProperty(value = "部门id", name = "departmentId", required = true) + @NotNull(message = "部门id不能为空") + private Long departmentId; + @ApiModelProperty(value = "消防器材类型", name = "fireDeviceType", required = true) + @NotEmpty(message = "消防器材类型不能为空") + private String fireDeviceType; + @ApiModelProperty(value = "消防器材类型名称", name = "fireDeviceTypeName", required = true) + @NotEmpty(message = "消防器材类型名称不能为空") + private String fireDeviceTypeName; + @ApiModelProperty(value = "器材编号", name = "fireDeviceCode", required = true) + @NotEmpty(message = "器材编号不能为空") + private String fireDeviceCode; + @ApiModelProperty(value = "有效期开始时间", name = "validityStartTime") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime validityStartTime; + @ApiModelProperty(value = "有效期结束时间", name = "validityEndTime") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime validityEndTime; + @ApiModelProperty(value = "存放地点", name = "storageLocation", required = true) + @NotEmpty(message = "存放地点不能为空") + private String storageLocation; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointAddCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointAddCmd.java new file mode 100644 index 0000000..6dd61b2 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointAddCmd.java @@ -0,0 +1,54 @@ +package com.zcloud.fire.check.dto; + +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.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:12:54 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FirePointAddCmd extends Command { + @ApiModelProperty(value = "企业id", name = "corpinfoId") + private Long corpinfoId; + + @ApiModelProperty(value = "消防区域id", name = "fireRegionId", required = true) + @NotEmpty(message = "消防区域id不能为空") + private String fireRegionId; + + @ApiModelProperty(value = "消防点位名称", name = "firePointName", required = true) + @NotEmpty(message = "消防点位名称不能为空") + private String firePointName; + + @ApiModelProperty(value = "消防点位编码", name = "firePointCode", required = true) + @NotEmpty(message = "消防点位编码不能为空") + private String firePointCode; + + @ApiModelProperty(value = "部门id", name = "departmentId", required = true) + @NotNull(message = "负责部门不能为空") + private Long departmentId; + + @ApiModelProperty(value = "负责人", name = "userId", required = true) + @NotNull(message = "负责人不能为空") + private Long userId; + + @ApiModelProperty(value = "经度", name = "longitude") + private String longitude; + + @ApiModelProperty(value = "纬度", name = "latitude") + private String latitude; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointPageQry.java new file mode 100644 index 0000000..8b64934 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointPageQry.java @@ -0,0 +1,45 @@ +package com.zcloud.fire.check.dto; + +import com.alibaba.cola.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:12:55 + */ +@Data +public class FirePointPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + @ApiModelProperty(value = "消防点主键ID", name = "ids",hidden = true) + private Long[] ids; + + @ApiModelProperty(value = "消防区域ID", name = "fireRegionId") + private String fireRegionId; + @ApiModelProperty(value = "消防点名称", name = "firePointName") + private String firePointName; + @ApiModelProperty(value = "消防点编码", name = "firePointCode") + private String firePointCode; + @ApiModelProperty(value = "部门", name = "departmentId") + private String departmentId; + + @ApiModelProperty(value = "是否标点,1:是,0:否", name = "punctuationFlag") + private Integer punctuationFlag; + + + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointRemoveCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointRemoveCmd.java new file mode 100644 index 0000000..9d5d6b3 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointRemoveCmd.java @@ -0,0 +1,29 @@ +package com.zcloud.fire.check.dto; + +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.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:12:55 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FirePointRemoveCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long[] ids; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointUpdateCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointUpdateCmd.java new file mode 100644 index 0000000..61f4dd0 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointUpdateCmd.java @@ -0,0 +1,48 @@ +package com.zcloud.fire.check.dto; + +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.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:12:55 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FirePointUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + + @ApiModelProperty(value = "消防区域id", name = "fireRegionId", required = true) + @NotEmpty(message = "消防区域id不能为空") + private String fireRegionId; + @ApiModelProperty(value = "消防点位名称", name = "firePointName", required = true) + @NotEmpty(message = "消防点位名称不能为空") + private String firePointName; + @ApiModelProperty(value = "消防点位编码", name = "firePointCode", required = true) + @NotEmpty(message = "消防点位编码不能为空") + private String firePointCode; + @ApiModelProperty(value = "部门id", name = "departmentId", required = true) + @NotNull(message = "部门id不能为空") + private Long departmentId; + @ApiModelProperty(value = "负责人", name = "userId", required = true) + @NotNull(message = "负责人不能为空") + private Long userId; + @ApiModelProperty(value = "经度", name = "longitude") + private String longitude; + @ApiModelProperty(value = "纬度", name = "latitude") + private String latitude; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointUpdateDepartmentCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointUpdateDepartmentCmd.java new file mode 100644 index 0000000..33f3a5f --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointUpdateDepartmentCmd.java @@ -0,0 +1,31 @@ +package com.zcloud.fire.check.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:37:10 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FirePointUpdateDepartmentCmd implements Serializable { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private List ids; + + @ApiModelProperty(value = "部门id", name = "departmentId", required = true) + @NotNull(message = "部门id不能为空") + private Long departmentId; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionAddCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionAddCmd.java new file mode 100644 index 0000000..b22de23 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionAddCmd.java @@ -0,0 +1,50 @@ +package com.zcloud.fire.check.dto; + +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.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:37:09 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FireRegionAddCmd extends Command { + @ApiModelProperty(value = "企业id", name = "corpinfoId") + private Long corpinfoId; + + @ApiModelProperty(value = "消防区域名称", name = "fireRegionName", required = true) + @NotEmpty(message = "消防区域名称不能为空") + private String fireRegionName; + + @ApiModelProperty(value = "编码", name = "fireRegionCode", required = true) + @NotEmpty(message = "编码不能为空") + private String fireRegionCode; + + @ApiModelProperty(value = "部门id", name = "departmentId", required = true) + @NotNull(message = "部门id不能为空") + private Long departmentId; + + @ApiModelProperty(value = "0启用,1禁用", name = "state") + private Integer state; + + @ApiModelProperty(value = "备注", name = "remarks") + private String remarks; + + @ApiModelProperty(value = "检查照片上传方式（1相机照相，2相册获取）", name = "photoUploadMethod", required = true) + @NotNull(message = "检查照片上传方式不能为空") + private Integer photoUploadMethod; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionPageQry.java new file mode 100644 index 0000000..9faeba4 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionPageQry.java @@ -0,0 +1,38 @@ +package com.zcloud.fire.check.dto; + +import com.alibaba.cola.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:37:10 + */ +@Data +public class FireRegionPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + @ApiModelProperty(value = "企业", name = "eqCorpinfoId") + private String corpinfoId; + + @ApiModelProperty(value = "消防区域名称", name = "fireRegionName") + private String fireRegionName; + @ApiModelProperty(value = "消防区域编码", name = "fireRegionCode") + private String fireRegionCode; + @ApiModelProperty(value = "部门", name = "departmentId") + private String departmentId; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionRemoveCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionRemoveCmd.java new file mode 100644 index 0000000..99cb98b --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionRemoveCmd.java @@ -0,0 +1,29 @@ +package com.zcloud.fire.check.dto; + +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.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:37:10 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FireRegionRemoveCmd implements Serializable { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long[] ids; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionUpdateCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionUpdateCmd.java new file mode 100644 index 0000000..8df92f9 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionUpdateCmd.java @@ -0,0 +1,47 @@ +package com.zcloud.fire.check.dto; + +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.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:37:10 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FireRegionUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "业务主键id", name = "fireRegionId", required = true) + private String fireRegionId; + @ApiModelProperty(value = "企业id", name = "corpinfoId") + private Long corpinfoId; + @ApiModelProperty(value = "消防区域名称", name = "fireRegionName", required = true) + @NotEmpty(message = "消防区域名称不能为空") + private String fireRegionName; + @ApiModelProperty(value = "编码", name = "fireRegionCode", required = true) + @NotEmpty(message = "编码不能为空") + private String fireRegionCode; + @ApiModelProperty(value = "部门id", name = "departmentId", required = true) + @NotNull(message = "部门id不能为空") + private Long departmentId; + @ApiModelProperty(value = "0启用,1禁用", name = "state") + private Integer state; + + @ApiModelProperty(value = "检查照片上传方式（1相机照相，2相册获取）", name = "photoUploadMethod", required = true) + @NotNull(message = "检查照片上传方式不能为空") + private Integer photoUploadMethod; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionUpdateDepartmentCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionUpdateDepartmentCmd.java new file mode 100644 index 0000000..4468d06 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionUpdateDepartmentCmd.java @@ -0,0 +1,31 @@ +package com.zcloud.fire.check.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:37:10 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FireRegionUpdateDepartmentCmd implements Serializable { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private List ids; + + @ApiModelProperty(value = "部门id", name = "departmentId", required = true) + @NotNull(message = "部门id不能为空") + private Long departmentId; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionUpdateStatusCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionUpdateStatusCmd.java new file mode 100644 index 0000000..60a6fdb --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionUpdateStatusCmd.java @@ -0,0 +1,32 @@ +package com.zcloud.fire.check.dto; + +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.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:37:10 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FireRegionUpdateStatusCmd implements Serializable { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + + @ApiModelProperty(value = "0启用,1禁用", name = "state") + private Integer state; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/RiskPointAddCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/RiskPointAddCmd.java deleted file mode 100644 index 0a93744..0000000 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/RiskPointAddCmd.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.zcloud.fire.check.dto; - -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.NotEmpty; - -/** - * - * @author lin - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class RiskPointAddCmd extends Command { - @ApiModelProperty(value = "风险点名字", name = "riskPointName", required = true) - @NotEmpty(message = "风险点名字不能为空") - private String riskPointName; -// @ApiModelProperty(value = "部门Id", name = "deptId", required = true) -// @NotEmpty -// private String deptId; - @NotEmpty(message = "部门名字不能为空") - @ApiModelProperty(value = "部门名字", name = "deptName", required = true) - private String deptName; -} diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/RiskPointPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/RiskPointPageQry.java deleted file mode 100644 index 70d87d9..0000000 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/RiskPointPageQry.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.zcloud.fire.check.dto; - -import com.alibaba.cola.dto.PageQuery; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.lang.reflect.Field; -import java.util.HashMap; -import java.util.Map; - -@Data -public class RiskPointPageQry extends PageQuery { - @ApiModelProperty(value = "风险点名称") - private String likeRiskPointName; - @ApiModelProperty(value = "部门名称") - private String eqDeptName; - - public Map toHashMap() { - Map map = new HashMap<>(); - Class clazz = this.getClass(); - - Field[] fields = clazz.getDeclaredFields(); - for (Field field : fields) { - try { - field.setAccessible(true); - map.put(field.getName(), field.get(this)); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - } - - Class superClass = clazz.getSuperclass(); - if (superClass != null) { - Field[] superFields = superClass.getDeclaredFields(); - for (Field field : superFields) { - try { - field.setAccessible(true); - map.put(field.getName(), field.get(this)); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - } - } - return map; - } -} diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/RiskPointUpdateCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/RiskPointUpdateCmd.java deleted file mode 100644 index 33341e9..0000000 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/RiskPointUpdateCmd.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.zcloud.fire.check.dto; - -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.NotEmpty; - -/** - * - * @author lin - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class RiskPointUpdateCmd extends Command { - @ApiModelProperty(value = "风险点id", name = "id", required = true) - @NotEmpty - private String id; - @ApiModelProperty(value = "风险点名字", name = "riskPointName", required = true) - @NotEmpty - private String riskPointName; - - @NotEmpty - @ApiModelProperty(value = "部门名字", name = "deptName", required = true) - private String deptName; -} diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckStandardCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckStandardCO.java new file mode 100644 index 0000000..fd94529 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckStandardCO.java @@ -0,0 +1,79 @@ +package com.zcloud.fire.check.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:12:14 + */ +@Data +public class FireCheckStandardCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireCheckStandardId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //消防器材类型 + @ApiModelProperty(value = "消防器材类型") + private String fireDeviceType; + //消防器材类型名称 + @ApiModelProperty(value = "消防器材类型名称") + private String fireDeviceTypeName; + //消防器材名称 + @ApiModelProperty(value = "消防器材名称") + private String deviceName; + //单位名称 + @ApiModelProperty(value = "单位名称") + private String employer; + //检查项 + @ApiModelProperty(value = "检查项") + private String fireCheckStandardItem; + //乐观锁 + @ApiModelProperty(value = "乐观锁") + private Integer version; + //创建人 + @ApiModelProperty(value = "创建人") + private Long createId; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //创建时间 + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + //更新人 + @ApiModelProperty(value = "更新人") + private Long updateId; + //修改人名称 + @ApiModelProperty(value = "修改人名称") + private String updateName; + //更新时间 + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + //描述 + @ApiModelProperty(value = "描述") + private String remarks; + //是否删除 + @ApiModelProperty(value = "是否删除") + private String deleteEnum; + //租户ID + @ApiModelProperty(value = "租户ID") + private Long tenantId; + //机构ID + @ApiModelProperty(value = "机构ID") + private Long orgId; + //环境 + @ApiModelProperty(value = "环境") + private String env; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireDeviceCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireDeviceCO.java new file mode 100644 index 0000000..1f79f1b --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireDeviceCO.java @@ -0,0 +1,98 @@ +package com.zcloud.fire.check.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:12:34 + */ +@Data +public class FireDeviceCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireDeviceId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //消防区域id + @ApiModelProperty(value = "消防区域id") + private String fireRegionId; + //消防点位id + @ApiModelProperty(value = "消防点位id") + private String firePointId; + //部门id + @ApiModelProperty(value = "部门id") + private Long departmentId; + //消防器材类型 + @ApiModelProperty(value = "消防器材类型") + private String fireDeviceType; + //消防器材类型名称 + @ApiModelProperty(value = "消防器材类型名称") + private String fireDeviceTypeName; + //器材编号 + @ApiModelProperty(value = "器材编号") + private String fireDeviceCode; + //有效期开始时间 + @ApiModelProperty(value = "有效期开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime validityStartTime; + //有效期结束时间 + @ApiModelProperty(value = "有效期结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime validityEndTime; + //存放地点 + @ApiModelProperty(value = "存放地点") + private String storageLocation; + + //消防点位名称 + @ApiModelProperty(value = "消防点位名称") + private String firePointName; + + // + //消防区域名称 + @ApiModelProperty(value = "消防区域名称") + private String fireRegionName; + //消防区域编码 + @ApiModelProperty(value = "消防区域编码") + private String fireRegionCode; + //消防点位编码 + @ApiModelProperty(value = "消防点位编码") + private String firePointCode; + //部门名称 + @ApiModelProperty(value = "部门名称") + private String departmentName; + //负责人 + @ApiModelProperty(value = "负责人") + private String userName; + + + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //创建时间 + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + + //修改人名称 + @ApiModelProperty(value = "修改人名称") + private String updateName; + //更新时间 + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + //描述 + @ApiModelProperty(value = "描述") + private String remarks; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FirePointCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FirePointCO.java new file mode 100644 index 0000000..2244cd6 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FirePointCO.java @@ -0,0 +1,83 @@ +package com.zcloud.fire.check.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:12:54 + */ +@Data +public class FirePointCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String firePointId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //消防区域id + @ApiModelProperty(value = "消防区域id") + private String fireRegionId; + //消防点位名称 + @ApiModelProperty(value = "消防点位名称") + private String firePointName; + //消防点位编码 + @ApiModelProperty(value = "消防点位编码") + private String firePointCode; + //部门id + @ApiModelProperty(value = "部门id") + private Long departmentId; + //负责人 + @ApiModelProperty(value = "负责人") + private Long userId; + //经度 + @ApiModelProperty(value = "经度") + private String longitude; + //纬度 + @ApiModelProperty(value = "纬度") + private String latitude; + + //部门名称 + @ApiModelProperty(value = "部门名称") + private String departmentName; + //负责人姓名 + @ApiModelProperty(value = "负责人姓名") + private String userName; + //消防区域名称 + @ApiModelProperty(value = "消防区域名称") + private String fireRegionName; + + //消防器材数 + @ApiModelProperty(value = "消防器材数") + private Long deivceCount; + + + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //创建时间 + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + //更新人 + @ApiModelProperty(value = "更新人") + private Long updateId; + //修改人名称 + @ApiModelProperty(value = "修改人名称") + private String updateName; + + //描述 + @ApiModelProperty(value = "描述") + private String remarks; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireRegionCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireRegionCO.java new file mode 100644 index 0000000..69322e0 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireRegionCO.java @@ -0,0 +1,76 @@ +package com.zcloud.fire.check.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:37:09 + */ +@Data +public class FireRegionCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireRegionId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //消防区域名称 + @ApiModelProperty(value = "消防区域名称") + private String fireRegionName; + //编码 + @ApiModelProperty(value = "编码") + private String fireRegionCode; + //部门id + @ApiModelProperty(value = "部门id") + private Long departmentId; + //0启用,1禁用 + @ApiModelProperty(value = "0启用,1禁用") + private Integer state; + + //检查照片上传方式（1相机照相，2相册获取） + @ApiModelProperty(value = "检查照片上传方式（1相机照相，2相册获取）") + private Integer photoUploadMethod; + //部门名称 + @ApiModelProperty(value = "部门名称") + private String departmentName; + //点数量 + @ApiModelProperty(value = "点数量") + private Long pointCount; + + //创建人 + @ApiModelProperty(value = "创建人") + private Long createId; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //创建时间 + @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + //更新人 + @ApiModelProperty(value = "更新人") + private Long updateId; + //修改人名称 + @ApiModelProperty(value = "修改人名称") + private String updateName; + //更新时间 + @ApiModelProperty(value = "更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; + //描述 + @ApiModelProperty(value = "描述") + private String remarks; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/RiskPointCo.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/RiskPointCo.java deleted file mode 100644 index a7b06df..0000000 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/RiskPointCo.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.zcloud.fire.check.dto.clientobject; - -import com.alibaba.cola.dto.ClientObject; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class RiskPointCo extends ClientObject { - @ApiModelProperty(value = "id") - private Long id; - @ApiModelProperty(value = "风险点名称") - private String riskPointName; - @ApiModelProperty(value = "部门名称") - private String deptName; - @ApiModelProperty(value = "创建人") - private String createName; -} diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/CommonFlagEnum.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/CommonFlagEnum.java new file mode 100644 index 0000000..dffce6f --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/CommonFlagEnum.java @@ -0,0 +1,17 @@ +package com.zcloud.fire.check.domain.enums; + +import lombok.Getter; + +@Getter +public enum CommonFlagEnum { + NO(0,"否"), + YES(1,"是"), + ; + private final Integer code; + private final String name; + + CommonFlagEnum(Integer code, String name) { + this.code = code; + this.name = name; + } +} diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/FireDeviceTypeEnum.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/FireDeviceTypeEnum.java new file mode 100644 index 0000000..e70e3a1 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/FireDeviceTypeEnum.java @@ -0,0 +1,81 @@ +package com.zcloud.fire.check.domain.enums; + +import lombok.Getter; + +/** + * 消防器材类型 + */ +@Getter +public enum FireDeviceTypeEnum { + UNDERGROUND_FIRE_HYDRANT("dxxfsst", "地下消防栓栓体"), + FIRE_RESPIRATOR_MASK("xfhxmz", "消防呼吸面罩"), + PORTABLE_FIRE_WATER_CANNON("yidongxiaofangshuipao", "移动消防水炮"), + MINI_FIRE_STATION_CABINET("wxxfzgz", "微型消防站柜子"), + IRON_BAR("tx", "铁铤"), + FIRE_NOZZLE("xiaofangqiangtou", "消防枪头"), + ENHANCED_WATER_EXTINGUISHER("qianghuashui", "强化水灭火器"), + MULTI_FUNCTION_WATER_GUN("dgnsq", "多功能水枪"), + FIRE_EXTINGUISHER_BRACKET("mhqtj", "灭火器托架"), + FIRE_WATER_DIVIDER("scrfsq", "消防二分水器"), + FIRE_BUCKET("xft", "消防桶"), + DRY_POWDER_EXTINGUISHER("gfmhq", "干粉灭火器"), + FIRE_SAND("xfs", "消防砂"), + STRONG_LIGHT_LAMP("qgzmd", "强光照明灯"), + FIRE_BOX("xiaofangxiang", "消防箱"), + FIRE_EQUIPMENT_BOX("xfsx", "消防器材箱"), + FIRE_SHOVEL("xgq", "消防锹"), + FIRE_HYDRANT_BOX("xfxxt", "消防栓箱体"), + HEPTAFLUOROPROPANE_EXTINGUISHER("qfbwmhq", "七氟丙烷灭火器"), + FIRE_AXE("xff", "消防斧"), + FIRE_HELMET("xftk", "消防头盔"), + PORTABLE_FOAM_CANNON("yidongpaomenpao", "移动泡沫炮"), + WATER_BASED_EXTINGUISHER("sjxmhq", "水基型灭火器"), + MANHOLE_COVER("jg", "并盖"), + FOAM_GUN("poameqiang", "泡沫枪"), + FIRE_LIGHT_SAFETY_ROPE("xfqxaqs", "消防轻型安全绳"), + FIRE_SAFETY_BELT("xfanyd", "消防安全腰带、消防腰带、斧套"), + FIRE_PUMP_ADAPTER("zbjhc", "水泵接合器"), + RED_EXTINGUISHER("redextinguisher", "红色灭火器"), + FIRE_HOOK("xfg", "消防钩"), + FIRE_FIGHTING_PROTECTIVE_SUIT("xfymhf", "消防员灭火防护服"), + FIRE_HOSE_EN("firehose", "消防水带"), + FIRE_FIGHTING_PROTECTIVE_BOOTS("xfymhhx", "消防员灭火防护靴"), + FIRE_GLOVES("xfst", "消防手套"), + FIRE_HOSE("xfsd", "消防水带"), + FIRE_FILTER_GAS_MASK("xfglszhfdmj", "消防过滤式综合防毒面具"), + WATER_GUN("shuiq", "水枪"), + CARBON_DIOXIDE_EXTINGUISHER("ryhrmhq", "二氧化碳灭火器"), + WATER_GUN_HOSE_CONNECTOR("sdsddj", "水枪、水带接口"), + FIRE_EXTINGUISHER_BOX("mhqx", "灭火器箱"), + FIRE_HYDRANT("xiaofangsuan", "消防栓"), + FIRE_BLANKET("mgt", "灭火毯"), + FIRE_HYDRANT_WRENCH("xfsbs", "消防栓扳手"); + + private final String code; + private final String description; + + FireDeviceTypeEnum(String code, String description) { + this.code = code; + this.description = description; + } + /** + * 根据编码获取枚举 + */ + public static FireDeviceTypeEnum getByCode(String code) { + for (FireDeviceTypeEnum type : values()) { + if (type.getCode().equals(code)) { + return type; + } + } + return null; + } + public static FireDeviceTypeEnum getByDescription(String description) { + for (FireDeviceTypeEnum type : values()) { + if (type.getDescription().equals(description)) { + return type; + } + } + return null; + } + +} diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/FireRegionStateEnum.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/FireRegionStateEnum.java new file mode 100644 index 0000000..a57a0ac --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/FireRegionStateEnum.java @@ -0,0 +1,29 @@ +package com.zcloud.fire.check.domain.enums; + +import lombok.Getter; + +/** + * 0启用,1禁用 + */ +@Getter +public enum FireRegionStateEnum { + ENABLE(0,"启用"), + DISABLE(1,"禁用"), + ; + private final Integer code; + private final String name; + + FireRegionStateEnum(Integer code, String name) { + this.code = code; + this.name = name; + } + //判断code是否存在 + public static boolean contains(Integer code) { + for (FireRegionStateEnum fireRegionStateEnum : FireRegionStateEnum.values()) { + if (fireRegionStateEnum.getCode().equals(code)) { + return true; + } + } + return false; + } +} diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckStandardGateway.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckStandardGateway.java new file mode 100644 index 0000000..a82fe9c --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckStandardGateway.java @@ -0,0 +1,30 @@ +package com.zcloud.fire.check.domain.gateway; + +import com.zcloud.fire.check.domain.model.FireCheckStandardE; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-11-26 10:12:14 + */ +public interface FireCheckStandardGateway { + + /** + * 新增 + */ + Boolean add(FireCheckStandardE fireCheckStandardE); + + /** + * 修改 + */ + Boolean update(FireCheckStandardE fireCheckStandardE); + + /** + * 删除 + */ + Boolean deletedFireCheckStandardById(Long id); + + Boolean deletedFireCheckStandardByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireDeviceGateway.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireDeviceGateway.java new file mode 100644 index 0000000..307783d --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireDeviceGateway.java @@ -0,0 +1,33 @@ +package com.zcloud.fire.check.domain.gateway; + +import com.zcloud.fire.check.domain.model.FireDeviceE; + +import javax.validation.constraints.NotEmpty; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-11-26 10:12:34 + */ +public interface FireDeviceGateway { + + /** + * 新增 + */ + Boolean add(FireDeviceE fireDeviceE); + + /** + * 修改 + */ + Boolean update(FireDeviceE fireDeviceE); + + /** + * 删除 + */ + Boolean deletedFireDeviceById(Long id); + + Boolean deletedFireDeviceByIds(Long[] id); + +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FirePointGateway.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FirePointGateway.java new file mode 100644 index 0000000..953c18e --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FirePointGateway.java @@ -0,0 +1,30 @@ +package com.zcloud.fire.check.domain.gateway; + +import com.zcloud.fire.check.domain.model.FirePointE; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-11-26 10:12:54 + */ +public interface FirePointGateway { + + /** + * 新增 + */ + Boolean add(FirePointE firePointE); + + /** + * 修改 + */ + Boolean update(FirePointE firePointE); + + /** + * 删除 + */ + Boolean deletedFirePointById(Long id); + + Boolean deletedFirePointByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireRegionGateway.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireRegionGateway.java new file mode 100644 index 0000000..0b45e37 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireRegionGateway.java @@ -0,0 +1,30 @@ +package com.zcloud.fire.check.domain.gateway; + +import com.zcloud.fire.check.domain.model.FireRegionE; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-11-26 10:13:09 + */ +public interface FireRegionGateway { + + /** + * 新增 + */ + Boolean add(FireRegionE fireRegionE); + + /** + * 修改 + */ + Boolean update(FireRegionE fireRegionE); + + /** + * 删除 + */ + Boolean deletedFireRegionById(Long id); + + Boolean deletedFireRegionByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/RiskPointGateway.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/RiskPointGateway.java deleted file mode 100644 index 0dc07d5..0000000 --- a/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/RiskPointGateway.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.zcloud.fire.check.domain.gateway; - - -import com.zcloud.fire.check.domain.model.RiskPointE; - -/** - * 领域getway - * @author lin - */ -public interface RiskPointGateway { - - /** - * 新增 - * @param riskPointE 准考证管理 - * @return 结果 - */ - Boolean add(RiskPointE riskPointE) ; - - /** - * 修改 - * @param riskPointE 准考证管理 - * @return 结果 - */ - Boolean update(RiskPointE riskPointE); - - /** - * 删除 - * @param id - * @return 结果 - */ - Boolean deletedRiskPointById(Long id); - Boolean deletedRiskPointByIds(Long[] id); -} diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/CorpInfoE.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/CorpInfoE.java new file mode 100644 index 0000000..f4a4b20 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/CorpInfoE.java @@ -0,0 +1,167 @@ +package com.zcloud.fire.check.domain.model; + +import com.alibaba.cola.domain.Entity; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; +import java.time.LocalDate; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-10-30 15:12:49 + */ +@Data +@Entity +@EqualsAndHashCode(callSuper = true) +public class CorpInfoE extends BaseE { + //主键 + private Long id; + //企业id + private String corpinfoId; + //企业名称 + private String corpName; + + //企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位) + private Integer type; + //相关方等级，1 一级相关方,2 二级相关方 + private Integer xgfLevel; + //企业再列表中的排序 + private Integer corpOrder; + //是否启用，1:启用,0:关闭 + private Integer useFlag; + //统一社会信用代码 + private String code; + //通讯地址 + private String address; + //邮编 + private String postalCode; + //所属区域 + private String companyArea; + //规模 + private String scale; + //规模名称 + private String scaleName; + //成立时间 + private LocalDate createDate; + //企业状态 + private String corpState; + //企业状态名称 + private String corpStateName; + //资产总额（万元） + private BigDecimal totalAssets; + //注册资金（万元） + private BigDecimal regcapital; + //企事业单位经营地址 + private String addressBusiness; + //企事业单位办公地址 + private String addressOffice; + //经济类型 + private String ecoType; + private String ecoTypeName; + //主要负责人 + private String contacts; + //主要负责人手机号 + private String contactsPhone; + //安全负责人 + private String safetyName; + //安全负责人手机号 + private String safetyPhone; + //是否规模以上,1:是,0:否 + private Integer scaleType; + //占地面积 + private BigDecimal areaCovered; + //职工人数 + private Integer employees; + //经度 + private String longitude; + //纬度 + private String latitude; + + private String areaName; + + private String areaCode; + //法定代表人 + private String lrName; + //法人手机号 + private String lrMobile; + //行业分类 + private String corpType; + //行业分类名称 + private String corpTypeName; + //行业分类 + private String corpType2; + //行业分类名称 + private String corpType2Name; + //行业分类 + private String corpType3; + //行业分类名称 + private String corpType3Name; + //行业分类 + private String corpType4; + //行业分类名称 + private String corpType4Name; + //所属省名称 + private String provinceName; + //所属省编码 + private String province; + //所属市级名称 + private String cityName; + //所属市级编码 + private String city; + //所属区县名称 + private String countryName; + //所属区县编码 + private String country; + //所属乡镇名称 + private String villageName; + //所属乡镇编码 + private String village; + //所属街道名称 + private String streetName; + //所属街道编码 + private String street; + + //营业执照开始时间 + private LocalDate licenseStart; + //营业执照结束时间 + private LocalDate licenseEnd; + //有无职业卫生信息,1:是,0:否 + private Integer whetherHygieneFlag; + //有无重大危险源,1:是,0:否 + private Integer whetherHazardsFlag; + //是否有稀缺大型应急物资或设施,1:是,0:否 + private Integer whetherScarceFlag; + //是否涉及危化品,1:是,0:否 + private Integer whetherChemicalsFlag; + //有无特种设备,1:是,0:否 + private Integer whetherSpecialequipmentFlag; + //有无特存种作业人员,1:是,0:否 + private Integer whetherSpecialpeopleFlag; + //是否涉及煤气,1:是,0:否 + private Integer whetherCoalgasFlag; + //是否属于消防重点单位,1:是,0:否 + private Integer whetherFireFlag; + //是否在有限空间作业,1:是,0:否 + private Integer whetherConfinedFlag; + //是否存在涉爆粉尘作业,1:是,0:否 + private Integer whetherPowderFlag; + //是否涉及防雷防静电,1:是,0:否 + private Integer whetherLightningFlag; + //是否涉及危化品管道,1:是,0:否 + private Integer whetherPipelineFlag; + //是否持有放射源,1:是,0:否 + private Integer whetherActinogenFlag; + //是否涉及液氨制冷,1:是,0:否 + private Integer whetherLiquidammoniaFlag; + + + public static Boolean isCorp() { + return AuthContext.getTenantId().equals(AuthContext.getUserId()); + } +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/DepartmentE.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/DepartmentE.java new file mode 100644 index 0000000..4ac3ad4 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/DepartmentE.java @@ -0,0 +1,40 @@ +package com.zcloud.fire.check.domain.model; + +import com.alibaba.cola.domain.Entity; +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-10-30 10:10:48 + */ +@Data +@Entity +@EqualsAndHashCode(callSuper = true) +public class DepartmentE extends BaseE { + + //部门id + private String departmentId; + //名称 + private String name; + //父部门id + private Long parentId; + //所属企业 + private Long corpinfoId; + //部门级别编码 + private String level; + //部门级别名称 + private String levelName; + //部门排序 + private Integer depOrder; + //是否监管部门 0-否 1-是 + private Integer superviseFlag; + //是否安全管理部门 0-否 1-是 + private Integer securityFlag; + private String departmentFunction; + +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckStandardE.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckStandardE.java new file mode 100644 index 0000000..57b5ca3 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckStandardE.java @@ -0,0 +1,123 @@ +package com.zcloud.fire.check.domain.model; + +import cn.hutool.core.collection.CollUtil; +import com.alibaba.cola.exception.BizException; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.jjb.saas.framework.domain.model.BaseE; +import com.zcloud.gbscommon.excelEntity.FireCheckStandardExcelImportEntity; +import com.zcloud.gbscommon.excelEntity.RiskUnitExcelImportEntity; +import com.zcloud.gbscommon.utils.ExcelUtils; +import com.zcloud.gbscommon.utils.UuidUtil; +import lombok.Data; +import org.apache.commons.lang.StringUtils; +import org.springframework.web.multipart.MultipartFile; + +import javax.validation.constraints.NotEmpty; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-11-26 10:12:14 + */ +@Data +public class FireCheckStandardE extends BaseE { + //主键 + private Long id; + //业务主键id + private String fireCheckStandardId; + //企业id + private Long corpinfoId; + //消防器材类型 + private String fireDeviceType; + //消防器材类型名称 + private String fireDeviceTypeName; + //消防器材名称 + private String deviceName; + //单位名称 + private String employer; + //检查项 + private String fireCheckStandardItem; + //乐观锁 + private Integer version; + //创建人 + private Long createId; + //创建人姓名 + private String createName; + //创建时间 + private LocalDateTime createTime; + //更新人 + private Long updateId; + //修改人名称 + private String updateName; + //更新时间 + private LocalDateTime updateTime; + //描述 + private String remarks; + //是否删除 + private String deleteEnum; + //租户ID + private Long tenantId; + //机构ID + private Long orgId; + //环境 + private String env; + + public static List importFireCheckStandardList(MultipartFile file, @NotEmpty(message = "消防器材类型不能为空") String fireDeviceType, @NotEmpty(message = "消防器材类型名称不能为空") String fireDeviceTypeName) { + List fireCheckStandardEList = new ArrayList<>(); + List list = new ArrayList<>(); + try { + ExcelUtils.readBatch(file, FireCheckStandardExcelImportEntity.class, list); + if (list.isEmpty()) { + throw new BizException("文件为空"); + } + } catch (Exception e) { + throw new BizException("文件解析失败"); + } + // 错误消息集合 + List errList = new ArrayList<>(); + for (int i = 0; i < list.size(); i++) { + FireCheckStandardExcelImportEntity entity = list.get(i); + if(entity == null){ + errList.add("第" + (i+2) + "行数据不能为空。"); + continue; + } + // 部门 + if(StringUtils.isEmpty(entity.getDeviceName())){ + errList.add("第" + (i+2) + "行消防器材名称不能为空。"); + } + // 岗位 + if(StringUtils.isEmpty(entity.getEmployer())){ + errList.add("第" + (i+2) + "行单位名称不能为空。"); + } + // 风险点(单元) + if(StringUtils.isEmpty(entity.getFireCheckStandardItem())){ + errList.add("第" + (i+2) + "行检查项不能为空。"); + } + } + + if(CollUtil.isNotEmpty(errList)){ + throw new BizException("导入信息有误，请检查后重新导入。错误信息:" + String.join("", errList)); + } + for (int i = 0; i < list.size(); i++) { + FireCheckStandardExcelImportEntity entity = list.get(i); + FireCheckStandardE fireCheckStandardE = new FireCheckStandardE(); + fireCheckStandardE.setFireDeviceType(fireDeviceType); + fireCheckStandardE.setFireDeviceTypeName(fireDeviceTypeName); + fireCheckStandardE.setFireCheckStandardId(UuidUtil.get32UUID()); + fireCheckStandardE.setCorpinfoId(AuthContext.getTenantId()); + fireCheckStandardE.setDeviceName(entity.getDeviceName()); + fireCheckStandardE.setEmployer(entity.getEmployer()); + fireCheckStandardE.setFireCheckStandardItem(entity.getFireCheckStandardItem()); + fireCheckStandardEList.add(fireCheckStandardE); + } + + return fireCheckStandardEList; + } +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireDeviceE.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireDeviceE.java new file mode 100644 index 0000000..bed82aa --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireDeviceE.java @@ -0,0 +1,299 @@ +package com.zcloud.fire.check.domain.model; + +import cn.hutool.core.collection.CollUtil; +import com.alibaba.cola.exception.BizException; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.jjb.saas.framework.domain.model.BaseE; +import com.zcloud.fire.check.domain.enums.FireDeviceTypeEnum; +import com.zcloud.gbscommon.excelEntity.FireDeviceExcelExportEntity; +import com.zcloud.gbscommon.excelEntity.FireDeviceExcelImportEntity; +import com.zcloud.gbscommon.excelEntity.FirePointExcelExportEntity; +import com.zcloud.gbscommon.excelEntity.RiskUnitExcelImportEntity; +import com.zcloud.gbscommon.utils.ExcelUtils; +import com.zcloud.gbscommon.utils.Tools; +import lombok.Data; +import org.apache.commons.lang.StringUtils; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-11-26 10:12:34 + */ +@Data +public class FireDeviceE extends BaseE { + //主键 + private Long id; + //业务主键id + private String fireDeviceId; + //企业id + private Long corpinfoId; + //消防区域id + private String fireRegionId; + //消防点位id + private String firePointId; + //部门id + private Long departmentId; + //消防器材类型 + private String fireDeviceType; + //消防器材类型名称 + private String fireDeviceTypeName; + //器材编号 + private String fireDeviceCode; + //有效期开始时间 + private LocalDateTime validityStartTime; + //有效期结束时间 + private LocalDateTime validityEndTime; + //存放地点 + private String storageLocation; + //乐观锁 + private Integer version; + //创建人 + private Long createId; + //创建人姓名 + private String createName; + //创建时间 + private LocalDateTime createTime; + //更新人 + private Long updateId; + //修改人名称 + private String updateName; + //更新时间 + private LocalDateTime updateTime; + //描述 + private String remarks; + //是否删除 + private String deleteEnum; + //租户ID + private Long tenantId; + //机构ID + private Long orgId; + //环境 + private String env; + + private FireRegionE fireRegionE; + private FirePointE firePointE; + + + public void exportFireDeviceTable(HttpServletResponse httpServletResponse, List listFireDeviceExcelExportEntityList) { + try { + ExcelUtils.exportExcel(httpServletResponse, FireDeviceExcelExportEntity.class, "消防设备信息", listFireDeviceExcelExportEntityList); + } catch (Exception e) { + throw new BizException("导出失败"); + } + } + + public static List parseImportTemplateData(MultipartFile file, + List departmentEList, + List userEList, + List fireDeviceEList, + List fireRegionEList, + List firePointEList) { + List list = new ArrayList<>(); + try { + ExcelUtils.readBatch(file, FireDeviceExcelImportEntity.class, list); + if (list.isEmpty()) { + throw new BizException("文件为空"); + } + } catch (Exception e) { + throw new BizException("文件解析失败"); + } + if (CollUtil.isEmpty(departmentEList)) { + throw new BizException("该企业不存在部门信息，请添加部门后重新导入"); + } + + Map departmentEMap = departmentEList.stream().collect(Collectors.toMap(DepartmentE::getName, DepartmentE -> DepartmentE)); + Map fireDeviceEMap = fireDeviceEList.stream().collect(Collectors.toMap(FireDeviceE::getFireDeviceCode, FireDeviceE -> FireDeviceE)); + Map fireRegionEMap = fireRegionEList.stream().collect(Collectors.toMap(FireRegionE::getFireRegionCode, FireRegionE -> FireRegionE)); + Map firePointEMap = firePointEList.stream().collect(Collectors.toMap(FirePointE::getFirePointCode, FirePointE -> FirePointE)); + + List fireDeviceCodeList = fireDeviceEList.stream().map(FireDeviceE::getFireDeviceCode).collect(Collectors.toList()); + // 错误消息集合 + List errList = new ArrayList<>(); + List fireDeviceList = new ArrayList<>(); + // Note: Need to create user maps for validation + Map> userEMap = userEList.stream() + .collect(Collectors.groupingBy(UserE::getDepartmentId)); + //过滤掉手机号为空的 + + Map userEMapByPhone = userEList.stream() + .filter(user -> StringUtils.isNotEmpty(user.getPhone())) + .collect(Collectors.toMap(UserE::getPhone, user -> user)); + + + for (int i = 0; i < list.size(); i++) { + FireDeviceE fireDeviceE = new FireDeviceE(); + FireDeviceExcelImportEntity entity = list.get(i); + if (entity == null) { + errList.add("第" + (i + 2) + "行数据不能为空。"); + continue; + } + + // 消防器材编号 + if (StringUtils.isEmpty(entity.getFireDeviceCode())) { + errList.add("第" + (i + 2) + "行消防器材编号不能为空。"); + continue; + } else { + if (CollUtil.isNotEmpty(fireDeviceEMap)) { + if (fireDeviceEMap.get(entity.getFireDeviceCode()) != null) { + errList.add("第" + (i + 2) + "行消防器材编号与系统内消防器材编号重复。"); + continue; + } + } + if (!fireDeviceCodeList.contains(entity.getFireDeviceCode())) { + fireDeviceCodeList.add(entity.getFireDeviceCode()); + fireDeviceE.setFireDeviceCode(entity.getFireDeviceCode()); + } else { + errList.add("第" + (i + 2) + "行消防器材编号在导入表格中名称重复。"); + continue; + } + } + if(StringUtils.isEmpty(entity.getFireRegionName())){ + errList.add("第" + (i + 2) + "行消防区域不能为空。"); + continue; + } + + + // 部门和负责人校验 + if (StringUtils.isEmpty(entity.getDepartmentName())) { + errList.add("第" + (i + 2) + "行责任部门不能为空。"); + continue; + } else { + DepartmentE department = departmentEMap.get(entity.getDepartmentName()); + if (department == null) { + errList.add("第" + (i + 2) + "行：未找到名称为“" + entity.getDepartmentName() + "”的责任部门。"); + continue; + } else { + fireDeviceE.setDepartmentId(department.getId()); + // 负责人校验 + if (StringUtils.isEmpty(entity.getUserName())) { + errList.add("第" + (i + 2) + "行负责人不能为空。"); + continue; + } else { + UserE user = userEMapByPhone.get(entity.getUserPhone()); + List usersInDept = userEMap.get(department.getId()); + if (user == null) { + errList.add("第" + (i + 2) + "行：未找到名称为“" + entity.getUserName() + "”的负责人。"); + continue; + } else if (usersInDept == null || !usersInDept.contains(user)) { + errList.add("第" + (i + 2) + "行：部门“" + entity.getDepartmentName() + "”下未找到负责人“" + entity.getUserName() + "”。"); + continue; + } + } + } + } + // 时间校验 + if (StringUtils.isNotEmpty(entity.getValidityStartTime())) { + try { + // 定义输入格式 + DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("yyyy年M月d日"); + LocalDate date = LocalDate.parse(entity.getValidityStartTime(), inputFormatter); + LocalDateTime dateTime = date.atTime(0, 0, 0); + fireDeviceE.setValidityStartTime(dateTime); + } catch (DateTimeParseException e) { + errList.add("第" + (i + 2) + "行有效期开始时间格式错误"); + continue; + } + } + + if (StringUtils.isNotEmpty(entity.getValidityEndTime())) { + try { + // 定义输入格式 + DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("yyyy年M月d日"); + // 解析日期并设置时间为00:00:00 + LocalDate date = LocalDate.parse(entity.getValidityEndTime(), inputFormatter); + LocalDateTime dateTime = date.atTime(0, 0, 0); + fireDeviceE.setValidityEndTime(dateTime); + } catch (DateTimeParseException e) { + errList.add("第" + (i + 2) + "行有效期结束时间格式错误"); + continue; + } + } + + // 验证器材类型 + if (StringUtils.isEmpty(entity.getFireDeviceTypeName())) { + errList.add("第" + (i + 2) + "行消防器材类型不能为空。"); + continue; + } else { + FireDeviceTypeEnum fireDeviceTypeEnum = FireDeviceTypeEnum.getByDescription(entity.getFireDeviceTypeName()); + if (fireDeviceTypeEnum == null) { + errList.add("第" + (i + 2) + "行：未找到“" + entity.getFireDeviceTypeName() + "”的消防器材类型。"); + continue; + } else { + fireDeviceE.setFireDeviceType(fireDeviceTypeEnum.getCode().toString()); + fireDeviceE.setFireDeviceTypeName(fireDeviceTypeEnum.getDescription()); + } + } + + // 存放地点 + if (StringUtils.isEmpty(entity.getStorageLocation())) { + errList.add("第" + (i + 2) + "行存放地点不能为空。"); + continue; + } else { + fireDeviceE.setStorageLocation(entity.getStorageLocation()); + } + // 区域校验 + if (StringUtils.isEmpty(entity.getFireRegionCode())) { + errList.add("第" + (i + 2) + "行消防区域不能为空。"); + continue; + } else { + + FireRegionE fireRegion = fireRegionEMap.get(entity.getFireRegionCode()); + if (fireRegion == null) { + //新增 + fireRegion = new FireRegionE(); + fireRegion.setFireRegionName(entity.getFireRegionName()); + fireRegion.setFireRegionCode(entity.getFireRegionCode()); + fireRegion.setDepartmentId(fireDeviceE.getDepartmentId()); + fireDeviceE.setFireRegionE(fireRegion); + } else { + fireDeviceE.setFireRegionId(fireRegion.getFireRegionId()); + } + } + + // 点位校验 + if (StringUtils.isEmpty(entity.getFirePointName())) { + errList.add("第" + (i + 2) + "行消防点位名称不能为空。"); + continue; + } else { + FirePointE firePoint = firePointEMap.get(entity.getFirePointCode()); + if (firePoint == null) { + //新增 + firePoint = new FirePointE(); + firePoint.setFirePointName(entity.getFirePointName()); + firePoint.setFirePointCode(entity.getFirePointCode()); + firePoint.setDepartmentId(fireDeviceE.getDepartmentId()); + UserE userE = userEMapByPhone.get(entity.getUserPhone()); + firePoint.setUserId(userE.getId()); + fireDeviceE.setFirePointE(firePoint); + } else { + fireDeviceE.setFirePointId(firePoint.getFirePointId()); + } + } + + fireDeviceE.setCorpinfoId(AuthContext.getTenantId()); + fireDeviceE.setFireDeviceId(Tools.get32UUID()); + + fireDeviceList.add(fireDeviceE); + } + + if (CollUtil.isNotEmpty(errList)) { + throw new BizException("导入信息有误，请检查后重新导入。错误信息:" + String.join("", errList)); + } + return fireDeviceList; + } +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FirePointE.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FirePointE.java new file mode 100644 index 0000000..5419a3a --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FirePointE.java @@ -0,0 +1,86 @@ +package com.zcloud.fire.check.domain.model; + +import com.alibaba.cola.exception.BizException; +import com.jjb.saas.framework.domain.model.BaseE; +import com.zcloud.gbscommon.excelEntity.FirePointExcelExportEntity; +import com.zcloud.gbscommon.excelEntity.ListManagerStatisticExcelExportEntity; +import com.zcloud.gbscommon.utils.ExcelUtils; +import lombok.Data; + +import javax.servlet.http.HttpServletResponse; +import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.util.Date; +import java.util.List; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-11-26 10:12:54 + */ +@Data +public class FirePointE extends BaseE { + //主键 + private Long id; + //业务主键id + private String firePointId; + //企业id + private Long corpinfoId; + //消防区域id + private String fireRegionId; + //消防点位名称 + private String firePointName; + //消防点位编码 + private String firePointCode; + //部门id + private Long departmentId; + //负责人 + private Long userId; + //经度 + private String longitude; + //纬度 + private String latitude; + //乐观锁 + private Integer version; + //创建人 + private Long createId; + //创建人姓名 + private String createName; + //创建时间 + private LocalDateTime createTime; + //更新人 + private Long updateId; + //修改人名称 + private String updateName; + //更新时间 + private LocalDateTime updateTime; + //描述 + private String remarks; + //是否删除 + private String deleteEnum; + //租户ID + private Long tenantId; + //机构ID + private Long orgId; + //环境 + private String env; + + public static void checkFirePoint(String firePointName, long count) { + if (count > 0) { + throw new BizException(firePointName+"点位下已存在设备"); + } + } + + public void exportFirePointTable(HttpServletResponse httpServletResponse, List listFirePointExcelExportEntityList) { + try { + //获取当前年月日时分秒字符串 + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); + String dateTimeString = sdf.format(new Date()); + ExcelUtils.exportExcel(httpServletResponse, FirePointExcelExportEntity.class,dateTimeString, listFirePointExcelExportEntityList); + }catch (Exception e) { + throw new BizException("导出失败"); + } + } +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireRegionE.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireRegionE.java new file mode 100644 index 0000000..e3d8860 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireRegionE.java @@ -0,0 +1,65 @@ +package com.zcloud.fire.check.domain.model; + +import com.alibaba.cola.exception.BizException; +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-11-26 10:37:09 + */ +@Data +public class FireRegionE extends BaseE { + //主键 + private Long id; + //业务主键id + private String fireRegionId; + //企业id + private Long corpinfoId; + //消防区域名称 + private String fireRegionName; + //编码 + private String fireRegionCode; + //部门id + private Long departmentId; + //0启用,1禁用 + private Integer state; + + //检查照片上传方式（1相机照相，2相册获取） + private Integer photoUploadMethod; + //乐观锁 + private Integer version; + //创建人 + private Long createId; + //创建人姓名 + private String createName; + //创建时间 + private LocalDateTime createTime; + //更新人 + private Long updateId; + //修改人名称 + private String updateName; + //更新时间 + private LocalDateTime updateTime; + //描述 + private String remarks; + //是否删除 + private String deleteEnum; + //租户ID + private Long tenantId; + //机构ID + private Long orgId; + //环境 + private String env; + + public static void checkFireRegion(String fireRegionName, long count) { + if (count > 0) { + throw new BizException(fireRegionName + "下有点位,不能删除"); + } + } +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/RiskPointE.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/RiskPointE.java deleted file mode 100644 index fdd9be0..0000000 --- a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/RiskPointE.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.zcloud.fire.check.domain.model; - -import com.alibaba.cola.domain.Entity; -import com.jjb.saas.framework.domain.model.BaseE; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 领域模型，根据领域模型驱动设计 - * - * @author lin - */ -@Data -@Entity -@EqualsAndHashCode(callSuper = true) -public class RiskPointE extends BaseE { - private Long id; - private String riskPointName; - private String deptName; -} diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/UserE.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/UserE.java new file mode 100644 index 0000000..4c16906 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/UserE.java @@ -0,0 +1,113 @@ +package com.zcloud.fire.check.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * web-domain + * + * @Author zhangyue + * @Date 2025-11-04 14:07:34 + */ +@Data +public class UserE extends BaseE { + //GBS用户id + private Long id; + //业务主键id老系统id + private String userId; + //登录账号 + private String username; + //姓名 + private String name; + //企业id + private Long corpinfoId; + //是否主账号1是0否 + private Integer mainCorpFlag; + //用户类型,1监管2企业3相关方 + private Integer userType; + //部门id + private Long departmentId; + //岗位id + private Long postId; + //角色id + private Long roleId; + //邮箱 + private String email; + //人员类型编码（主要负责人等） + private String personnelType; + //人员类型翻译 + private String personnelTypeName; + //民族编码问一下有没有组件 + private String nation; + //民族名称 + private String nationName; + //身份证号 + private String userIdCard; + //人脸头像url + private String userAvatarUrl; + //现住址 + private String currentAddress; + //户口所在地 + private String locationAddress; + + private String rankLevel; + private String phone; + + private String rankLevelName; + + //企业名称 + private String corpinfoName; + //部门名称 + private String departmentName; + //岗位名称 + private String postName; + //人员在部门中的排序 + private Integer sort; + //乐观锁 + private Integer version; + //创建人 + private Long createId; + //创建人姓名 + private String createName; + //创建时间 + private LocalDateTime createTime; + //更新人 + private Long updateId; + //修改人名称 + private String updateName; + //更新时间 + private LocalDateTime updateTime; + //描述 + private String remarks; + //是否删除 + private String deleteEnum; + //租户ID + private Long tenantId; + //机构ID + private Long orgId; + //环境 + private String env; + //是否部门领导0否1是 + private Integer departmentLeaderFlag; + //是否分管领导0否1是 + private Integer deputyLeaderFlag; + //文化程度 数据字典 + private String culturalLevel; + //文化程度名称 + private String culturalLevelName; + //婚姻状态 + private String maritalStatus; + //婚姻状态名称 + private String maritalStatusName; + //政治面貌 + private String politicalAffiliation; + //政治面貌名称 + private String politicalAffiliationName; + + // 入职状态 + private Integer employmentFlag; + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckStandardGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckStandardGatewayImpl.java new file mode 100644 index 0000000..039510f --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckStandardGatewayImpl.java @@ -0,0 +1,59 @@ +package com.zcloud.fire.check.gatewayimpl; + +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.fire.check.domain.gateway.FireCheckStandardGateway; +import com.zcloud.fire.check.domain.model.FireCheckStandardE; +import com.zcloud.fire.check.persistence.dataobject.FireCheckStandardDO; +import com.zcloud.fire.check.persistence.repository.FireCheckStandardRepository; +import com.zcloud.gbscommon.utils.Tools; +import lombok.AllArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-26 10:12:15 + */ +@Service +@AllArgsConstructor +public class FireCheckStandardGatewayImpl implements FireCheckStandardGateway { + private final FireCheckStandardRepository fireCheckStandardRepository; + + @Override + public Boolean add(FireCheckStandardE fireCheckStandardE) { + if(StringUtils.isEmpty(fireCheckStandardE.getFireCheckStandardId())){ + fireCheckStandardE.setFireCheckStandardId(Tools.get32UUID()); + } + if(fireCheckStandardE.getCorpinfoId() == null){ + fireCheckStandardE.setCorpinfoId(AuthContext.getTenantId()); + } + FireCheckStandardDO d = new FireCheckStandardDO(); + BeanUtils.copyProperties(fireCheckStandardE, d); + fireCheckStandardRepository.save(d); + return true; + } + + @Override + public Boolean update(FireCheckStandardE fireCheckStandardE) { + FireCheckStandardDO d = new FireCheckStandardDO(); + BeanUtils.copyProperties(fireCheckStandardE, d); + fireCheckStandardRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedFireCheckStandardById(Long id) { + return fireCheckStandardRepository.removeById(id); + } + + @Override + public Boolean deletedFireCheckStandardByIds(Long[] ids) { + return fireCheckStandardRepository.removeByIds(Collections.singletonList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireDeviceGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireDeviceGatewayImpl.java new file mode 100644 index 0000000..669ef5b --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireDeviceGatewayImpl.java @@ -0,0 +1,63 @@ +package com.zcloud.fire.check.gatewayimpl; + +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.fire.check.domain.gateway.FireDeviceGateway; +import com.zcloud.fire.check.domain.model.FireDeviceE; +import com.zcloud.fire.check.persistence.dataobject.FireDeviceDO; +import com.zcloud.fire.check.persistence.repository.FireDeviceRepository; +import com.zcloud.gbscommon.utils.Tools; +import lombok.AllArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-26 10:12:34 + */ +@Service +@AllArgsConstructor +public class FireDeviceGatewayImpl implements FireDeviceGateway { + private final FireDeviceRepository fireDeviceRepository; + + @Override + public Boolean add(FireDeviceE fireDeviceE) { + if(StringUtils.isEmpty(fireDeviceE.getFireDeviceId())){ + fireDeviceE.setFireDeviceId(Tools.get32UUID()); + } + if(fireDeviceE.getCorpinfoId() == null){ + fireDeviceE.setCorpinfoId(AuthContext.getTenantId()); + } + FireDeviceDO d = new FireDeviceDO(); + BeanUtils.copyProperties(fireDeviceE, d); + fireDeviceRepository.save(d); + return true; + } + + @Override + public Boolean update(FireDeviceE fireDeviceE) { + FireDeviceDO d = new FireDeviceDO(); + BeanUtils.copyProperties(fireDeviceE, d); + fireDeviceRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedFireDeviceById(Long id) { + return fireDeviceRepository.removeById(id); + } + + @Override + public Boolean deletedFireDeviceByIds(Long[] ids) { + List idList = Arrays.stream(ids).collect(Collectors.toList()); + return fireDeviceRepository.removeByIds(idList); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FirePointGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FirePointGatewayImpl.java new file mode 100644 index 0000000..1097b9f --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FirePointGatewayImpl.java @@ -0,0 +1,63 @@ +package com.zcloud.fire.check.gatewayimpl; + +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.fire.check.domain.gateway.FirePointGateway; +import com.zcloud.fire.check.domain.model.FirePointE; +import com.zcloud.fire.check.persistence.dataobject.FirePointDO; +import com.zcloud.fire.check.persistence.repository.FirePointRepository; +import com.zcloud.gbscommon.utils.Tools; +import lombok.AllArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-26 10:12:54 + */ +@Service +@AllArgsConstructor +public class FirePointGatewayImpl implements FirePointGateway { + private final FirePointRepository firePointRepository; + + @Override + public Boolean add(FirePointE firePointE) { + if(StringUtils.isEmpty(firePointE.getFirePointId())){ + firePointE.setFirePointId(Tools.get32UUID()); + } + if(firePointE.getCorpinfoId() == null){ + firePointE.setCorpinfoId(AuthContext.getTenantId()); + } + FirePointDO d = new FirePointDO(); + BeanUtils.copyProperties(firePointE, d); + firePointRepository.save(d); + return true; + } + + @Override + public Boolean update(FirePointE firePointE) { + FirePointDO d = new FirePointDO(); + BeanUtils.copyProperties(firePointE, d); + firePointRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedFirePointById(Long id) { + return firePointRepository.removeById(id); + } + + @Override + public Boolean deletedFirePointByIds(Long[] ids) { + List idList = Arrays.stream(ids).collect(Collectors.toList()); + return firePointRepository.removeByIds(idList); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireRegionGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireRegionGatewayImpl.java new file mode 100644 index 0000000..563df86 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireRegionGatewayImpl.java @@ -0,0 +1,63 @@ +package com.zcloud.fire.check.gatewayimpl; + +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.fire.check.domain.gateway.FireRegionGateway; +import com.zcloud.fire.check.domain.model.FireRegionE; +import com.zcloud.fire.check.persistence.dataobject.FireRegionDO; +import com.zcloud.fire.check.persistence.repository.FireRegionRepository; +import com.zcloud.gbscommon.utils.Tools; +import lombok.AllArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-26 10:13:09 + */ +@Service +@AllArgsConstructor +public class FireRegionGatewayImpl implements FireRegionGateway { + private final FireRegionRepository fireRegionRepository; + + @Override + public Boolean add(FireRegionE fireRegionE) { + if(StringUtils.isEmpty(fireRegionE.getFireRegionId())){ + fireRegionE.setFireRegionId(Tools.get32UUID()); + } + if(fireRegionE.getCorpinfoId() == null){ + fireRegionE.setCorpinfoId(AuthContext.getTenantId()); + } + FireRegionDO d = new FireRegionDO(); + BeanUtils.copyProperties(fireRegionE, d); + fireRegionRepository.save(d); + return true; + } + + @Override + public Boolean update(FireRegionE fireRegionE) { + FireRegionDO d = new FireRegionDO(); + BeanUtils.copyProperties(fireRegionE, d); + fireRegionRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedFireRegionById(Long id) { + return fireRegionRepository.removeById(id); + } + + @Override + public Boolean deletedFireRegionByIds(Long[] ids) { + List idList = Arrays.stream(ids).collect(Collectors.toList()); + return fireRegionRepository.removeByIds(idList); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/RiskPointGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/RiskPointGatewayImpl.java deleted file mode 100644 index df2d037..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/RiskPointGatewayImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.zcloud.fire.check.gatewayimpl; - -import com.zcloud.fire.check.domain.gateway.RiskPointGateway; -import com.zcloud.fire.check.domain.model.RiskPointE; -import com.zcloud.fire.check.persistence.dataobject.RiskPointDO; -import com.zcloud.fire.check.persistence.repository.RiskPointRepository; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import java.util.Arrays; - -/** - * 持久层实现 - * - * @author lin - */ - -@Service -@AllArgsConstructor -public class RiskPointGatewayImpl implements RiskPointGateway { - private final RiskPointRepository riskPointRepository; - - @Override - public Boolean add(RiskPointE riskPointE) { - RiskPointDO d = new RiskPointDO(); - BeanUtils.copyProperties(riskPointE, d); - riskPointRepository.save(d); - return true; - } - - @Override - public Boolean update(RiskPointE riskPointE) { - RiskPointDO d = new RiskPointDO(); - BeanUtils.copyProperties(riskPointE, d); - riskPointRepository.updateById(d); - return true; - } - - @Override - public Boolean deletedRiskPointById(Long id) { - return riskPointRepository.removeById(id); - } - - @Override - public Boolean deletedRiskPointByIds(Long[] ids) { - return riskPointRepository.removeByIds(Arrays.asList(ids)); - } - - -} diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/CorpInfoDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/CorpInfoDO.java new file mode 100644 index 0000000..978ebfa --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/CorpInfoDO.java @@ -0,0 +1,229 @@ +package com.zcloud.fire.check.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; +import java.time.LocalDate; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-10-30 15:12:49 + */ +@Data +@TableName("corp_info") +@EqualsAndHashCode(callSuper = true) +public class CorpInfoDO extends BaseDO { + + //企业id + @ApiModelProperty(value = "企业id") + private String corpinfoId; + //企业名称 + @ApiModelProperty(value = "企业名称") + private String corpName; + + //企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位) + @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)") + private Integer type; + //相关方等级，1 一级相关方,2 二级相关方 + @ApiModelProperty(value = "相关方等级，1 一级相关方,2 二级相关方") + private Integer xgfLevel; + //企业再列表中的排序 + @ApiModelProperty(value = "企业再列表中的排序") + private Integer corpOrder; + //是否启用，1:启用,2:关闭 + @ApiModelProperty(value = "是否启用，1:启用,0:关闭") + private Integer useFlag; + //统一社会信用代码 + @ApiModelProperty(value = "统一社会信用代码") + private String code; + //通讯地址 + @ApiModelProperty(value = "通讯地址") + private String address; + //邮编 + @ApiModelProperty(value = "邮编") + private String postalCode; + //所属区域 + @ApiModelProperty(value = "所属区域") + private String companyArea; + + //规模 + @ApiModelProperty(value = "规模") + private String scale; + @ApiModelProperty(value = "规模名称") + private String scaleName; + //成立时间 + @ApiModelProperty(value = "成立时间") + private LocalDate createDate; + //企业状态 + @ApiModelProperty(value = "企业状态") + private String corpState; + //企业状态名称 + @ApiModelProperty(value = "企业状态名称") + private String corpStateName; + //资产总额（万元） + @ApiModelProperty(value = "资产总额（万元）") + private BigDecimal totalAssets; + //注册资金（万元） + @ApiModelProperty(value = "注册资金（万元）") + private BigDecimal regcapital; + //企事业单位经营地址 + @ApiModelProperty(value = "企事业单位经营地址") + private String addressBusiness; + //企事业单位办公地址 + @ApiModelProperty(value = "企事业单位办公地址") + private String addressOffice; + //经济类型 + @ApiModelProperty(value = "经济类型") + private String ecoType; + @ApiModelProperty(value = "经济类型名称") + private String ecoTypeName; + //主要负责人 + @ApiModelProperty(value = "主要负责人") + private String contacts; + //主要负责人手机号 + @ApiModelProperty(value = "主要负责人手机号") + private String contactsPhone; + //安全负责人 + @ApiModelProperty(value = "安全负责人") + private String safetyName; + //安全负责人手机号 + @ApiModelProperty(value = "安全负责人手机号") + private String safetyPhone; + //是否规模以上,1:是,0:否 + @ApiModelProperty(value = "是否规模以上,1:是,0:否") + private Integer scaleType; + //占地面积 + @ApiModelProperty(value = "占地面积") + private BigDecimal areaCovered; + //职工人数 + @ApiModelProperty(value = "职工人数") + private Integer employees; + //经度 + @ApiModelProperty(value = "经度") + private String longitude; + //纬度 + @ApiModelProperty(value = "纬度") + private String latitude; + @ApiModelProperty(value = "所属区域名称") + private String areaName; + @ApiModelProperty(value = "所属区域编码") + private String areaCode; + //法定代表人 + @ApiModelProperty(value = "法定代表人") + private String lrName; + //法人手机号 + @ApiModelProperty(value = "法人手机号") + private String lrMobile; + //行业分类 + @ApiModelProperty(value = "行业分类") + private String corpType; + //行业分类名称 + @ApiModelProperty(value = "行业分类名称") + private String corpTypeName; + //行业分类 + @ApiModelProperty(value = "行业分类") + private String corpType2; + //行业分类名称 + @ApiModelProperty(value = "行业分类名称") + private String corpType2Name; + //行业分类 + @ApiModelProperty(value = "行业分类") + private String corpType3; + //行业分类名称 + @ApiModelProperty(value = "行业分类名称") + private String corpType3Name; + //行业分类 + @ApiModelProperty(value = "行业分类") + private String corpType4; + //行业分类名称 + @ApiModelProperty(value = "行业分类名称") + private String corpType4Name; + //所属省名称 + @ApiModelProperty(value = "所属省名称") + private String provinceName; + //所属省编码 + @ApiModelProperty(value = "所属省编码") + private String province; + //所属市级名称 + @ApiModelProperty(value = "所属市级名称") + private String cityName; + //所属市级编码 + @ApiModelProperty(value = "所属市级编码") + private String city; + //所属区县名称 + @ApiModelProperty(value = "所属区县名称") + private String countryName; + //所属区县编码 + @ApiModelProperty(value = "所属区县编码") + private String country; + //所属乡镇名称 + @ApiModelProperty(value = "所属乡镇名称") + private String villageName; + //所属乡镇编码 + @ApiModelProperty(value = "所属乡镇编码") + private String village; + //所属街道名称 + @ApiModelProperty(value = "所属街道名称") + private String streetName; + //所属街道编码 + @ApiModelProperty(value = "所属街道编码") + private String street; + + //营业执照开始时间 + @ApiModelProperty(value = "营业执照开始时间") + private LocalDate licenseStart; + //营业执照结束时间 + @ApiModelProperty(value = "营业执照结束时间") + private LocalDate licenseEnd; + //有无职业卫生信息,1:是,0:否 + @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否") + private Integer whetherHygieneFlag; + //有无重大危险源,1:是,0:否 + @ApiModelProperty(value = "有无重大危险源,1:是,0:否") + private Integer whetherHazardsFlag; + //是否有稀缺大型应急物资或设施,1:是,0:否 + @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否") + private Integer whetherScarceFlag; + //是否涉及危化品,1:是,0:否 + @ApiModelProperty(value = "是否涉及危化品,1:是,0:否") + private Integer whetherChemicalsFlag; + //有无特种设备,1:是,0:否 + @ApiModelProperty(value = "有无特种设备,1:是,0:否") + private Integer whetherSpecialequipmentFlag; + //有无特存种作业人员,1:是,0:否 + @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否") + private Integer whetherSpecialpeopleFlag; + //是否涉及煤气,1:是,0:否 + @ApiModelProperty(value = "是否涉及煤气,1:是,0:否") + private Integer whetherCoalgasFlag; + //是否属于消防重点单位,1:是,0:否 + @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否") + private Integer whetherFireFlag; + //是否在有限空间作业,1:是,0:否 + @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否") + private Integer whetherConfinedFlag; + //是否存在涉爆粉尘作业,1:是,0:否 + @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否") + private Integer whetherPowderFlag; + //是否涉及防雷防静电,1:是,0:否 + @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否") + private Integer whetherLightningFlag; + //是否涉及危化品管道,1:是,0:否 + @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否") + private Integer whetherPipelineFlag; + //是否持有放射源,1:是,0:否 + @ApiModelProperty(value = "是否持有放射源,1:是,0:否") + private Integer whetherActinogenFlag; + //是否涉及液氨制冷,1:是,0:否 + @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否") + private Integer whetherLiquidammoniaFlag; + + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/DepartmentDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/DepartmentDO.java new file mode 100644 index 0000000..20c8a16 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/DepartmentDO.java @@ -0,0 +1,50 @@ +package com.zcloud.fire.check.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-10-30 10:10:48 + */ +@Data +@TableName("department") +@EqualsAndHashCode(callSuper = true) +public class DepartmentDO extends BaseDO { + + //部门id + @ApiModelProperty(value = "部门id") + private String departmentId; + //名称 + @ApiModelProperty(value = "名称") + private String name; + //父部门id + @ApiModelProperty(value = "父部门id") + private Long parentId; + //所属企业 + @ApiModelProperty(value = "所属企业") + private Long corpinfoId; + //部门级别编码 + @ApiModelProperty(value = "部门级别编码") + private String level; + //部门级别名称 + @ApiModelProperty(value = "部门级别名称") + private String levelName; + //部门排序 + @ApiModelProperty(value = "部门排序") + private Integer depOrder; + //是否监管部门 0-否 1-是 + @ApiModelProperty(value = "是否监管部门 0-否 1-是") + private Integer superviseFlag; + @ApiModelProperty(value = "是否安全管理部门 0-否 1-是") + private Integer securityFlag; + @ApiModelProperty(value = "部门职能") + private String departmentFunction; + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckStandardDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckStandardDO.java new file mode 100644 index 0000000..bcd1096 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckStandardDO.java @@ -0,0 +1,48 @@ +package com.zcloud.fire.check.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-26 10:12:14 + */ +@Data +@TableName("fire_check_standard") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class FireCheckStandardDO extends BaseDO { + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireCheckStandardId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //消防器材类型 + @ApiModelProperty(value = "消防器材类型") + private String fireDeviceType; + //消防器材类型名称 + @ApiModelProperty(value = "消防器材类型名称") + private String fireDeviceTypeName; + //消防器材名称 + @ApiModelProperty(value = "消防器材名称") + private String deviceName; + //单位名称 + @ApiModelProperty(value = "单位名称") + private String employer; + //检查项 + @ApiModelProperty(value = "检查项") + private String fireCheckStandardItem; + + public FireCheckStandardDO(String fireCheckStandardId) { + this.fireCheckStandardId = fireCheckStandardId; + } + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireDeviceDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireDeviceDO.java new file mode 100644 index 0000000..bc61527 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireDeviceDO.java @@ -0,0 +1,87 @@ +package com.zcloud.fire.check.persistence.dataobject; + +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; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-26 10:12:34 + */ +@Data +@TableName("fire_device") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class FireDeviceDO extends BaseDO { + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireDeviceId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //消防区域id + @ApiModelProperty(value = "消防区域id") + private String fireRegionId; + //消防点位id + @ApiModelProperty(value = "消防点位id") + private String firePointId; + //部门id + @ApiModelProperty(value = "部门id") + private Long departmentId; + //消防器材类型 + @ApiModelProperty(value = "消防器材类型") + private String fireDeviceType; + //消防器材类型名称 + @ApiModelProperty(value = "消防器材类型名称") + private String fireDeviceTypeName; + //器材编号 + @ApiModelProperty(value = "器材编号") + private String fireDeviceCode; + //有效期开始时间 + @ApiModelProperty(value = "有效期开始时间") + private LocalDateTime validityStartTime; + //有效期结束时间 + @ApiModelProperty(value = "有效期结束时间") + private LocalDateTime validityEndTime; + //存放地点 + @ApiModelProperty(value = "存放地点") + private String storageLocation; + + //消防区域名称 + @ApiModelProperty(value = "消防区域名称") + @TableField(exist = false) + private String fireRegionName; + //消防区域编码 + @ApiModelProperty(value = "消防区域编码") + @TableField(exist = false) + private String fireRegionCode; + //消防点位编码 + @ApiModelProperty(value = "消防点位编码") + @TableField(exist = false) + private String firePointCode; + @ApiModelProperty(value = "消防点位名称") + @TableField(exist = false) + private String firePointName; + //部门名称 + @ApiModelProperty(value = "部门名称") + @TableField(exist = false) + private String departmentName; + //负责人 + @ApiModelProperty(value = "负责人") + @TableField(exist = false) + private String userName; + + public FireDeviceDO(String fireDeviceId) { + this.fireDeviceId = fireDeviceId; + } + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireDeviceStatisticDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireDeviceStatisticDO.java new file mode 100644 index 0000000..8ff5ee8 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireDeviceStatisticDO.java @@ -0,0 +1,23 @@ +package com.zcloud.fire.check.persistence.dataobject; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-26 10:12:54 + */ +@Data +public class FireDeviceStatisticDO { + + //消防区域id + @ApiModelProperty(value = "消防区域id") + private String firePointId; + //消防点位名称 + @ApiModelProperty(value = "消防点位名称") + private Long fireDeviceCount; + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FirePointDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FirePointDO.java new file mode 100644 index 0000000..ad0725c --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FirePointDO.java @@ -0,0 +1,62 @@ +package com.zcloud.fire.check.persistence.dataobject; + +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; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-26 10:12:54 + */ +@Data +@TableName("fire_point") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class FirePointDO extends BaseDO { + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String firePointId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //消防区域id + @ApiModelProperty(value = "消防区域id") + private String fireRegionId; + //消防点位名称 + @ApiModelProperty(value = "消防点位名称") + private String firePointName; + //消防点位编码 + @ApiModelProperty(value = "消防点位编码") + private String firePointCode; + //部门id + @ApiModelProperty(value = "部门id") + private Long departmentId; + //负责人 + @ApiModelProperty(value = "负责人") + private Long userId; + //经度 + @ApiModelProperty(value = "经度") + private String longitude; + //纬度 + @ApiModelProperty(value = "纬度") + private String latitude; + + @TableField(exist = false) + private String departmentName; + @TableField(exist = false) + private String userName; + @TableField(exist = false) + private String fireRegionName; + + public FirePointDO(String firePointId) { + this.firePointId = firePointId; + } + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FirePointStatisticDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FirePointStatisticDO.java new file mode 100644 index 0000000..884dffe --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FirePointStatisticDO.java @@ -0,0 +1,27 @@ +package com.zcloud.fire.check.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-26 10:12:54 + */ +@Data +public class FirePointStatisticDO { + + //消防区域id + @ApiModelProperty(value = "消防区域id") + private String fireRegionId; + //消防点位名称 + @ApiModelProperty(value = "消防点位名称") + private Long firePointCount; + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireRegionDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireRegionDO.java new file mode 100644 index 0000000..ae6a32f --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireRegionDO.java @@ -0,0 +1,53 @@ +package com.zcloud.fire.check.persistence.dataobject; + +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; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-26 10:37:10 + */ +@Data +@TableName("fire_region") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class FireRegionDO extends BaseDO { + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireRegionId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //消防区域名称 + @ApiModelProperty(value = "消防区域名称") + private String fireRegionName; + //编码 + @ApiModelProperty(value = "编码") + private String fireRegionCode; + //部门id + @ApiModelProperty(value = "部门id") + private Long departmentId; + //0启用,1禁用 + @ApiModelProperty(value = "0启用,1禁用") + private Integer state; + + //检查照片上传方式（1相机照相，2相册获取） + @ApiModelProperty(value = "检查照片上传方式（1相机照相，2相册获取）") + private Integer photoUploadMethod; + + @TableField(exist = false) + private String departmentName; + + public FireRegionDO(String fireRegionId) { + this.fireRegionId = fireRegionId; + } + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/RiskPointDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/RiskPointDO.java deleted file mode 100644 index 1114b8c..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/RiskPointDO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zcloud.fire.check.persistence.dataobject; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.jjb.saas.framework.repository.basedo.BaseDO; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("risk_point") -public class RiskPointDO extends BaseDO { - - private String riskPointName; - - private String deptName; -} diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/UserDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/UserDO.java new file mode 100644 index 0000000..51d42eb --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/UserDO.java @@ -0,0 +1,134 @@ +package com.zcloud.fire.check.persistence.dataobject; + +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; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * web-infrastructure + * + * @Author zhangyue + * @Date 2025-11-04 14:07:35 + */ +@Data +@TableName("user") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class UserDO extends BaseDO { + //业务主键id老系统id + @ApiModelProperty(value = "业务主键id老系统id") + private String userId; + //登录账号 + @ApiModelProperty(value = "登录账号") + private String username; + //姓名 + @ApiModelProperty(value = "姓名") + private String name; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //企业id + @ApiModelProperty(value = "企业名称") + @TableField(exist = false) + private String corpinfoName; + //是否主账号1是0否 + @ApiModelProperty(value = "是否主账号1是0否") + private Integer mainCorpFlag; + //用户类型,1监管2企业3相关方 + @ApiModelProperty(value = "用户类型,1监管2企业3相关方") + private Integer userType; + //部门id + @ApiModelProperty(value = "部门id") + private Long departmentId; + //部门id + @ApiModelProperty(value = "部门名称") + @TableField(exist = false) + + private String departmentName; + //岗位id + @ApiModelProperty(value = "岗位id") + private Long postId; + //岗位id + @ApiModelProperty(value = "岗位名称") + @TableField(exist = false) + private String postName; + //角色id + @ApiModelProperty(value = "角色id") + private Long roleId; + //邮箱 + @ApiModelProperty(value = "邮箱") + private String email; + //人员类型编码（主要负责人等） + @ApiModelProperty(value = "人员类型编码（主要负责人等）") + private String personnelType; + //人员类型翻译 + @ApiModelProperty(value = "人员类型翻译") + private String personnelTypeName; + //民族编码问一下有没有组件 + @ApiModelProperty(value = "民族编码问一下有没有组件") + private String nation; + //民族名称 + @ApiModelProperty(value = "民族名称") + private String nationName; + //身份证号 + @ApiModelProperty(value = "身份证号") + private String userIdCard; + //人脸头像url + @ApiModelProperty(value = "人脸头像url") + private String userAvatarUrl; + //现住址 + @ApiModelProperty(value = "现住址") + private String currentAddress; + @ApiModelProperty(value = "描述") + private String remarks; + //户口所在地 + @ApiModelProperty(value = "户口所在地") + private String locationAddress; + @ApiModelProperty(value = "职级") + private String rankLevel; + @ApiModelProperty(value = "职级名称") + private String rankLevelName; + @ApiModelProperty(value = "手机号") + private String phone; + //人员在部门中的排序 + @ApiModelProperty(value = "人员在部门中的排序") + private Integer sort; + //是否部门领导0否1是 + @ApiModelProperty(value = "是否部门领导0否1是") + private Integer departmentLeaderFlag; + //是否分管领导0否1是 + @ApiModelProperty(value = "是否分管领导0否1是") + private Integer deputyLeaderFlag; + //文化程度 数据字典 + @ApiModelProperty(value = "文化程度 数据字典") + private String culturalLevel; + //文化程度名称 + @ApiModelProperty(value = "文化程度名称") + private String culturalLevelName; + //婚姻状态 + @ApiModelProperty(value = "婚姻状态") + private String maritalStatus; + //婚姻状态名称 + @ApiModelProperty(value = "婚姻状态名称") + private String maritalStatusName; + //政治面貌 + @ApiModelProperty(value = "政治面貌") + private String politicalAffiliation; + //政治面貌名称 + @ApiModelProperty(value = "政治面貌名称") + private String politicalAffiliationName; + + // 入职状态 + @ApiModelProperty(value = "入职状态") + private Integer employmentFlag; + + public UserDO(String userId) { + this.userId = userId; + } + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/domainobject/RiskPointDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/domainobject/RiskPointDO.java deleted file mode 100644 index f647ef6..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/domainobject/RiskPointDO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zcloud.fire.check.persistence.domainobject; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.jjb.saas.framework.repository.basedo.BaseDO; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("risk_point") -public class RiskPointDO extends BaseDO { - - private String riskPointName; - - private String deptName; -} diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/CorpInfoMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/CorpInfoMapper.java new file mode 100644 index 0000000..aa9b9b4 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/CorpInfoMapper.java @@ -0,0 +1,17 @@ +package com.zcloud.fire.check.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.fire.check.persistence.dataobject.CorpInfoDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-10-29 16:02:16 + */ +@Mapper +public interface CorpInfoMapper extends BaseMapper { + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/DepartmentMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/DepartmentMapper.java new file mode 100644 index 0000000..bb6ec76 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/DepartmentMapper.java @@ -0,0 +1,17 @@ +package com.zcloud.fire.check.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.fire.check.persistence.dataobject.DepartmentDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-10-29 16:03:20 + */ +@Mapper +public interface DepartmentMapper extends BaseMapper { + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckStandardMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckStandardMapper.java new file mode 100644 index 0000000..ef6dbb5 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckStandardMapper.java @@ -0,0 +1,17 @@ +package com.zcloud.fire.check.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.fire.check.persistence.dataobject.FireCheckStandardDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-26 10:12:15 + */ +@Mapper +public interface FireCheckStandardMapper extends BaseMapper { + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireDeviceMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireDeviceMapper.java new file mode 100644 index 0000000..d7904fb --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireDeviceMapper.java @@ -0,0 +1,28 @@ +package com.zcloud.fire.check.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zcloud.fire.check.persistence.dataobject.FireDeviceDO; +import com.zcloud.fire.check.persistence.dataobject.FireDeviceStatisticDO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-26 10:12:34 + */ +@Mapper +public interface FireDeviceMapper extends BaseMapper { + + List countByFireRegionIdIn(List firePointIds); + + IPage getFireDevicePage(IPage iPage, Map params); + + List getAllList(@Param("params")Map params); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FirePointMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FirePointMapper.java new file mode 100644 index 0000000..60a9942 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FirePointMapper.java @@ -0,0 +1,25 @@ +package com.zcloud.fire.check.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zcloud.fire.check.persistence.dataobject.FirePointDO; +import com.zcloud.fire.check.persistence.dataobject.FirePointStatisticDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-26 10:12:55 + */ +@Mapper +public interface FirePointMapper extends BaseMapper { + + List countByFireRegionIdIn(List fireRegionIds); + + IPage getFirePointPage(IPage iPage, Map params); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireRegionMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireRegionMapper.java new file mode 100644 index 0000000..dcb1b48 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireRegionMapper.java @@ -0,0 +1,21 @@ +package com.zcloud.fire.check.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zcloud.fire.check.persistence.dataobject.FireRegionDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-26 10:13:09 + */ +@Mapper +public interface FireRegionMapper extends BaseMapper { + + IPage getFireRegionPage(IPage iPage, Map params); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/RiskPointMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/RiskPointMapper.java deleted file mode 100644 index 1c47d84..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/RiskPointMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.zcloud.fire.check.persistence.mapper; - -import com.zcloud.fire.check.persistence.dataobject.RiskPointDO; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface RiskPointMapper extends BaseMapper { -} diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/UserMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/UserMapper.java new file mode 100644 index 0000000..644c3ec --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/UserMapper.java @@ -0,0 +1,16 @@ +package com.zcloud.fire.check.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.fire.check.persistence.dataobject.UserDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * web-infrastructure + * + * @Author zhangyue + * @Date 2025-11-04 14:07:36 + */ +@Mapper +public interface UserMapper extends BaseMapper { +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/CorpInfoRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/CorpInfoRepository.java new file mode 100644 index 0000000..5c89f0a --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/CorpInfoRepository.java @@ -0,0 +1,24 @@ +package com.zcloud.fire.check.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.fire.check.persistence.dataobject.CorpInfoDO; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-10-29 16:02:17 + */ +public interface CorpInfoRepository extends BaseRepository { + PageResponse listPage(Map parmas); + + Long getCorpCountByCorpName(String corpName); + + Long getTotalCount(); + + boolean isSupper(); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/DepartmentRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/DepartmentRepository.java new file mode 100644 index 0000000..872c2aa --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/DepartmentRepository.java @@ -0,0 +1,19 @@ +package com.zcloud.fire.check.persistence.repository; + +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.fire.check.persistence.dataobject.DepartmentDO; + +import java.util.List; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-12 08:42:07 + */ +public interface DepartmentRepository extends BaseRepository { + + List listByCorpinfoId(Long corpinfoId); + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckStandardRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckStandardRepository.java new file mode 100644 index 0000000..96f9b61 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckStandardRepository.java @@ -0,0 +1,24 @@ +package com.zcloud.fire.check.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.fire.check.domain.model.FireCheckStandardE; +import com.zcloud.fire.check.persistence.dataobject.FireCheckStandardDO; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-26 10:12:15 + */ +public interface FireCheckStandardRepository extends BaseRepository { + PageResponse listPage(Map params); + + List listAll(Map params); + + boolean addBatch(List fireCheckStandardDOList); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireDeviceRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireDeviceRepository.java new file mode 100644 index 0000000..87a26a9 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireDeviceRepository.java @@ -0,0 +1,32 @@ +package com.zcloud.fire.check.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.fire.check.persistence.dataobject.FireDeviceDO; + +import javax.validation.constraints.NotEmpty; +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-26 10:12:34 + */ +public interface FireDeviceRepository extends BaseRepository { + PageResponse listPage(Map params); + + long countByFirePointId(String firePointId); + + Map countByFirePointIdIn(List firePointIds); + + boolean existsByDeviceCode(@NotEmpty(message = "器材编号不能为空") String fireDeviceCode); + + List getDeviceList(); + + boolean addBatch(List fireDeviceDOS); + + List getAllList(Map params); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FirePointRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FirePointRepository.java new file mode 100644 index 0000000..9cb9cfc --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FirePointRepository.java @@ -0,0 +1,33 @@ +package com.zcloud.fire.check.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.fire.check.persistence.dataobject.FirePointDO; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-26 10:12:55 + */ +public interface FirePointRepository extends BaseRepository { + PageResponse listPage(Map params); + + Map countByFireRegionIdIn(List fireRegionIds); + + long countByFireRegionId(String fireRegionId); + + void editAllDepartment(@NotNull(message = "主键不能为空") List ids, @NotNull(message = "部门id不能为空") Long departmentId); + + List listByCorpinfoId(Long corpinfoId); + + List listByFireRegionId(String fireRegionId); + + boolean existsByFirePointCode(@NotEmpty(message = "消防点位编码不能为空") String firePointCode); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireRegionRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireRegionRepository.java new file mode 100644 index 0000000..be3de76 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireRegionRepository.java @@ -0,0 +1,27 @@ +package com.zcloud.fire.check.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.fire.check.persistence.dataobject.FireRegionDO; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-26 10:13:10 + */ +public interface FireRegionRepository extends BaseRepository { + PageResponse listPage(Map params); + + void editAllDepartment(@NotNull(message = "主键不能为空") List ids, @NotNull(message = "部门id不能为空") Long departmentId); + + List listByCorpinfoId(Long corpinfoId); + + boolean existsByFireRegionCode(@NotEmpty(message = "编码不能为空") String fireRegionCode); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/RiskPointRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/RiskPointRepository.java deleted file mode 100644 index 08144c9..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/RiskPointRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.zcloud.fire.check.persistence.repository; - -import com.alibaba.cola.dto.PageResponse; -import com.zcloud.fire.check.persistence.dataobject.RiskPointDO; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jjb.saas.framework.repository.repo.BaseRepository; - -import java.util.Map; - -/** - * @author lin - */ -public interface RiskPointRepository extends BaseRepository { - PageResponse listRiskPointPage(Map parmas); -} diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/UserRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/UserRepository.java new file mode 100644 index 0000000..bfc7b87 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/UserRepository.java @@ -0,0 +1,18 @@ +package com.zcloud.fire.check.persistence.repository; + +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.fire.check.persistence.dataobject.UserDO; + +import java.util.List; + + +/** +* web-infrastructure +* @Author zhangyue +* @Date 2025-11-04 14:07:36 +*/ +public interface UserRepository extends BaseRepository { + + List listByCorpinfoId(Long corpinfoId); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/CorpInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/CorpInfoRepositoryImpl.java new file mode 100644 index 0000000..3fab81c --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/CorpInfoRepositoryImpl.java @@ -0,0 +1,70 @@ +package com.zcloud.fire.check.persistence.repository.impl; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.exception.BizException; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.jjb.saas.framework.repository.common.PageHelper; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.fire.check.domain.enums.CommonFlagEnum; +import com.zcloud.fire.check.persistence.dataobject.CorpInfoDO; +import com.zcloud.fire.check.persistence.mapper.CorpInfoMapper; +import com.zcloud.fire.check.persistence.repository.CorpInfoRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-10-29 16:02:17 + */ +@Service +@RequiredArgsConstructor +public class CorpInfoRepositoryImpl extends BaseRepositoryImpl implements CorpInfoRepository { + private final CorpInfoMapper corpInfoMapper; + + @Override + public PageResponse listPage(Map params) { + IPage iPage = new Query().getPage(params); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + queryWrapper.orderByAsc("corp_order").orderByDesc("create_time"); + IPage result = corpInfoMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public Long getCorpCountByCorpName(String corpName) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("corp_name", corpName); + return corpInfoMapper.selectCount(queryWrapper); + } + @Override + public Long getTotalCount() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("use_flag", CommonFlagEnum.YES.getCode()); + return corpInfoMapper.selectCount(queryWrapper); + } + + @Override + public boolean isSupper() { + //判断当前企业是否是监管端 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("corpinfo_id", AuthContext.getTenantId()); + CorpInfoDO corpInfoDO = corpInfoMapper.selectById(AuthContext.getTenantId()); + if(corpInfoDO == null) + throw new BizException("当前企业不存在"); + if(corpInfoDO.getType() == 2) + return true; + return false; + } + + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/DepartmentRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/DepartmentRepositoryImpl.java new file mode 100644 index 0000000..73cbb2f --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/DepartmentRepositoryImpl.java @@ -0,0 +1,32 @@ +package com.zcloud.fire.check.persistence.repository.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.fire.check.persistence.dataobject.DepartmentDO; +import com.zcloud.fire.check.persistence.mapper.DepartmentMapper; +import com.zcloud.fire.check.persistence.repository.DepartmentRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-10-29 16:03:20 + */ +@Service +@RequiredArgsConstructor +public class DepartmentRepositoryImpl extends BaseRepositoryImpl implements DepartmentRepository { + private final DepartmentMapper departmentMapper; + + + @Override + public List listByCorpinfoId(Long corpinfoId) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("corpinfo_id", corpinfoId); + return list(queryWrapper); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckStandardRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckStandardRepositoryImpl.java new file mode 100644 index 0000000..64d696d --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckStandardRepositoryImpl.java @@ -0,0 +1,54 @@ +package com.zcloud.fire.check.persistence.repository.impl; + +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.repository.common.PageHelper; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.fire.check.domain.model.FireCheckStandardE; +import com.zcloud.fire.check.persistence.dataobject.FireCheckStandardDO; +import com.zcloud.fire.check.persistence.mapper.FireCheckStandardMapper; +import com.zcloud.fire.check.persistence.repository.FireCheckStandardRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-26 10:12:15 + */ +@Service +@RequiredArgsConstructor +public class FireCheckStandardRepositoryImpl extends BaseRepositoryImpl implements FireCheckStandardRepository { + private final FireCheckStandardMapper fireCheckStandardMapper; + + @Override + public PageResponse listPage(Map params) { + IPage iPage = new Query().getPage(params); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + queryWrapper.orderByDesc("create_time"); + IPage result = fireCheckStandardMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public List listAll(Map params) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + queryWrapper.orderByDesc("create_time"); + return fireCheckStandardMapper.selectList(queryWrapper); + } + @Override + public boolean addBatch(List fireCheckStandardDOList) { + saveBatch(fireCheckStandardDOList); + return true; + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireDeviceRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireDeviceRepositoryImpl.java new file mode 100644 index 0000000..7b6870a --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireDeviceRepositoryImpl.java @@ -0,0 +1,100 @@ +package com.zcloud.fire.check.persistence.repository.impl; + +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.jjb.saas.framework.repository.common.PageHelper; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.fire.check.persistence.dataobject.FireDeviceDO; +import com.zcloud.fire.check.persistence.dataobject.FireDeviceStatisticDO; +import com.zcloud.fire.check.persistence.dataobject.FirePointDO; +import com.zcloud.fire.check.persistence.dataobject.FirePointStatisticDO; +import com.zcloud.fire.check.persistence.mapper.FireDeviceMapper; +import com.zcloud.fire.check.persistence.repository.CorpInfoRepository; +import com.zcloud.fire.check.persistence.repository.FireDeviceRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-26 10:12:34 + */ +@Service +@RequiredArgsConstructor +public class FireDeviceRepositoryImpl extends BaseRepositoryImpl implements FireDeviceRepository { + private final FireDeviceMapper fireDeviceMapper; + private final CorpInfoRepository corpInfoRepository; + + @Override + public PageResponse listPage(Map params) { + IPage iPage = new Query().getPage(params); + if (params.get("corpinfoId") != null && StringUtils.isNotEmpty(params.get("corpinfoId").toString())) { + params.put("corpinfoId", params.get("corpinfoId")); + } + else { + if(!corpInfoRepository.isSupper()){ + params.put("corpinfoId", AuthContext.getTenantId()); + } + } + IPage result =fireDeviceMapper.getFireDevicePage(iPage,params); + return PageHelper.pageToResponse(result, result.getRecords()); + } + @Override + public long countByFirePointId(String firePointId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_point_id", firePointId); + return fireDeviceMapper.selectCount(queryWrapper); + } + + @Override + public Map countByFirePointIdIn(List firePointIds) { + List fireDeviceStatisticDOList = fireDeviceMapper.countByFireRegionIdIn(firePointIds); + return fireDeviceStatisticDOList.stream().collect(Collectors.toMap(FireDeviceStatisticDO::getFirePointId, FireDeviceStatisticDO::getFireDeviceCount)); + + } + + @Override + public boolean existsByDeviceCode(String fireDeviceCode) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_device_code", fireDeviceCode); + return fireDeviceMapper.selectCount(queryWrapper) > 0; + } + + @Override + public List getDeviceList() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("corpinfo_id", AuthContext.getTenantId()); + return fireDeviceMapper.selectList(queryWrapper); + } + + @Override + public boolean addBatch(List fireDeviceDOS) { + saveBatch(fireDeviceDOS); + return true; + } + + @Override + public List getAllList(Map params) { + if (params.get("corpinfoId") != null && StringUtils.isNotEmpty(params.get("corpinfoId").toString())) { + params.put("corpinfoId", params.get("corpinfoId")); + } + else { + if(!corpInfoRepository.isSupper()){ + params.put("corpinfoId", AuthContext.getTenantId()); + } + } + List result =fireDeviceMapper.getAllList(params); + return result; + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FirePointRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FirePointRepositoryImpl.java new file mode 100644 index 0000000..f6fee89 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FirePointRepositoryImpl.java @@ -0,0 +1,99 @@ +package com.zcloud.fire.check.persistence.repository.impl; + +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.jjb.saas.framework.repository.common.PageHelper; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.fire.check.persistence.dataobject.FirePointDO; +import com.zcloud.fire.check.persistence.dataobject.FirePointStatisticDO; +import com.zcloud.fire.check.persistence.dataobject.FireRegionDO; +import com.zcloud.fire.check.persistence.mapper.FirePointMapper; +import com.zcloud.fire.check.persistence.repository.CorpInfoRepository; +import com.zcloud.fire.check.persistence.repository.FirePointRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-26 10:12:55 + */ +@Service +@RequiredArgsConstructor +public class FirePointRepositoryImpl extends BaseRepositoryImpl implements FirePointRepository { + private final FirePointMapper firePointMapper; + private final CorpInfoRepository corpInfoRepository; + + @Override + public PageResponse listPage(Map params) { + IPage iPage = new Query().getPage(params); + if (params.get("corpinfoId") != null && StringUtils.isNotEmpty(params.get("corpinfoId").toString())) { + params.put("corpinfoId", params.get("corpinfoId")); + } + else { + if(!corpInfoRepository.isSupper()){ + params.put("corpinfoId", AuthContext.getTenantId()); + } + } + IPage result =firePointMapper.getFirePointPage(iPage,params); + + + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public Map countByFireRegionIdIn(List fireRegionIds) { + List firePointStatisticDOList = firePointMapper.countByFireRegionIdIn(fireRegionIds); + return firePointStatisticDOList.stream().collect(Collectors.toMap(FirePointStatisticDO::getFireRegionId, FirePointStatisticDO::getFirePointCount)); + } + + @Override + public long countByFireRegionId(String fireRegionId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_region_id", fireRegionId); + queryWrapper.eq("delete_enum", "FALSE"); + return firePointMapper.selectCount(queryWrapper); + } + + @Override + public void editAllDepartment(List ids, Long departmentId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", ids); + queryWrapper.eq("delete_enum", "FALSE"); + FirePointDO firePointDO = new FirePointDO(); + firePointDO.setDepartmentId(departmentId); + firePointMapper.update(firePointDO, queryWrapper); + } + + @Override + public List listByCorpinfoId(Long corpinfoId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("corpinfo_id", corpinfoId); + return firePointMapper.selectList(queryWrapper); + } + + @Override + public List listByFireRegionId(String fireRegionId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_region_id", fireRegionId); + queryWrapper.eq("corpinfo_id", AuthContext.getTenantId()); + return firePointMapper.selectList(queryWrapper); + } + @Override + public boolean existsByFirePointCode(String firePointCode) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_point_code", firePointCode); + return firePointMapper.selectCount(queryWrapper) > 0; + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireRegionRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireRegionRepositoryImpl.java new file mode 100644 index 0000000..8d7de9e --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireRegionRepositoryImpl.java @@ -0,0 +1,74 @@ +package com.zcloud.fire.check.persistence.repository.impl; + +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.jjb.saas.framework.repository.common.PageHelper; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.fire.check.domain.enums.CommonFlagEnum; +import com.zcloud.fire.check.domain.enums.FireRegionStateEnum; +import com.zcloud.fire.check.domain.model.CorpInfoE; +import com.zcloud.fire.check.persistence.dataobject.FireRegionDO; +import com.zcloud.fire.check.persistence.mapper.FireRegionMapper; +import com.zcloud.fire.check.persistence.repository.CorpInfoRepository; +import com.zcloud.fire.check.persistence.repository.FireRegionRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-26 10:13:10 + */ +@Service +@RequiredArgsConstructor +public class FireRegionRepositoryImpl extends BaseRepositoryImpl implements FireRegionRepository { + private final FireRegionMapper fireRegionMapper; + private final CorpInfoRepository corpInfoRepository; + + @Override + public PageResponse listPage(Map params) { + if (params.get("corpinfoId") != null && StringUtils.isNotEmpty(params.get("corpinfoId").toString())) { + params.put("corpinfoId", params.get("corpinfoId")); + } + else { + if(!corpInfoRepository.isSupper()){ + params.put("corpinfoId", AuthContext.getTenantId()); + } + } + IPage iPage = new Query().getPage(params); + IPage result =fireRegionMapper.getFireRegionPage(iPage,params); + return PageHelper.pageToResponse(result, result.getRecords()); + } + @Override + public void editAllDepartment(List ids, Long departmentId) { + FireRegionDO fireRegionDO = new FireRegionDO(); + fireRegionDO.setDepartmentId(departmentId); + fireRegionMapper.update(fireRegionDO, new QueryWrapper().lambda().in(FireRegionDO::getId, ids).eq(FireRegionDO::getDeleteEnum, "FALSE")); + } + + @Override + public List listByCorpinfoId(Long corpinfoId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("corpinfo_id", corpinfoId); + queryWrapper.eq("state", FireRegionStateEnum.ENABLE.getCode()); + return fireRegionMapper.selectList(queryWrapper); + } + @Override + public boolean existsByFireRegionCode(String fireRegionCode) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_region_code", fireRegionCode); + return fireRegionMapper.selectCount(queryWrapper) > 0; + } + + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/RiskPointRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/RiskPointRepositoryImpl.java deleted file mode 100644 index 06de9be..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/RiskPointRepositoryImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.zcloud.fire.check.persistence.repository.impl; - -import com.alibaba.cola.dto.PageResponse; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jjb.saas.framework.repository.common.PageHelper; -import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; -import com.zcloud.fire.check.persistence.dataobject.RiskPointDO; -import com.zcloud.fire.check.persistence.mapper.RiskPointMapper; -import com.zcloud.fire.check.persistence.repository.RiskPointRepository; -import com.zcloud.fire.check.utils.PageQueryHelper; -import com.zcloud.fire.check.utils.Query; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * @author lin - */ -@Service -@RequiredArgsConstructor -public class RiskPointRepositoryImpl extends BaseRepositoryImpl implements RiskPointRepository { - private final RiskPointMapper riskPointMapper; - - @Override - public PageResponse listRiskPointPage(Map parmas) { - IPage iPage = new Query().getPage(parmas); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); - queryWrapper.orderByDesc("create_time"); - IPage result = riskPointMapper.selectPage(iPage, queryWrapper); - return PageHelper.pageToResponse(result, result.getRecords()); - } -} diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/UserRepositoryImpl.java new file mode 100644 index 0000000..c7dc4b0 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/UserRepositoryImpl.java @@ -0,0 +1,30 @@ +package com.zcloud.fire.check.persistence.repository.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.fire.check.persistence.dataobject.UserDO; +import com.zcloud.fire.check.persistence.mapper.UserMapper; +import com.zcloud.fire.check.persistence.repository.UserRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** +* web-infrastructure +* @Author zhangyue +* @Date 2025-11-04 14:07:37 +*/ +@Service +@RequiredArgsConstructor +public class UserRepositoryImpl extends BaseRepositoryImpl implements UserRepository { + private final UserMapper userMapper; + + @Override + public List listByCorpinfoId(Long corpinfoId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("corpinfo_id", corpinfoId); + return list(queryWrapper); + } +} + diff --git a/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml b/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml new file mode 100644 index 0000000..110ceca --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/FireCheckStandardMapper.xml b/web-infrastructure/src/main/resources/mapper/FireCheckStandardMapper.xml new file mode 100644 index 0000000..6ca24b4 --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/FireCheckStandardMapper.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/FireDeviceMapper.xml b/web-infrastructure/src/main/resources/mapper/FireDeviceMapper.xml new file mode 100644 index 0000000..68c3ec6 --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/FireDeviceMapper.xml @@ -0,0 +1,119 @@ + + + + + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/FirePointMapper.xml b/web-infrastructure/src/main/resources/mapper/FirePointMapper.xml new file mode 100644 index 0000000..41c0a52 --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/FirePointMapper.xml @@ -0,0 +1,57 @@ + + + + + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/FireRegionMapper.xml b/web-infrastructure/src/main/resources/mapper/FireRegionMapper.xml new file mode 100644 index 0000000..46deeef --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/FireRegionMapper.xml @@ -0,0 +1,30 @@ + + + + + + + +