diff --git a/pom.xml b/pom.xml index 848a2fb..a1626be 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,23 @@ zcloud_gbscommon 1.0.0-SNAPSHOT + + com.google.zxing + core + 3.5.3 + + + + + com.google.zxing + javase + 3.5.3 + + + net.coobird + thumbnailator + 0.4.19 + diff --git a/start/src/main/resources/nacos.yml b/start/src/main/resources/nacos.yml index 36f10c9..50c072e 100644 --- a/start/src/main/resources/nacos.yml +++ b/start/src/main/resources/nacos.yml @@ -20,7 +20,7 @@ spring: file-extension: yml shared-configs: - config-common.yml - - config-port.yml + # - config-port.yml - config-mq.yml - config-log.yml - config-sdk-server.yml @@ -36,3 +36,5 @@ spring: discovery: server-addr: ${spring.cloud.nacos.config.server-addr} namespace: ${spring.cloud.nacos.config.namespace} +server: + port: 8080 \ No newline at end of file diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckListController.java b/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckListController.java index c713543..e2acf0f 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckListController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckListController.java @@ -38,12 +38,19 @@ public class AppFireCheckListController { public MultiResponse getCheckPointList(@RequestBody CheckPointListQry qry) { return MultiResponse.of(fireCheckListService.getCheckPointList(qry)); } + @ApiOperation("开始检查-校验是否存在器材标准") + @PostMapping("/checkStandard") + public SingleResponse checkStandard(@RequestBody CheckPointListQry qry) { + fireCheckListService.checkStandard(qry); + return SingleResponse.buildSuccess(); + } + @ApiOperation("已打回-获取消防点检检查列表") @PostMapping("/getBackChecKList") public PageResponse getBackChecKList(@RequestBody FireBackCheckListPageQry qry) { return fireCheckListService.getBackChecKList(qry); } - // + @ApiOperation(value = "点检记录首页-点检表查询") @PostMapping("/getCheckListRecord") public PageResponse getCheckListRecord(@RequestBody CheckListRecordPageQry qry) { diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckRecordPointController.java b/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckRecordPointController.java index c4b017d..60e817f 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckRecordPointController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckRecordPointController.java @@ -1,11 +1,10 @@ package com.zcloud.fire.check.app; -import com.alibaba.cola.dto.PageResponse; import com.zcloud.fire.check.api.FireCheckRecordPointServiceI; import com.zcloud.fire.check.dto.AppCheckRecordPointAddCmd; import com.zcloud.fire.check.dto.CheckRecordPointListQry; -import com.zcloud.fire.check.dto.clientobject.FireCheckPointListCO; +import com.zcloud.fire.check.dto.clientobject.AppFireCheckRecordCO; import com.zcloud.fire.check.dto.clientobject.FireCheckRecordPointCO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -36,8 +35,9 @@ public class AppFireCheckRecordPointController { @ApiOperation("获取消防点检记录点位列表(已打回根据状态传入)") @PostMapping("/getCheckRecordPointList") - public PageResponse getCheckRecordPointList(@RequestBody CheckRecordPointListQry qry) { - return fireCheckRecordPointService.getCheckRecordPointList(qry); + public SingleResponse getCheckRecordPointList(@RequestBody CheckRecordPointListQry qry) { + return SingleResponse.of(fireCheckRecordPointService.getCheckRecordPointList(qry)); + } diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListController.java index ec91647..dd5e754 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListController.java @@ -40,6 +40,7 @@ public class FireCheckListController { @ApiOperation("消防点检分页") @PostMapping("/list") + // @PreAuthorize("@pms.hasAnyPermission('xfdjjl')") public PageResponse page(@RequestBody FireCheckListPageQry qry) { return fireCheckListService.listPage(qry); } @@ -87,6 +88,7 @@ public class FireCheckListController { } @ApiOperation("PC端-点位检查记录分页") @PostMapping("/checkListRecordList") + // @PreAuthorize("@pms.hasAnyPermission('dwjcjl')") public PageResponse checkListRecordList(@RequestBody FireCheckListRecordPageQry qry) { return fireCheckListService.checkListRecordList(qry); } diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListItemController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListItemController.java index e9960cc..63f15a7 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListItemController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListItemController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import java.util.ArrayList; @@ -26,6 +27,7 @@ import java.util.ArrayList; * @Author zhaokai * @Date 2025-11-28 10:32:28 */ +@ApiIgnore @Api(tags = "消防点位检查详细表", hidden = true) @RequestMapping("/${application.gateway}/fireCheckListItem") @RestController diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListUserController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListUserController.java index 80f80bf..1265e8d 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListUserController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListUserController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import java.util.ArrayList; @@ -26,6 +27,7 @@ import java.util.ArrayList; * @Author zhaokai * @Date 2025-12-11 15:32:49 */ +@ApiIgnore @Api(tags = "消防点位检查负责人表",hidden = true) @RequestMapping("/${application.gateway}/fireCheckListUser") @RestController diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordController.java index 4614d76..c1569c5 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordController.java @@ -11,6 +11,7 @@ import com.zcloud.fire.check.dto.*; import com.zcloud.fire.check.dto.clientobject.CorpCheckStatisticsCO; import com.zcloud.fire.check.dto.clientobject.CorpStatisticsCO; import com.zcloud.fire.check.dto.clientobject.FireCheckRecordCO; +import com.zcloud.fire.check.dto.clientobject.FireCheckRecordInfoCO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -30,13 +31,6 @@ import org.springframework.web.bind.annotation.*; public class FireCheckRecordController { private final FireCheckRecordServiceI fireCheckRecordService; - @ApiOperation(value = "新增",hidden = true) - @PostMapping("/save") - public SingleResponse add(@Validated @RequestBody FireCheckRecordAddCmd cmd) { - SSOUser ssoUser = AuthContext.getCurrentUser(); - return fireCheckRecordService.add(cmd); - } - @ApiOperation("点位检查记录-检查记录分页") @PostMapping("/list") public PageResponse page(@RequestBody FireCheckRecordPageQry qry) { @@ -45,7 +39,7 @@ public class FireCheckRecordController { @ApiOperation("检查记录详情") @GetMapping("/getInfoById/{id}") - public SingleResponse getInfoById(@PathVariable("id") Long id) { + public SingleResponse getInfoById(@PathVariable("id") Long id) { return SingleResponse.of(fireCheckRecordService.getInfoById(id)); } diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordHiddenController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordHiddenController.java index b92ab04..959038b 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordHiddenController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordHiddenController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import java.util.ArrayList; @@ -26,6 +27,7 @@ import java.util.ArrayList; * @Author zhaokai * @Date 2025-12-12 11:11:15 */ +@ApiIgnore @Api(tags = "消防点位检查记录隐患表",hidden = true) @RequestMapping("/${application.gateway}/fireCheckRecordHidden") @RestController diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordPointController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordPointController.java index 6ca595e..fdbf1c3 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordPointController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordPointController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import java.util.ArrayList; @@ -26,6 +27,7 @@ import java.util.ArrayList; * @Author zhaokai * @Date 2025-12-12 11:10:19 */ +@ApiIgnore @Api(tags = "消防点位检查记录点位表",hidden = true) @RequestMapping("/${application.gateway}/fireCheckRecordPoint") @RestController diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordUserController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordUserController.java index 42eba1f..fa06baa 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordUserController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordUserController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import java.util.ArrayList; @@ -26,6 +27,7 @@ import java.util.ArrayList; * @Author zhaokai * @Date 2025-12-12 11:12:04 */ +@ApiIgnore @Api(tags = "消防点位检查用户表",hidden = true) @RequestMapping("/${application.gateway}/fireCheckRecordUser") @RestController 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 index d4edc29..ea8fa3a 100644 --- 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 @@ -83,8 +83,7 @@ public class FireCheckStandardController { } @ApiOperation("消防检查标准-导入") @PostMapping("/importFireCheckStandardList") - public Response importFireCheckStandardList(@Validated FireCheckStandardImportCmd fireCheckStandardImportCmd - ) { + public Response importFireCheckStandardList(@Validated FireCheckStandardImportCmd fireCheckStandardImportCmd) { fireCheckStandardService.importFireCheckStandardList(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 index ae6ac92..4c59622 100644 --- 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 @@ -45,6 +45,7 @@ public class FireDeviceController { @ApiOperation("消防器材分页") @PostMapping("/list") + // @PreAuthorize("@pms.hasAnyPermission('xfqc')") public PageResponse page(@RequestBody FireDevicePageQry qry) { return fireDeviceService.listPage(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 index 7b9642e..38919f0 100644 --- 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 @@ -40,6 +40,7 @@ public class FirePointController { @ApiOperation("分页") @PostMapping("/list") + // @PreAuthorize("@pms.hasAnyPermission('xfdw')") public PageResponse page(@RequestBody FirePointPageQry qry) { return firePointService.listPage(qry); } @@ -84,8 +85,8 @@ public class FirePointController { } @ApiOperation("消防点位-导出") @GetMapping("/exportFirePointPage") - public void exportFirePointPage(@RequestParam(value = "ids") Long[] ids, HttpServletResponse httpServletResponse) { - firePointService.exportFirePointPage(ids, httpServletResponse); + public void exportFirePointPage( HttpServletResponse httpServletResponse) { + firePointService.exportFirePointPage(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 index 8eb590f..0850cad 100644 --- 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 @@ -13,6 +13,7 @@ import com.zcloud.fire.check.dto.clientobject.FireRegionCO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -39,6 +40,7 @@ public class FireRegionController { @ApiOperation("消防区域列表分页") @PostMapping("/list") +// @PreAuthorize("@pms.hasAnyPermission('xfqy')") public PageResponse page(@RequestBody FireRegionPageQry qry) { return fireRegionService.listPage(qry); } @@ -83,8 +85,8 @@ public class FireRegionController { } //获取所有消防区域 @ApiOperation("获取所有消防区域") - @PostMapping("/listAll/{corpinfoId}") - public MultiResponse listAll(@PathVariable("corpinfoId") Long corpinfoId) { + @GetMapping("/listAll") + public MultiResponse listAll(@RequestParam(value = "corpinfoId", required = false) Long corpinfoId) { return MultiResponse.of(fireRegionService.listAll(corpinfoId)); } } diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordAddExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordAddExe.java index e3d9873..8297695 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordAddExe.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordAddExe.java @@ -74,7 +74,7 @@ public class FireCheckRecordAddExe { @Transactional(rollbackFor = Exception.class) public FireCheckRecordCO saveCheckRecord(AppCheckRecordAddCmd appCheckRecordAddCmd) { // 检查点位信息 - FireCheckRecordDO fireCheckRecordDO = fireCheckRecordRepository.getChecKRecordInfo(appCheckRecordAddCmd.getFireRecordId()); + FireCheckRecordDO fireCheckRecordDO = fireCheckRecordRepository.getCheckRecordInfoByFireRecordId(appCheckRecordAddCmd.getFireRecordId()); if (fireCheckRecordDO == null) { throw new BizException("检查记录不存在"); } diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordDeviceUpdateExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordDeviceUpdateExe.java index 5c03edd..f0b303b 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordDeviceUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordDeviceUpdateExe.java @@ -1,9 +1,14 @@ package com.zcloud.fire.check.command; import com.alibaba.cola.exception.BizException; +import com.zcloud.fire.check.domain.enums.CheckFlagEnum; import com.zcloud.fire.check.domain.gateway.FireCheckRecordDeviceGateway; import com.zcloud.fire.check.domain.model.FireCheckRecordDeviceE; import com.zcloud.fire.check.dto.FireCheckRecordDeviceUpdateCmd; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordDeviceDO; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordPointDO; +import com.zcloud.fire.check.persistence.repository.FireCheckRecordDeviceRepository; +import com.zcloud.fire.check.persistence.repository.FireCheckRecordPointRepository; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -20,15 +25,27 @@ import org.springframework.transaction.annotation.Transactional; @AllArgsConstructor public class FireCheckRecordDeviceUpdateExe { private final FireCheckRecordDeviceGateway fireCheckRecordDeviceGateway; + private final FireCheckRecordDeviceRepository fireCheckRecordDeviceRepository; + private final FireCheckRecordPointRepository fireCheckRecordPointRepository; @Transactional(rollbackFor = Exception.class) public void execute(FireCheckRecordDeviceUpdateCmd fireCheckRecordDeviceUpdateCmd) { + FireCheckRecordDeviceDO info = fireCheckRecordDeviceRepository.getById(fireCheckRecordDeviceUpdateCmd.getId()); + if (info == null) { + throw new BizException("数据不存在"); + } FireCheckRecordDeviceE fireCheckRecordDeviceE = new FireCheckRecordDeviceE(); BeanUtils.copyProperties(fireCheckRecordDeviceUpdateCmd, fireCheckRecordDeviceE); boolean res = fireCheckRecordDeviceGateway.update(fireCheckRecordDeviceE); if (!res) { throw new BizException("修改失败"); } + //将对应的point置检查状态改为未检查 + FireCheckRecordPointDO pointInfo = new FireCheckRecordPointDO(); + pointInfo.setFireRecordPointId(info.getFireRecordPointId()); + pointInfo.setCheckedFlag(CheckFlagEnum.CHECK_FLAG_BACK.getCode()); + + fireCheckRecordPointRepository.updateCheckFlag(pointInfo); } } diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordPointAddExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordPointAddExe.java index 0135aa8..3bb13e4 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordPointAddExe.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordPointAddExe.java @@ -15,10 +15,7 @@ import com.zcloud.fire.check.dto.AppCheckRecordPointAddCmd; import com.zcloud.fire.check.dto.FireCheckRecordDeviceAddCmd; import com.zcloud.fire.check.dto.FireCheckRecordPointAddCmd; import com.zcloud.fire.check.dto.clientobject.FireCheckRecordPointCO; -import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordDeviceDO; -import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordHiddenDO; -import com.zcloud.fire.check.persistence.dataobject.FireDeviceDO; -import com.zcloud.fire.check.persistence.dataobject.FirePointDO; +import com.zcloud.fire.check.persistence.dataobject.*; import com.zcloud.fire.check.persistence.repository.*; import com.zcloud.gbscommon.zcloudhidden.face.ZcloudHiddenFacade; import com.zcloud.gbscommon.zcloudhidden.request.HiddenAddCmd; @@ -54,6 +51,7 @@ public class FireCheckRecordPointAddExe { private final FireCheckRecordDeviceRepository fireCheckRecordDeviceRepository; private final FireCheckRecordHiddenGateway fireCheckRecordHiddenGateway; private final FireCheckRecordHiddenRepository fireCheckRecordHiddenRepository; + private final FireCheckStandardRepository fireCheckStandardRepository; @DubboReference private ZcloudHiddenFacade zcloudHiddenFacade; @@ -115,6 +113,16 @@ public class FireCheckRecordPointAddExe { } //根据消防设备id查询消防设备信息 Map fireDeviceDOMap = fireDeviceDOList.stream().collect(Collectors.toMap(FireDeviceDO::getFireDeviceId, Function.identity())); + //获取所有的设备类型 + List fireDeviceTypeList = fireDeviceDOList.stream().map(FireDeviceDO::getFireDeviceType).distinct().collect(Collectors.toList()); + + List fireCheckStandardDOList = fireCheckStandardRepository.getCheckStandardList(fireDeviceTypeList); + + Map> fireCheckListItemStatisticDOMap = fireCheckStandardDOList.stream() + .collect(Collectors.groupingBy( + FireCheckStandardDO::getFireDeviceType, + Collectors.mapping(FireCheckStandardDO::getFireCheckStandardItem, Collectors.toList()) + )); appCheckRecordPointAddCmd.getFireCheckRecordDeviceAddCmdList().forEach(fireCheckRecordDeviceAddCmd -> { FireCheckRecordDeviceE fireCheckRecordDeviceE = new FireCheckRecordDeviceE(); @@ -132,6 +140,7 @@ public class FireCheckRecordPointAddExe { fireCheckRecordDeviceE.setLatitude(fireCheckRecordDeviceAddCmd.getLatitude()); fireCheckRecordDeviceE.setNormalFlag(fireCheckRecordDeviceAddCmd.getNormalFlag()); fireCheckRecordDeviceE.setCheckedFlag(CheckFlagEnum.CHECK_FLAG_CHECKED.getCode()); + fireCheckRecordDeviceE.setFireCheckStandardInfo(JSONUtil.toJsonStr(fireCheckListItemStatisticDOMap.get(fireDeviceE.getFireDeviceType()))); fireCheckRecordDeviceGateway.add(fireCheckRecordDeviceE); //有隐患就新增 @@ -150,6 +159,8 @@ public class FireCheckRecordPointAddExe { throw new BizException("消防设备检查信息不存在"); } BeanUtils.copyProperties(fireCheckRecordDeviceAddCmd, fireCheckRecordDeviceE); + fireCheckRecordDeviceE.setFireCheckStandardInfo(JSONUtil.toJsonStr(fireCheckListItemStatisticDOMap.get(fireCheckRecordDeviceDO.getFireDeviceType()))); + fireCheckRecordDeviceGateway.update(fireCheckRecordDeviceE); if(fireCheckRecordDeviceE.getNormalFlag()==null){ //手动更新结果为null,因为有未排查记录的为null @@ -158,16 +169,21 @@ public class FireCheckRecordPointAddExe { //隐患是否更新 FireCheckRecordHiddenDO fireCheckRecordHiddenDO = fireCheckRecordHiddenRepository.listByFireCheckRecordDeviceId(fireCheckRecordDeviceDO.getFireRecordDeviceId()); - if(CheckRecordNormalFlagEnum.NORMAL_FLAG_NOT_NORMAL.getCode().equals(fireCheckRecordDeviceE.getCheckedFlag())){ + if(CheckRecordNormalFlagEnum.NORMAL_FLAG_NOT_NORMAL.getCode().equals(fireCheckRecordDeviceE.getNormalFlag())){ //修改隐患信息 //根据消防设备id查询隐患信息 if(fireCheckRecordHiddenDO==null){ HiddenAddCmd hiddenAddCmd = fireCheckRecordDeviceAddCmd.getHiddenAddCmd(); - fireCheckRecordHiddenGateway.addHidden( fireCheckRecordDeviceE,hiddenAddCmd); + hiddenAddCmd.setForeignKey(fireCheckRecordE.getFireRecordId()); + FireCheckRecordDeviceE fireCheckRecordDeviceEOld = new FireCheckRecordDeviceE(); + BeanUtils.copyProperties(fireCheckRecordDeviceDO, fireCheckRecordDeviceEOld); + fireCheckRecordHiddenGateway.addHidden( fireCheckRecordDeviceEOld,hiddenAddCmd); }else{ FireCheckRecordHiddenE fireCheckRecordHiddenE = new FireCheckRecordHiddenE(); BeanUtils.copyProperties(fireCheckRecordHiddenDO, fireCheckRecordHiddenE); - fireCheckRecordHiddenGateway.updateHidden(fireCheckRecordHiddenE,fireCheckRecordDeviceAddCmd.getHiddenAddCmd()); + HiddenAddCmd hiddenAddCmd = fireCheckRecordDeviceAddCmd.getHiddenAddCmd(); + hiddenAddCmd.setForeignKey(fireCheckRecordE.getFireRecordId()); + fireCheckRecordHiddenGateway.updateHidden(fireCheckRecordHiddenE,hiddenAddCmd); } }else{ //删除隐患 diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckRecordPointCoConvertor.java b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckRecordPointCoConvertor.java index e162928..7bceab9 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckRecordPointCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckRecordPointCoConvertor.java @@ -1,5 +1,6 @@ package com.zcloud.fire.check.command.convertor; +import com.zcloud.fire.check.dto.clientobject.AppRecordFireCheckPointListCO; import com.zcloud.fire.check.dto.clientobject.FireCheckPointListCO; import com.zcloud.fire.check.dto.clientobject.FireCheckRecordPointCO; import com.zcloud.fire.check.persistence.FireCheckPointListDO; @@ -24,5 +25,7 @@ public interface FireCheckRecordPointCoConvertor { List converDOsToCOs(List fireCheckRecordPointDOs); List converDOsToPointCOs(List data); + + List converDOsToAppPointCOs(List fireCheckRecordPointDOList); } diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java index d9b8303..ba65b3d 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java @@ -6,10 +6,7 @@ import com.alibaba.cola.dto.MultiResponse; 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.FireCheckListCoConvertor; -import com.zcloud.fire.check.command.convertor.FireCheckRecordDeviceCoConvertor; -import com.zcloud.fire.check.command.convertor.FireCheckStandardCoConvertor; -import com.zcloud.fire.check.command.convertor.FireDeviceCoConvertor; +import com.zcloud.fire.check.command.convertor.*; import com.zcloud.fire.check.domain.enums.HiddenCheckTypeEnum; import com.zcloud.fire.check.domain.model.FireCheckListE; import com.zcloud.fire.check.dto.*; @@ -58,6 +55,7 @@ public class FireCheckListQueryExe { private final FireCheckRecordDeviceRepository fireCheckRecordDeviceRepository; private final FireCheckRecordDeviceCoConvertor fireCheckRecordDeviceCoConvertor; private final FireCheckRecordHiddenRepository fireCheckRecordHiddenRepository; + private final FireCheckRecordHiddenCoConvertor fireCheckRecordHiddenCoConvertor; @DubboReference private ZcloudHiddenFacade zcloudHiddenFacade; @@ -190,7 +188,7 @@ public class FireCheckListQueryExe { if (CollUtil.isNotEmpty(missingTypes)) { //获取类型名称，逗号分隔 List fireDeviceTypeNameList = missingTypes.stream().map(FireCheckPointListDO::getFireDeviceTypeName).distinct().collect(Collectors.toList()); - throw new BizException("检查设备没有检查标准：" + fireDeviceTypeNameList); + throw new BizException(fireDeviceTypeNameList + "无检查标准,无法检查"); } // 获取检查标准数据 List fireDeviceTypeList = fireCheckPointListDOList.stream().map(FireCheckPointListDO::getFireDeviceType).collect(Collectors.toList()); @@ -226,7 +224,7 @@ public class FireCheckListQueryExe { } } //checkRecordHiddenDOList根据事故id进行分组 - Map> fireCheckRecordHiddenDOMap = fireCheckRecordHiddenDOList.stream().collect(Collectors.groupingBy(FireCheckRecordHiddenDO::getFireDeviceId)); + Map> fireDeviceCheckRecordHiddenDOMap = fireCheckRecordHiddenDOList.stream().collect(Collectors.groupingBy(FireCheckRecordHiddenDO::getFireDeviceId)); // 处理设备类型名和设备编码的聚合显示 @@ -277,7 +275,7 @@ public class FireCheckListQueryExe { } if (finalHiddenListCOMultiResponse !=null && CollUtil.isNotEmpty(finalHiddenListCOMultiResponse.getData())) { List hiddenIds = finalHiddenListCOMultiResponse.getData().stream().map(HiddenListCO::getHiddenId).collect(Collectors.toList()); - List hiddenList = fireCheckRecordHiddenDOMap.get(childNode.getFireDeviceId()); + List hiddenList = fireDeviceCheckRecordHiddenDOMap.get(childNode.getFireDeviceId()); if (CollUtil.isNotEmpty(hiddenList)) { List hiddenIdsInDevice = hiddenList.stream().map(FireCheckRecordHiddenDO::getHiddenId).collect(Collectors.toList()); //如果hiddenIdsInRiskPoint在hiddenIds中，则存在隐患 @@ -307,14 +305,31 @@ public class FireCheckListQueryExe { Map fireCheckRecordPointDOMap = fireCheckRecordPointDOList.stream() .collect(Collectors.toMap(FireCheckRecordPointDO::getFirePointId, Function.identity())); + //获取隐患信息 + //fireCheckRecordHiddenDOList 按照设备id key value对象 + + Map fireCheckRecordHiddenDOMap = fireCheckRecordHiddenDOList.stream() + .collect(Collectors.toMap(FireCheckRecordHiddenDO::getFireRecordDeviceId, Function.identity())); + + result.forEach(fireCheckPointListCO -> { FireCheckRecordPointDO recordPointDO = fireCheckRecordPointDOMap.get(fireCheckPointListCO.getFirePointId()); + fireCheckPointListCO.setFireRecordId(fireCheckRecordDO.getFireRecordId()); if (recordPointDO != null) { fireCheckPointListCO.setFireRecordPointId(recordPointDO.getFireRecordPointId()); - fireCheckPointListCO.setFireRecordId(recordPointDO.getFireRecordId()); + fireCheckPointListCO.setCheckedFlag(recordPointDO.getCheckedFlag()); + fireCheckPointListCO.setId(recordPointDO.getId()); List fireCheckRecordDeviceDOS = checkRecordDeviceMap.get(recordPointDO.getFireRecordPointId()); //转换 List fireCheckPointDeviceListCOList =fireCheckRecordDeviceCoConvertor.converDOsToDeviceCOs(fireCheckRecordDeviceDOS); + //查找是否有隐患信息 + + fireCheckPointDeviceListCOList.forEach(info->{ + FireCheckRecordHiddenDO fireCheckRecordHiddenDO = fireCheckRecordHiddenDOMap.get(info.getFireRecordDeviceId()); + if(fireCheckRecordHiddenDO != null){ + info.setFireCheckRecordHiddenCO(fireCheckRecordHiddenCoConvertor.convertToCO(fireCheckRecordHiddenDO)); + } + }); fireCheckPointListCO.setFireCheckRecordDeviceStatusList(fireCheckPointDeviceListCOList); } }); @@ -444,10 +459,34 @@ public class FireCheckListQueryExe { .collect(Collectors.groupingBy( FireCheckListUserDO::getFireCheckId, Collectors.mapping(FireCheckListUserDO::getUserName, Collectors.joining(",")))); + + //补充检查次数 + List fireCheckRecordStatisticDOList = fireCheckRecordRepository.statisticListByFireCheckIdList(fireCheckIdList); + Map fireCheckListItemStatisticDOMap = fireCheckRecordStatisticDOList.stream().collect(Collectors.toMap(FireCheckRecordStatisticDO::getFireCheckId, FireCheckRecordStatisticDO::getFireCheckCount)); examCenterCOS.forEach(info -> { info.setUserName(fireCheckListUserDONameMap.getOrDefault(info.getFireCheckId(), "")); + info.setCheckCount(fireCheckListItemStatisticDOMap.getOrDefault(info.getFireCheckId(), 0L)); }); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + + public void checkStandard(CheckPointListQry qry) { + + //获取所有的设备检查标准 + List fireCheckStandardDOList = fireCheckStandardRepository.getDeviceStandardList(qry.getFireCheckId()); + if(CollUtil.isEmpty(fireCheckStandardDOList)){ + throw new BizException("请维护点检设备的检查标准"); + } + //获取fireCheckStandardDOList中count未空或者为0的数据，做异常提示 + List fireCheckStandardDOList1 = fireCheckStandardDOList.stream() + .filter(info -> info.getStatisticCount() == null || info.getStatisticCount() == 0).collect(Collectors.toList()); + //fireCheckStandardDOList1获取名字集合做提示 + + if(CollUtil.isNotEmpty(fireCheckStandardDOList1)){ + List fireCheckStandardDOList1NameList = fireCheckStandardDOList1.stream().map(FireCheckStandardStatisticDO::getFireDeviceTypeName).collect(Collectors.toList()); + throw new BizException(fireCheckStandardDOList1NameList + "无检查标准,无法检查"); + } + } } diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordPointQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordPointQueryExe.java index dcf383b..c788c16 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordPointQueryExe.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordPointQueryExe.java @@ -1,23 +1,21 @@ package com.zcloud.fire.check.command.query; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import com.alibaba.cola.dto.PageResponse; import com.alibaba.fastjson.JSON; import com.zcloud.fire.check.command.convertor.FireCheckRecordDeviceCoConvertor; import com.zcloud.fire.check.command.convertor.FireCheckRecordHiddenCoConvertor; import com.zcloud.fire.check.command.convertor.FireCheckRecordPointCoConvertor; +import com.zcloud.fire.check.command.convertor.FireCheckRecordUserCoConvertor; +import com.zcloud.fire.check.domain.enums.HiddenCheckTypeEnum; import com.zcloud.fire.check.dto.CheckPointListQry; import com.zcloud.fire.check.dto.CheckRecordPointListQry; import com.zcloud.fire.check.dto.FireCheckRecordPointPageQry; import com.zcloud.fire.check.dto.clientobject.*; import com.zcloud.fire.check.persistence.FireCheckPointListDO; -import com.zcloud.fire.check.persistence.dataobject.FireCheckListStatisticDO; -import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordDeviceDO; -import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordHiddenDO; -import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordPointDO; -import com.zcloud.fire.check.persistence.repository.FireCheckRecordDeviceRepository; -import com.zcloud.fire.check.persistence.repository.FireCheckRecordHiddenRepository; -import com.zcloud.fire.check.persistence.repository.FireCheckRecordPointRepository; +import com.zcloud.fire.check.persistence.dataobject.*; +import com.zcloud.fire.check.persistence.repository.*; import com.zcloud.gbscommon.utils.PageQueryHelper; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; @@ -43,6 +41,11 @@ public class FireCheckRecordPointQueryExe { private final FireCheckRecordDeviceCoConvertor fireCheckRecordDeviceCoConvertor; private final FireCheckRecordHiddenRepository fireCheckRecordHiddenRepository; private final FireCheckRecordHiddenCoConvertor fireCheckRecordHiddenCoConvertor; + private final FireCheckRecordRepository fireCheckRecordRepository; + + private final FireCheckRecordUserRepository fireCheckRecordUserRepository; + private final FireCheckRecordUserCoConvertor fireCheckRecordUserCoConvertor; + /** * 分页 * @@ -56,22 +59,28 @@ public class FireCheckRecordPointQueryExe { return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } - public PageResponse getCheckRecordPointList(CheckRecordPointListQry qry) { + public AppFireCheckRecordCO getCheckRecordPointList(CheckRecordPointListQry qry) { Map params = PageQueryHelper.toHashMap(qry); - PageResponse pageResponse = fireCheckRecordPointRepository.getCheckRecordPointList(params); - List fireCheckPointListCOList = fireCheckRecordPointCoConvertor.converDOsToPointCOs(pageResponse.getData()); + //查找记录信息 + FireCheckRecordDO fireCheckRecordDO =fireCheckRecordRepository.getCheckRecordInfo(qry.getFireRecordId()); + if(fireCheckRecordDO == null){ + return null; + } + AppFireCheckRecordCO appFireCheckRecordCO = new AppFireCheckRecordCO(); + BeanUtil.copyProperties(fireCheckRecordDO,appFireCheckRecordCO); + + List fireCheckRecordPointDOList = fireCheckRecordPointRepository.getCheckRecordPointList(params); + List fireCheckPointListCOList = fireCheckRecordPointCoConvertor.converDOsToAppPointCOs(fireCheckRecordPointDOList); if(CollUtil.isEmpty(fireCheckPointListCOList)){ - return PageResponse.of(fireCheckPointListCOList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + return appFireCheckRecordCO; } //组装设备信息,fireCheckPointListCOList idlist集合 - - - List idList = fireCheckPointListCOList.stream().map(FireCheckPointListCO::getFireRecordPointId).collect(Collectors.toList()); + List idList = fireCheckPointListCOList.stream().map(AppRecordFireCheckPointListCO::getFireRecordPointId).collect(Collectors.toList()); //idList 获取打回的设备检查项信息 - List fireCheckRecordDeviceDOList = fireCheckRecordDeviceRepository.getBackChecKRecordPoiList(idList); + List fireCheckRecordDeviceDOList = fireCheckRecordDeviceRepository.getBackChecKRecordPoiList(idList,qry.getCheckedFlag()); if(CollUtil.isEmpty(fireCheckRecordDeviceDOList)){ - return PageResponse.of(fireCheckPointListCOList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + return appFireCheckRecordCO; } List fireRecordDeviceIdList = fireCheckRecordDeviceDOList.stream().map(FireCheckRecordDeviceDO::getFireRecordDeviceId).collect(Collectors.toList()); @@ -104,8 +113,20 @@ public class FireCheckRecordPointQueryExe { } }); - - return PageResponse.of(fireCheckPointListCOList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + appFireCheckRecordCO.setFireCheckPointListCOList(fireCheckPointListCOList); + //组装隐患信息 + //补充检查用户信息 + List fireCheckRecordUserDOList =fireCheckRecordUserRepository.getListByFireRecordId(qry.getFireRecordId()); + if(CollUtil.isNotEmpty(fireCheckRecordUserDOList)){ + appFireCheckRecordCO.setFireCheckRecordUserList(fireCheckRecordUserCoConvertor.converDOsToCOs(fireCheckRecordUserDOList)); + } + //补充其他隐患信息 + List< FireCheckRecordHiddenDO> fireCheckRecordHiddenDOOtherList = fireCheckRecordHiddenRepository.getChecKRecordHiddenList(qry.getFireRecordId(), HiddenCheckTypeEnum.OTHER_HIDDEN.getCode()); + if(CollUtil.isNotEmpty(fireCheckRecordHiddenDOOtherList)){ + appFireCheckRecordCO.setFireCheckRecordHiddenList(fireCheckRecordHiddenCoConvertor.converDOsToCOs(fireCheckRecordHiddenDOOtherList)); + } + //组装用户信息 + return appFireCheckRecordCO; } } diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordQueryExe.java index 62d1ec0..84bb1ba 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordQueryExe.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordQueryExe.java @@ -5,6 +5,7 @@ import com.alibaba.cola.dto.PageResponse; import com.zcloud.fire.check.command.convertor.*; import com.zcloud.fire.check.domain.enums.CommonFlagEnum; import com.zcloud.fire.check.domain.enums.CorpTypeEnum; +import com.zcloud.fire.check.domain.enums.HiddenCheckTypeEnum; import com.zcloud.fire.check.domain.enums.UserTypeEnum; import com.zcloud.fire.check.dto.CorpStatisticsPageQry; import com.zcloud.fire.check.dto.FireBackCheckRecordPageQry; @@ -18,6 +19,7 @@ import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -88,21 +90,23 @@ public class FireCheckRecordQueryExe { } - public FireCheckRecordCO getChecKRecordInfo(String fireRecordId) { - FireCheckRecordDO fireCheckRecordDO = fireCheckRecordRepository.getChecKRecordInfo(fireRecordId); + public FireCheckRecordInfoCO getChecKRecordInfo(String fireRecordId) { + FireCheckRecordDO fireCheckRecordDO = fireCheckRecordRepository.getCheckRecordInfo(fireRecordId); if(fireCheckRecordDO == null){ return null; } - FireCheckRecordCO fireCheckRecordCO = new FireCheckRecordCO(); + FireCheckRecordInfoCO fireCheckRecordCO = new FireCheckRecordInfoCO(); BeanUtils.copyProperties(fireCheckRecordDO, fireCheckRecordCO); - //补充检查用户信息 - List fireCheckRecordUserDOList =fireCheckRecordUserRepository.getListByFireRecordId(fireRecordId); - if(CollUtil.isNotEmpty(fireCheckRecordUserDOList)){ - fireCheckRecordCO.setFireCheckRecordUserList(fireCheckRecordUserCoConvertor.converDOsToCOs(fireCheckRecordUserDOList)); + //补充负责人用户信息 + + List listUserByFireCheckIdList = fireCheckListUserRepository.getListUserByFireCheckIdList(Arrays.asList(fireCheckRecordDO.getFireCheckId())); + if(CollUtil.isNotEmpty(listUserByFireCheckIdList)){ + fireCheckRecordCO.setResponsibleUserNameList(listUserByFireCheckIdList.stream().map(FireCheckListUserDO::getUserName).collect(Collectors.joining(","))); } + //补充其他隐患信息 - List< FireCheckRecordHiddenDO> fireCheckRecordHiddenDOList = fireCheckRecordHiddenRepository.getChecKRecordHiddenList(fireRecordId); + List< FireCheckRecordHiddenDO> fireCheckRecordHiddenDOList = fireCheckRecordHiddenRepository.getChecKRecordHiddenList(fireRecordId, HiddenCheckTypeEnum.OTHER_HIDDEN.getCode()); if(CollUtil.isNotEmpty(fireCheckRecordHiddenDOList)){ fireCheckRecordCO.setFireCheckRecordHiddenList(fireCheckRecordHiddenCoConvertor.converDOsToCOs(fireCheckRecordHiddenDOList)); } @@ -131,12 +135,12 @@ public class FireCheckRecordQueryExe { return fireCheckRecordCO; } - public FireCheckRecordCO getInfoById(Long id) { + public FireCheckRecordInfoCO getInfoById(Long id) { FireCheckRecordDO fireCheckRecordDO = fireCheckRecordRepository.getById( id); if(fireCheckRecordDO == null){ return null; } - FireCheckRecordCO checKRecordInfo = getChecKRecordInfo(fireCheckRecordDO.getFireRecordId()); + FireCheckRecordInfoCO checKRecordInfo = getChecKRecordInfo(fireCheckRecordDO.getFireRecordId()); return checKRecordInfo; 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 index 3feac14..0313b09 100644 --- 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 @@ -3,6 +3,7 @@ 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.alibaba.nacos.api.config.annotation.NacosValue; import com.zcloud.fire.check.command.convertor.FirePointCoConvertor; import com.zcloud.fire.check.domain.model.FirePointE; import com.zcloud.fire.check.dto.FirePointPageQry; @@ -37,6 +38,9 @@ public class FirePointQueryExe { private final FirePointCoConvertor firePointCoConvertor; private final FireDeviceRepository fireDeviceRepository; +// @NacosValue("${point:url:prefix}") +// private String pointUrlPrefix; + /** * 分页 * @@ -67,9 +71,9 @@ public class FirePointQueryExe { return firePointCO; } - public void exportFirePointPage(Long[] ids, HttpServletResponse httpServletResponse) { + public void exportFirePointPage(HttpServletResponse httpServletResponse) { FirePointPageQry firePointPageQry = new FirePointPageQry(); - firePointPageQry.setIds(ids); + firePointPageQry.setPageSize(100000); @@ -77,6 +81,7 @@ public class FirePointQueryExe { //TODO 组装二维码 List data = firePointCOPageResponse.getData(); List listManagerStatisticsExcelExportEntityList = firePointCoConvertor.converCOsToExcelEntitys(data); + FirePointE firePointE = new FirePointE(); firePointE.exportFirePointTable(httpServletResponse, listManagerStatisticsExcelExportEntityList); diff --git a/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckListServiceImpl.java b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckListServiceImpl.java index dae899c..8510beb 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckListServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckListServiceImpl.java @@ -106,5 +106,10 @@ public class FireCheckListServiceImpl implements FireCheckListServiceI { public PageResponse getCheckListRecord(CheckListRecordPageQry qry) { return fireCheckListQueryExe.getCheckListRecord(qry); } + + @Override + public void checkStandard(CheckPointListQry qry) { + fireCheckListQueryExe.checkStandard(qry); + } } diff --git a/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckRecordPointServiceImpl.java b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckRecordPointServiceImpl.java index 27c992c..ef937dc 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckRecordPointServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckRecordPointServiceImpl.java @@ -8,6 +8,7 @@ import com.zcloud.fire.check.command.FireCheckRecordPointRemoveExe; import com.zcloud.fire.check.command.FireCheckRecordPointUpdateExe; import com.zcloud.fire.check.command.query.FireCheckRecordPointQueryExe; import com.zcloud.fire.check.dto.*; +import com.zcloud.fire.check.dto.clientobject.AppFireCheckRecordCO; import com.zcloud.fire.check.dto.clientobject.FireCheckPointListCO; import com.zcloud.fire.check.dto.clientobject.FireCheckRecordPointCO; import lombok.AllArgsConstructor; @@ -56,7 +57,7 @@ public class FireCheckRecordPointServiceImpl implements FireCheckRecordPointServ } @Override - public PageResponse getCheckRecordPointList(CheckRecordPointListQry qry) { + public AppFireCheckRecordCO getCheckRecordPointList(CheckRecordPointListQry qry) { return fireCheckRecordPointQueryExe.getCheckRecordPointList(qry); } diff --git a/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckRecordServiceImpl.java b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckRecordServiceImpl.java index b9644da..4dbdcb1 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckRecordServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckRecordServiceImpl.java @@ -59,13 +59,9 @@ public class FireCheckRecordServiceImpl implements FireCheckRecordServiceI { return fireCheckRecordQueryExe.getCheckRecordList(qry); } - @Override - public FireCheckRecordCO getChecKRecordInfo(String fireRecordId) { - return fireCheckRecordQueryExe.getChecKRecordInfo(fireRecordId); - } @Override - public FireCheckRecordCO getInfoById(Long id) { + public FireCheckRecordInfoCO getInfoById(Long id) { return fireCheckRecordQueryExe.getInfoById(id); } 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 index 4efd409..94e4e1e 100644 --- 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 @@ -70,8 +70,8 @@ public class FirePointServiceImpl implements FirePointServiceI { } @Override - public void exportFirePointPage(Long[] ids, HttpServletResponse httpServletResponse) { - firePointQueryExe.exportFirePointPage(ids, httpServletResponse); + public void exportFirePointPage( HttpServletResponse httpServletResponse) { + firePointQueryExe.exportFirePointPage(httpServletResponse); } @Override diff --git a/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckListServiceI.java b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckListServiceI.java index 523c37a..2c29502 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckListServiceI.java +++ b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckListServiceI.java @@ -44,5 +44,7 @@ public interface FireCheckListServiceI { PageResponse checkListRecordList(FireCheckListRecordPageQry qry); PageResponse getCheckListRecord(CheckListRecordPageQry qry); + + void checkStandard(CheckPointListQry qry); } diff --git a/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckRecordPointServiceI.java b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckRecordPointServiceI.java index d04c559..cbd9aa5 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckRecordPointServiceI.java +++ b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckRecordPointServiceI.java @@ -3,6 +3,7 @@ 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.AppFireCheckRecordCO; import com.zcloud.fire.check.dto.clientobject.FireCheckPointListCO; import com.zcloud.fire.check.dto.clientobject.FireCheckRecordPointCO; @@ -23,7 +24,7 @@ public interface FireCheckRecordPointServiceI { void removeBatch(Long[] ids); - PageResponse getCheckRecordPointList(CheckRecordPointListQry qry); + AppFireCheckRecordCO getCheckRecordPointList(CheckRecordPointListQry qry); FireCheckRecordPointCO saveCheckRecordPoint(AppCheckRecordPointAddCmd appCheckRecordPointAddCmd); } diff --git a/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckRecordServiceI.java b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckRecordServiceI.java index 3c09863..60ff813 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckRecordServiceI.java +++ b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckRecordServiceI.java @@ -24,9 +24,8 @@ public interface FireCheckRecordServiceI { PageResponse getCheckRecordList(FireBackCheckRecordPageQry qry); - FireCheckRecordCO getChecKRecordInfo(String fireRecordId); - FireCheckRecordCO getInfoById(Long id); + FireCheckRecordInfoCO getInfoById(Long id); FireCheckRecordCO saveCheckRecord(AppCheckRecordAddCmd appCheckRecordAddCmd); 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 index b82ffa3..9bb607d 100644 --- 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 @@ -32,7 +32,7 @@ public interface FirePointServiceI { void editAllDepartment(FirePointUpdateDepartmentCmd firePointUpdateDepartmentCmd); - void exportFirePointPage(Long[] ids, HttpServletResponse httpServletResponse); + void exportFirePointPage( HttpServletResponse httpServletResponse); MultiResponse listByFireRegionId(String fireRegionId); } diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/AppCheckRecordAddCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/AppCheckRecordAddCmd.java index 00ac4de..6e756b0 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/AppCheckRecordAddCmd.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/AppCheckRecordAddCmd.java @@ -28,7 +28,7 @@ public class AppCheckRecordAddCmd implements Serializable { @ApiModelProperty(value = "检查时间", name = "checkTime", required = true) @NotEmpty(message = "检查时间不能为空") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime checkTime; diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/AppCheckRecordPointAddCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/AppCheckRecordPointAddCmd.java index cacf151..96517a8 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/AppCheckRecordPointAddCmd.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/AppCheckRecordPointAddCmd.java @@ -20,6 +20,10 @@ public class AppCheckRecordPointAddCmd implements Serializable { @ApiModelProperty(value = "消防点位检查主键", name = "id") private Long id; + @ApiModelProperty(value = "业务主键id", name = "fireRecordPointId", required = true) + @NotEmpty(message = "检查点位不能为空") + private String fireRecordPointId; + @ApiModelProperty(value = "检查表id", name = "fireCheckId", required = true) @NotEmpty(message = "检查表id不能为空") private String fireCheckId; diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordDeviceAddCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordDeviceAddCmd.java index 5cb6ac1..0b05581 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordDeviceAddCmd.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordDeviceAddCmd.java @@ -17,14 +17,16 @@ import javax.validation.constraints.NotNull; * @Author zhaokai * @Date 2025-12-12 13:44:34 */ -@EqualsAndHashCode(callSuper = true) @Data @NoArgsConstructor @AllArgsConstructor -public class FireCheckRecordDeviceAddCmd extends Command { +public class FireCheckRecordDeviceAddCmd { @ApiModelProperty(value = "主键", name = "id") private Long id; + @ApiModelProperty(value = "业务主键id") + private String fireRecordDeviceId; + //业务主键id @ApiModelProperty(value = "消防设备id") @NotEmpty(message = "消防设备不能为空") diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordDeviceUpdateCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordDeviceUpdateCmd.java index aa42702..455f912 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordDeviceUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordDeviceUpdateCmd.java @@ -16,11 +16,10 @@ import javax.validation.constraints.NotNull; * @Author zhaokai * @Date 2025-12-12 13:44:35 */ -@EqualsAndHashCode(callSuper = true) @Data @NoArgsConstructor @AllArgsConstructor -public class FireCheckRecordDeviceUpdateCmd extends Command { +public class FireCheckRecordDeviceUpdateCmd { @ApiModelProperty(value = "主键", name = "id", required = true) @NotNull(message = "主键不能为空") private Long id; diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordHiddenPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordHiddenPageQry.java index 78ffea9..dd76afb 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordHiddenPageQry.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordHiddenPageQry.java @@ -23,6 +23,6 @@ public class FireCheckRecordHiddenPageQry extends PageQuery { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - private String likeFireRecordHidedenId; + private String likeFireRecordHiddenId; } diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordHiddenUpdateCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordHiddenUpdateCmd.java index 8ac9bc6..d1b198d 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordHiddenUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordHiddenUpdateCmd.java @@ -24,9 +24,9 @@ public class FireCheckRecordHiddenUpdateCmd extends Command { @ApiModelProperty(value = "主键", name = "id", required = true) @NotNull(message = "主键不能为空") private Long id; - @ApiModelProperty(value = "业务主键id", name = "fireRecordHidedenId", required = true) + @ApiModelProperty(value = "业务主键id", name = "fireRecordHiddenId", required = true) @NotEmpty(message = "业务主键id不能为空") - private String fireRecordHidedenId; + private String fireRecordHiddenId; @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) @NotNull(message = "企业id不能为空") private Long corpinfoId; diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/AppFireCheckRecordCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/AppFireCheckRecordCO.java new file mode 100644 index 0000000..4947a4a --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/AppFireCheckRecordCO.java @@ -0,0 +1,72 @@ +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; +import java.util.List; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-12-12 13:44:24 + */ +@Data +public class AppFireCheckRecordCO { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireRecordId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //检查表id + @ApiModelProperty(value = "检查表id") + private String fireCheckId; + //检查表名字 + @ApiModelProperty(value = "检查表名字") + private String fireCheckName; + //检查表类型 + @ApiModelProperty(value = "检查表类型") + private String fireCheckType; + //检查表类型名称 + @ApiModelProperty(value = "检查表类型名称") + private String fireCheckTypeName; + //检查时间 + @ApiModelProperty(value = "检查时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime checkTime; + //是否完成,0否1是 + @ApiModelProperty(value = "是否完成,0否1是") + private Integer finishedFlag; + //检查周期开始时间 + @ApiModelProperty(value = "检查周期开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime periodStart; + //检查周期结束时间 + @ApiModelProperty(value = "检查周期结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime periodEnd; + //签字url + @ApiModelProperty(value = "签字url") + private String signUrl; + @ApiModelProperty(value = "备注") + private String remarks; + + //消防点检记录用户列表 + @ApiModelProperty(value = "消防点检检查用户列表") + private List fireCheckRecordUserList; + + //消防点检记录隐患列表 + @ApiModelProperty(value = "消防点检记录隐患列表") + private List fireCheckRecordHiddenList; + //检查内容 + private List fireCheckPointListCOList; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/AppRecordFireCheckPointListCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/AppRecordFireCheckPointListCO.java new file mode 100644 index 0000000..ab651c4 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/AppRecordFireCheckPointListCO.java @@ -0,0 +1,87 @@ +package com.zcloud.fire.check.dto.clientobject; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-28 10:32:08 + */ +@Data +public class AppRecordFireCheckPointListCO implements Serializable { + @ApiModelProperty(value = "主键") + private Long id; + /** + * 消防区域名称 + */ + @ApiModelProperty(value = "消防区域名称") + private String fireRegionName; + + /** + * 消防区域编码 + */ + @ApiModelProperty(value = "消防区域编码") + private String fireRegionCode; + + /** + * 消防区域ID + */ + @ApiModelProperty(value = "消防区域ID") + private String fireRegionId; + /** + * 消防设备ID + */ + @ApiModelProperty(value = "消防设备ID") + private String fireDeviceId; + + + + @ApiModelProperty(value = "消防点位名称") + private String firePointName; + + /** + * 消防点位编码 + */ + @ApiModelProperty(value = "消防点位编码") + private String firePointCode; + + /** + * 消防点位ID + */ + @ApiModelProperty(value = "消防点位ID") + private String firePointId; + + /** + * 消防设备编码 + */ + @ApiModelProperty(value = "消防设备编码，多个") + private String fireDeviceCode; + /** + * 消防设备类型名称 + */ + @ApiModelProperty(value = "消防设备类型名称,多个") + private String fireDeviceTypeName; + + @ApiModelProperty(value = "消防设备类型编码") + private String fireDeviceType; + + @ApiModelProperty(value = "已经检查的排查项,设备信息") + private List fireCheckRecordDeviceStatusList; + + + @ApiModelProperty(value = "消防检查ID") + private String fireRecordId; + @ApiModelProperty(value = "消防检查点位ID") + private String fireRecordPointId; + + @ApiModelProperty(value = "是否检查过0已经检查1未检查，2已打回") + private Integer checkedFlag; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/AppStartFireCheckRecordCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/AppStartFireCheckRecordCO.java new file mode 100644 index 0000000..04ca604 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/AppStartFireCheckRecordCO.java @@ -0,0 +1,56 @@ +package com.zcloud.fire.check.dto.clientobject; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-12-12 13:44:24 + */ +@Data +public class AppStartFireCheckRecordCO { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireRecordId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //检查表id + @ApiModelProperty(value = "检查表id") + private String fireCheckId; + //检查表名字 + @ApiModelProperty(value = "检查表名字") + private String fireCheckName; + //检查表类型 + @ApiModelProperty(value = "检查表类型") + private String fireCheckType; + //检查表类型名称 + @ApiModelProperty(value = "检查表类型名称") + private String fireCheckTypeName; + + //是否完成,0否1是 + @ApiModelProperty(value = "是否完成,0否1是") + private Integer finishedFlag; + + + //消防点检记录用户列表 + @ApiModelProperty(value = "消防点检检查用户列表") + private List fireCheckRecordUserList; + + //消防点检记录隐患列表 + @ApiModelProperty(value = "消防点检记录隐患列表") + private List fireCheckRecordHiddenList; + //检查内容 + private List fireCheckPointListCOList; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireBackCheckRecordCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireBackCheckRecordCO.java index ba4da18..b7b7e33 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireBackCheckRecordCO.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireBackCheckRecordCO.java @@ -37,6 +37,7 @@ public class FireBackCheckRecordCO implements Serializable { @ApiModelProperty(value = "检查表类型名称") private String fireCheckTypeName; + //部门id @ApiModelProperty(value = "部门id") private Long departmentId; diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckPointListCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckPointListCO.java index 397bd5a..e5e9f3b 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckPointListCO.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckPointListCO.java @@ -17,6 +17,8 @@ import java.util.List; */ @Data public class FireCheckPointListCO implements Serializable { + @ApiModelProperty(value = "消防点位检查记录id") + private Long id; /** * 消防区域名称 */ diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordCO.java index b580397..28a8ee5 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordCO.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordCO.java @@ -16,7 +16,7 @@ import java.util.List; * @Date 2025-12-12 13:44:24 */ @Data -public class FireCheckRecordCO extends ClientObject { +public class FireCheckRecordCO { //主键 @ApiModelProperty(value = "主键") private Long id; @@ -80,7 +80,8 @@ public class FireCheckRecordCO extends ClientObject { private String remarks; @ApiModelProperty(value = "消防点检检查用户名称逗号分隔") private String userNameList; - @ApiModelProperty(value = "部门") + + @ApiModelProperty(value = "消防点检负责人部门") private String departmentName; //消防点检记录用户列表 @ApiModelProperty(value = "消防点检检查用户列表") diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordDeviceCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordDeviceCO.java index 392e0e4..a18ad02 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordDeviceCO.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordDeviceCO.java @@ -14,7 +14,7 @@ import java.time.LocalDateTime; * @Date 2025-12-12 13:44:34 */ @Data -public class FireCheckRecordDeviceCO extends ClientObject { +public class FireCheckRecordDeviceCO { //主键 @ApiModelProperty(value = "主键") private Long id; diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordHiddenCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordHiddenCO.java index 9403d43..8678876 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordHiddenCO.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordHiddenCO.java @@ -14,22 +14,19 @@ import java.time.LocalDateTime; * @Date 2025-12-12 13:44:43 */ @Data -public class FireCheckRecordHiddenCO extends ClientObject { +public class FireCheckRecordHiddenCO { //主键 @ApiModelProperty(value = "主键") private Long id; //业务主键id @ApiModelProperty(value = "业务主键id") - private String fireRecordHidedenId; + private String fireRecordHiddenId; //企业id @ApiModelProperty(value = "企业id") private Long corpinfoId; //检查表id @ApiModelProperty(value = "检查表id") private String fireCheckId; - //检查详情id - @ApiModelProperty(value = "检查详情id") - private String fireCheckListItemId; //检查记录表id @ApiModelProperty(value = "检查记录表id") private String fireRecordId; @@ -48,41 +45,6 @@ public class FireCheckRecordHiddenCO extends ClientObject { //隐患描述 @ApiModelProperty(value = "隐患描述") private String hiddenDesc; - //乐观锁 - @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/FireCheckRecordInfoCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordInfoCO.java new file mode 100644 index 0000000..c41d34d --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordInfoCO.java @@ -0,0 +1,76 @@ +package com.zcloud.fire.check.dto.clientobject; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-12-12 13:44:24 + */ +@Data +public class FireCheckRecordInfoCO { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireRecordId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //检查表id + @ApiModelProperty(value = "检查表id") + private String fireCheckId; + //检查表名字 + @ApiModelProperty(value = "检查表名字") + private String fireCheckName; + //检查表类型 + @ApiModelProperty(value = "检查表类型") + private String fireCheckType; + //检查表类型名称 + @ApiModelProperty(value = "检查表类型名称") + private String fireCheckTypeName; + //检查时间 + @ApiModelProperty(value = "检查时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime checkTime; + //是否完成,0否1是 + @ApiModelProperty(value = "是否完成,0否1是") + private Integer finishedFlag; + //检查周期开始时间 + @ApiModelProperty(value = "检查周期开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime periodStart; + //检查周期结束时间 + @ApiModelProperty(value = "检查周期结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime periodEnd; + //签字url + @ApiModelProperty(value = "签字url") + private String signUrl; + @ApiModelProperty(value = "备注") + private String remarks; + + @ApiModelProperty(value = "消防点检检查用户名称逗号分隔") + private String userNameList; + @ApiModelProperty(value = "消防点检负责人用户名称逗号分隔") + private String responsibleUserNameList; + + @ApiModelProperty(value = "消防点检负责人部门") + private String departmentName; + + + //消防点检记录隐患列表 + @ApiModelProperty(value = "消防点检记录隐患列表") + private List fireCheckRecordHiddenList; + //检查内容 + private List fireCheckRecordDeviceList; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordUserCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordUserCO.java index 338fbef..732062d 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordUserCO.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordUserCO.java @@ -14,7 +14,7 @@ import java.time.LocalDateTime; * @Date 2025-12-12 13:44:59 */ @Data -public class FireCheckRecordUserCO extends ClientObject { +public class FireCheckRecordUserCO { //主键 @ApiModelProperty(value = "主键") private Long id; @@ -42,41 +42,6 @@ public class FireCheckRecordUserCO extends ClientObject { //人员名称 @ApiModelProperty(value = "人员名称") private String userName; - //乐观锁 - @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 index 8eb1516..772c0c1 100644 --- 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 @@ -17,7 +17,7 @@ import java.util.List; * @Date 2025-11-26 10:12:34 */ @Data -public class FireDeviceCO extends ClientObject { +public class FireDeviceCO { //主键 @ApiModelProperty(value = "主键") private Long id; diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/PointDistributionCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/PointDistributionCO.java index c9a9596..a9e9df2 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/PointDistributionCO.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/PointDistributionCO.java @@ -17,7 +17,7 @@ import java.util.List; public class PointDistributionCO implements Serializable { @ApiModelProperty(value = "企业名称") - private String corpinfoName; + private String corpName; @ApiModelProperty(value = "消防区域名称") private String fireRegionName; @ApiModelProperty(value = "部门名称") diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/ListManagerCheckPeriodEnum.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/ListManagerCheckPeriodEnum.java index b879b70..111548e 100644 --- a/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/ListManagerCheckPeriodEnum.java +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/ListManagerCheckPeriodEnum.java @@ -8,31 +8,31 @@ import lombok.Getter; @Getter public enum ListManagerCheckPeriodEnum { /** 每日 */ - DAILY("每日", "checkPeriod0001"), + DAILY("每日", "fireCheckPeriod0001"), /** 每周 */ - WEEKLY("每周", "checkPeriod0002"), + WEEKLY("每周", "fireCheckPeriod0002"), /** 每旬 */ - TEN_DAYS("每旬", "checkPeriod0003"), + TEN_DAYS("每旬", "fireCheckPeriod0003"), /** 每月 */ - MONTHLY("每月", "checkPeriod0004"), + MONTHLY("每月", "FireCheckPeriod0004"), /** 每季 */ - QUARTERLY("每季", "checkPeriod0005"), + QUARTERLY("每季", "fireCheckPeriod0005"), /** 每年 */ - YEARLY("每年", "checkPeriod0006"), + YEARLY("每年", "fireCheckPeriod0006"), /** 半年 */ - HALF_YEAR("半年", "checkPeriod0007"), + HALF_YEAR("半年", "fireCheckPeriod0007"), /** 半月 */ - HALF_MONTH("半月", "checkPeriod0008"), + HALF_MONTH("半月", "fireCheckPeriod0008"), /** 每周完成N次 */ - WEEKLY_N_TIMES("每周完成N次", "checkPeriod0009"); + WEEKLY_N_TIMES("每周完成N次", "fireCheckPeriod0009"); ; private final String value; private final String code; diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/MenuEnum.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/MenuEnum.java new file mode 100644 index 0000000..9119920 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/MenuEnum.java @@ -0,0 +1,71 @@ +package com.zcloud.fire.check.domain.enums; + +import lombok.Getter; + +import java.util.Arrays; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * 菜单枚举 + */ +@Getter +public enum MenuEnum { + //消防区域 + XFQY("/risk/container/riskControl/branchCompany/riskPoint/list", "xfqy"), + //消防点位 + XFDW("/risk/container/riskControl/branchCompany/identifyPart/list", "xfdw"), + //消防器材 + XFQC("/risk/container/riskControl/branchCompany/riskIedger/list", "xfqc"), + //消防点检记录 + XFDJJL("/risk/container/riskControl/branchCompany/accidentLedger/list", "xfdjjl"), + //点位检查记录 + DWJCJL("/risk/container/hiddenDanger/branchCompany/hazardChecklist/list", "dwjcjl"), + + ; + + private final String path; + private final String menuKey; + + private static final Map PATH_MAP = + Arrays.stream(values()) + .collect(Collectors.toMap(MenuEnum::getPath, Function.identity())); + + MenuEnum(String path, String menuKey) { + this.path = path; + this.menuKey = menuKey; + } + + public String getPath() { + return path; + } + + public String getMenuKey() { + return menuKey; + } + + // 通过name获取枚举 + public static MenuEnum getByPath(String path) { + return PATH_MAP.get(path); + } + + // 通过path获取age + public static String getMenuKeyByPath(String path) { + MenuEnum entry = PATH_MAP.get(path); + return entry != null ? entry.getMenuKey() : null; + } + +// 使用示例 + public static void main(String[] args) { + // 获取整个枚举 + MenuEnum entry = MenuEnum.getByPath("张三"); + if (entry != null) { + System.out.println("MenuKey: " + entry.getMenuKey()); // 输出: MenuKey: 25 + } + + // 直接获取值 + String age = MenuEnum.getMenuKeyByPath("李四"); + System.out.println("李四的年龄: " + age); // 输出: 李四的年龄: 30 + } +} diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckListE.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckListE.java index fbec89b..6f4d4e4 100644 --- a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckListE.java +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckListE.java @@ -131,7 +131,7 @@ public class FireCheckListE extends BaseE { // 每年：年初到年末 LocalDateTime yearStart = todayDate.withMonth(1).withDayOfMonth(1).atStartOfDay(); LocalDateTime yearEnd = todayDate.withMonth(12).withDayOfMonth(31).atTime(23, 59, 59); -// checkRecordInterval.put("checkPeriod0006", new DateTimeE(yearStart, yearEnd)); +// checkRecordInterval.put("fireCheckPeriod0006", new DateTimeE(yearStart, yearEnd)); dateTimeE.setYearlyStartTime(yearStart); dateTimeE.setYearlyEndTime(yearEnd); // 半月：1-15日或16-月末 @@ -221,7 +221,13 @@ public class FireCheckListE extends BaseE { this.periodEnd = todayDate.withDayOfMonth(todayDate.lengthOfMonth()).atTime(23, 59, 59); } break; - + case WEEKLY_N_TIMES: + // 每周：本周一00:00:00到周日23:59:59 + LocalDate mondayN = todayDate.with(java.time.temporal.TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)); + LocalDate sundayN = todayDate.with(java.time.temporal.TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY)); + this.periodStart = mondayN.atStartOfDay(); + this.periodEnd = sundayN.atTime(23, 59, 59); + break; } } } diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckRecordHiddenE.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckRecordHiddenE.java index 0da36b6..a5f0eaf 100644 --- a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckRecordHiddenE.java +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckRecordHiddenE.java @@ -20,13 +20,12 @@ public class FireCheckRecordHiddenE extends BaseE { //主键 private Long id; //业务主键id - private String fireRecordHidedenId; + private String fireRecordHiddenId; //企业id private Long corpinfoId; //检查表id private String fireCheckId; - //检查详情id - private String fireCheckListItemId; + //消防区域主键id private String fireRegionId; //消防点位id 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 index 377d784..29a73c8 100644 --- 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 @@ -2,14 +2,24 @@ package com.zcloud.fire.check.domain.model; import com.alibaba.cola.exception.BizException; import com.baomidou.mybatisplus.annotation.TableField; +import com.google.zxing.BarcodeFormat; +import com.google.zxing.client.j2se.MatrixToImageWriter; +import com.google.zxing.common.BitMatrix; +import com.google.zxing.qrcode.QRCodeWriter; 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 io.swagger.annotations.ApiModelProperty; import lombok.Data; +import net.coobird.thumbnailator.Thumbnails; +import org.apache.commons.lang.StringUtils; +import javax.imageio.ImageIO; import javax.servlet.http.HttpServletResponse; +import java.awt.image.BufferedImage; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.util.Date; @@ -84,10 +94,36 @@ public class FirePointE extends BaseE { //获取当前年月日时分秒字符串 SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); String dateTimeString = sdf.format(new Date()); + listFirePointExcelExportEntityList.forEach(listManagerStatisticsExcelExportEntity -> { + listManagerStatisticsExcelExportEntity.setCheckQrcode(generateQrCodeImage("http://192.168.20.240:9000/qydist/#/firefighting/points")); + listManagerStatisticsExcelExportEntity.setViewQrcode(generateQrCodeImage("http://192.168.20.240:9000/qydist/#/firefighting/points")); + }); ExcelUtils.exportExcel(httpServletResponse, FirePointExcelExportEntity.class,dateTimeString, listFirePointExcelExportEntityList); }catch (Exception e) { throw new BizException("导出失败"); } } + // 生成二维码图片的方法 + public byte[] generateQrCodeImage(String url) { + if (StringUtils.isNotBlank(url)) { + try { + return generateQrCodeBytes(url); + } catch (Exception e) { + return null; + } + } + return null; + } + + // 生成二维码字节数组的方法 + private byte[] generateQrCodeBytes(String content) throws Exception { + QRCodeWriter qrCodeWriter = new QRCodeWriter(); + BitMatrix bitMatrix = qrCodeWriter.encode(content, BarcodeFormat.QR_CODE, 400, 400); + + ByteArrayOutputStream pngOutputStream = new ByteArrayOutputStream(); + MatrixToImageWriter.writeToStream(bitMatrix, "PNG", pngOutputStream); + return pngOutputStream.toByteArray(); + } + } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckRecordGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckRecordGatewayImpl.java index 6bee396..bbe9779 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckRecordGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckRecordGatewayImpl.java @@ -65,7 +65,7 @@ public class FireCheckRecordGatewayImpl implements FireCheckRecordGateway { @Override public FireCheckRecordE initCheckRecord(String fireCheckId, String fireRecordId) { - FireCheckRecordDO fireCheckRecordDO = fireCheckRecordRepository.getChecKRecordInfo(fireRecordId); + FireCheckRecordDO fireCheckRecordDO = fireCheckRecordRepository.getCheckRecordInfoByFireRecordId(fireRecordId); FireCheckRecordE fireCheckRecordE = new FireCheckRecordE(); if(fireCheckRecordDO == null){ FireCheckListDO fireCheckListDO = fireCheckListRepository.getInfoByUUIdState(fireCheckId, FireCheckListStateEnum.ENABLE.getCode()); diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckRecordHiddenGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckRecordHiddenGatewayImpl.java index 68910a8..de0bfee 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckRecordHiddenGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckRecordHiddenGatewayImpl.java @@ -28,8 +28,8 @@ public class FireCheckRecordHiddenGatewayImpl implements FireCheckRecordHiddenGa @Override public Boolean add(FireCheckRecordHiddenE fireCheckRecordHiddenE) { - if(StringUtils.isEmpty(fireCheckRecordHiddenE.getFireRecordHidedenId())){ - fireCheckRecordHiddenE.setFireRecordHidedenId(Tools.get32UUID()); + if(StringUtils.isEmpty(fireCheckRecordHiddenE.getFireRecordHiddenId())){ + fireCheckRecordHiddenE.setFireRecordHiddenId(Tools.get32UUID()); } if(fireCheckRecordHiddenE.getCorpinfoId() == null){ fireCheckRecordHiddenE.setCorpinfoId(AuthContext.getTenantId()); @@ -63,8 +63,8 @@ public class FireCheckRecordHiddenGatewayImpl implements FireCheckRecordHiddenGa public void addHidden(FireCheckRecordDeviceE fireCheckRecordDeviceE, HiddenAddCmd hiddenAddCmd) { FireCheckRecordHiddenE fireCheckRecordHiddenE = new FireCheckRecordHiddenE(); fireCheckRecordHiddenE.initFireCheckRecordHidden(fireCheckRecordDeviceE,hiddenAddCmd.getHiddenId(), hiddenAddCmd.getHiddenDesc()); - if(StringUtils.isEmpty(fireCheckRecordHiddenE.getFireRecordHidedenId())){ - fireCheckRecordHiddenE.setFireRecordHidedenId(Tools.get32UUID()); + if(StringUtils.isEmpty(fireCheckRecordHiddenE.getFireRecordHiddenId())){ + fireCheckRecordHiddenE.setFireRecordHiddenId(Tools.get32UUID()); } if(fireCheckRecordHiddenE.getCorpinfoId() == null){ fireCheckRecordHiddenE.setCorpinfoId(AuthContext.getTenantId()); @@ -84,8 +84,8 @@ public class FireCheckRecordHiddenGatewayImpl implements FireCheckRecordHiddenGa @Override public void addOtherHidden(FireCheckRecordHiddenE fireCheckRecordHiddenE, HiddenAddCmd hiddenAddCmd) { - if(StringUtils.isEmpty(fireCheckRecordHiddenE.getFireRecordHidedenId())){ - fireCheckRecordHiddenE.setFireRecordHidedenId(Tools.get32UUID()); + if(StringUtils.isEmpty(fireCheckRecordHiddenE.getFireRecordHiddenId())){ + fireCheckRecordHiddenE.setFireRecordHiddenId(Tools.get32UUID()); } if(fireCheckRecordHiddenE.getCorpinfoId() == null){ fireCheckRecordHiddenE.setCorpinfoId(AuthContext.getTenantId()); diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListDO.java index 885ca1e..bfb72d2 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListDO.java @@ -61,8 +61,13 @@ public class FireCheckListDO extends BaseDO { @TableField(exist = false) private String userName; + //检查次数 @ApiModelProperty(value = "检查次数") @TableField(exist = false) + private Long checkCount; + + @ApiModelProperty(value = "周期内检查次数") + @TableField(exist = false) private String checkCycleCount; public FireCheckListDO(String fireCheckId) { diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordHiddenDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordHiddenDO.java index 27278b3..50adbd6 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordHiddenDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordHiddenDO.java @@ -20,16 +20,13 @@ import lombok.NoArgsConstructor; public class FireCheckRecordHiddenDO extends BaseDO { //业务主键id @ApiModelProperty(value = "业务主键id") - private String fireRecordHidedenId; + private String fireRecordHiddenId; //企业id @ApiModelProperty(value = "企业id") private Long corpinfoId; //检查表id @ApiModelProperty(value = "检查表id") private String fireCheckId; - //检查详情id - @ApiModelProperty(value = "检查详情id") - private String fireCheckListItemId; //消防区域id @ApiModelProperty(value = "消防区域id", name = "fireRegionId", required = true) private String fireRegionId; @@ -58,8 +55,8 @@ public class FireCheckRecordHiddenDO extends BaseDO { @ApiModelProperty(value = "隐患描述") private String hiddenDesc; - public FireCheckRecordHiddenDO(String fireRecordHidedenId) { - this.fireRecordHidedenId = fireRecordHidedenId; + public FireCheckRecordHiddenDO(String fireRecordHiddenId) { + this.fireRecordHiddenId = fireRecordHiddenId; } } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckStandardStatisticDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckStandardStatisticDO.java new file mode 100644 index 0000000..cbc0a0d --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckStandardStatisticDO.java @@ -0,0 +1,38 @@ +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 +public class FireCheckStandardStatisticDO { + + + //消防器材类型 + @ApiModelProperty(value = "消防器材类型") + private String fireDeviceType; + //消防器材类型名称 + @ApiModelProperty(value = "消防器材类型名称") + private String fireDeviceTypeName; + //消防器材名称 + @ApiModelProperty(value = "消防器材名称") + private String deviceName; + //单位名称 + @ApiModelProperty(value = "单位名称") + private String employer; + //检查项 + @ApiModelProperty(value = "检查项统计数量") + private Long statisticCount; + + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/PointDistributionDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/PointDistributionDO.java index f48645d..0b3c9b8 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/PointDistributionDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/PointDistributionDO.java @@ -14,7 +14,7 @@ import java.io.Serializable; @Data public class PointDistributionDO implements Serializable { @ApiModelProperty(value = "企业名称") - private String corpinfoName; + private String corpName; @ApiModelProperty(value = "消防区域名称") private String fireRegionName; @ApiModelProperty(value = "部门名称") diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckRecordMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckRecordMapper.java index 1ccde24..6776301 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckRecordMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckRecordMapper.java @@ -26,5 +26,8 @@ public interface FireCheckRecordMapper extends BaseMapper { List DataStatisticDO(List corpinfoIds); IPage getCheckRecordPageH5(IPage iPage, Map params); + + FireCheckRecordDO getCheckRecordInfo(String fireRecordId); + } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckRecordPointMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckRecordPointMapper.java index a28a202..45419ec 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckRecordPointMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckRecordPointMapper.java @@ -6,6 +6,7 @@ import com.zcloud.fire.check.persistence.FireCheckPointListDO; import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordPointDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; import java.util.Map; /** @@ -17,6 +18,6 @@ import java.util.Map; @Mapper public interface FireCheckRecordPointMapper extends BaseMapper { - IPage getCheckRecordPointList(IPage iPage, Map params); + List getCheckRecordPointList(Map params); } 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 index ef6dbb5..2d6b8a2 100644 --- 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 @@ -2,8 +2,11 @@ package com.zcloud.fire.check.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zcloud.fire.check.persistence.dataobject.FireCheckStandardDO; +import com.zcloud.fire.check.persistence.dataobject.FireCheckStandardStatisticDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * web-infrastructure * @@ -13,5 +16,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface FireCheckStandardMapper extends BaseMapper { + List getDeviceStandardList(String fireCheckId); } 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 index 9ce8422..1818864 100644 --- 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 @@ -23,5 +23,7 @@ public interface FireRegionMapper extends BaseMapper { List countByCorpinfoIds(List corpinfoIds); Long getFireRegionCount(Map params); + + List listByCorpinfoId(Long corpinfoId); } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckListUserRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckListUserRepository.java index dcf9ae2..244e855 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckListUserRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckListUserRepository.java @@ -26,5 +26,6 @@ public interface FireCheckListUserRepository extends BaseRepository getListUserByFireCheckIdList(List fireCheckIdList); + } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordDeviceRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordDeviceRepository.java index e0ecf07..9d3d282 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordDeviceRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordDeviceRepository.java @@ -16,7 +16,7 @@ import java.util.Map; public interface FireCheckRecordDeviceRepository extends BaseRepository { PageResponse listPage(Map params); - List getBackChecKRecordPoiList(List idList); + List getBackChecKRecordPoiList(List idList, Integer checkedFlag); List getCheckRecordDeviceList(String fireRecordId); diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordHiddenRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordHiddenRepository.java index 9dbd173..741cd7e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordHiddenRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordHiddenRepository.java @@ -23,7 +23,7 @@ public interface FireCheckRecordHiddenRepository extends BaseRepository getChecKRecordDeviceList(List fireRecordDeviceIdList); - List getChecKRecordHiddenList(String fireRecordId); + List getChecKRecordHiddenList(String fireRecordId, Integer hiddenCheckType); FireCheckRecordHiddenDO listByFireCheckRecordDeviceId(String fireRecordDeviceId); diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordPointRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordPointRepository.java index 69e008c..14b39de 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordPointRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordPointRepository.java @@ -19,6 +19,8 @@ public interface FireCheckRecordPointRepository extends BaseRepository getInfoByFireCheckRecordId(String fireCheckId); - PageResponse getCheckRecordPointList(Map params); + List getCheckRecordPointList(Map params); + + void updateCheckFlag(FireCheckRecordPointDO pointInfo); } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordRepository.java index 3af472e..180af50 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordRepository.java @@ -22,12 +22,15 @@ public interface FireCheckRecordRepository extends BaseRepository getCheckRecordList(Map params); - FireCheckRecordDO getChecKRecordInfo(String fireRecordId); + FireCheckRecordDO getCheckRecordInfo(String fireRecordId); List statisticListByFireCheckIdList(List fireCheckIdList); List DataStatisticDO(List corpinfoIds); PageResponse getCheckRecordPageH5(Map params); + + FireCheckRecordDO getCheckRecordInfoByFireRecordId(String fireRecordId); + } 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 index 5bfcf59..8cc69ae 100644 --- 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 @@ -4,6 +4,7 @@ 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 com.zcloud.fire.check.persistence.dataobject.FireCheckStandardStatisticDO; import java.util.List; import java.util.Map; @@ -22,5 +23,7 @@ public interface FireCheckStandardRepository extends BaseRepository fireCheckStandardDOList); List getCheckStandardList(List fireDeviceTypeList); + + List getDeviceStandardList(String fireCheckId); } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java index 0c647b1..10d7427 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java @@ -122,7 +122,7 @@ public class FireCheckListRepositoryImpl extends BaseRepositoryImpl getBackChecKRecordPoiList(List idList) { + public List getBackChecKRecordPoiList(List idList,Integer checkedFlag) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("fire_record_point_id", idList); - queryWrapper.eq("checked_flag", FireCheckRecordPointCheckedFlagEnum.REJECTED.getCode()); + if(checkedFlag!=null){ + queryWrapper.eq("checked_flag", checkedFlag); + + } return fireCheckRecordDeviceMapper.selectList(queryWrapper); } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordHiddenRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordHiddenRepositoryImpl.java index efe18ea..ce08414 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordHiddenRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordHiddenRepositoryImpl.java @@ -59,9 +59,12 @@ public class FireCheckRecordHiddenRepositoryImpl extends BaseRepositoryImpl getChecKRecordHiddenList(String fireRecordId) { + public List getChecKRecordHiddenList(String fireRecordId,Integer hiddenCheckType) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("fire_record_id", fireRecordId); + if(hiddenCheckType != null){ + queryWrapper.eq("hidden_check_type", hiddenCheckType); + } return fireCheckRecordHiddenMapper.selectList(queryWrapper); } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordPointRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordPointRepositoryImpl.java index ce916af..f090c44 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordPointRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordPointRepositoryImpl.java @@ -51,10 +51,17 @@ public class FireCheckRecordPointRepositoryImpl extends BaseRepositoryImpl getCheckRecordPointList(Map params) { - IPage iPage = new Query().getPage(params); - IPage result = fireCheckRecordPointMapper.getCheckRecordPointList(iPage, params); - return PageHelper.pageToResponse(result, result.getRecords()); + public List getCheckRecordPointList(Map params) { + List result = fireCheckRecordPointMapper.getCheckRecordPointList(params); + return result; + } + + @Override + public void updateCheckFlag(FireCheckRecordPointDO pointInfo) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_record_point_id", pointInfo.getFireRecordPointId()); + + fireCheckRecordPointMapper.update(pointInfo, queryWrapper); } } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordRepositoryImpl.java index 0100615..eb0e114 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordRepositoryImpl.java @@ -8,7 +8,6 @@ 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.model.CorpInfoE; import com.zcloud.fire.check.persistence.dataobject.DataStatisticDO; import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordDO; import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordStatisticDO; @@ -70,10 +69,10 @@ public class FireCheckRecordRepositoryImpl extends BaseRepositoryImpl result = fireCheckRecordMapper.getCheckRecordList(iPage, params); @@ -81,10 +80,8 @@ public class FireCheckRecordRepositoryImpl extends BaseRepositoryImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("fire_record_id", fireRecordId); - return fireCheckRecordMapper.selectOne(queryWrapper); + public FireCheckRecordDO getCheckRecordInfo(String fireRecordId) { + return fireCheckRecordMapper.getCheckRecordInfo(fireRecordId); } @Override @@ -103,5 +100,14 @@ public class FireCheckRecordRepositoryImpl extends BaseRepositoryImpl result = fireCheckRecordMapper.getCheckRecordPageH5(iPage, params); return PageHelper.pageToResponse(result, result.getRecords()); } + + @Override + public FireCheckRecordDO getCheckRecordInfoByFireRecordId(String fireRecordId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_record_id", fireRecordId); + return fireCheckRecordMapper.selectOne(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 index b69b441..4b00500 100644 --- 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 @@ -7,6 +7,7 @@ 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.dataobject.FireCheckStandardStatisticDO; import com.zcloud.fire.check.persistence.mapper.FireCheckStandardMapper; import com.zcloud.fire.check.persistence.repository.FireCheckStandardRepository; import com.zcloud.gbscommon.utils.PageQueryHelper; @@ -57,5 +58,10 @@ public class FireCheckStandardRepositoryImpl extends BaseRepositoryImpl getDeviceStandardList(String fireCheckId) { + return fireCheckStandardMapper.getDeviceStandardList(fireCheckId); + } } 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 index ffa2821..a809cdd 100644 --- 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 @@ -6,10 +6,7 @@ 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.CorpTypeEnum; -import com.zcloud.fire.check.domain.enums.FireRegionStateEnum; -import com.zcloud.fire.check.domain.enums.UserTypeEnum; +import com.zcloud.fire.check.domain.enums.*; import com.zcloud.fire.check.domain.model.CorpInfoE; import com.zcloud.fire.check.persistence.dataobject.DataStatisticDO; import com.zcloud.fire.check.persistence.dataobject.FireRegionDO; @@ -49,6 +46,11 @@ public class FireRegionRepositoryImpl extends BaseRepositoryImpl iPage = new Query().getPage(params); + /* String menuPerms = ""; + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){ + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); + }*/ + IPage result =fireRegionMapper.getFireRegionPage(iPage,params); return PageHelper.pageToResponse(result, result.getRecords()); } @@ -61,10 +63,7 @@ public class FireRegionRepositoryImpl extends BaseRepositoryImpl listByCorpinfoId(Long corpinfoId) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("corpinfo_id", corpinfoId); - queryWrapper.eq("state", FireRegionStateEnum.ENABLE.getCode()); - return fireRegionMapper.selectList(queryWrapper); + return fireRegionMapper.listByCorpinfoId(corpinfoId); } @Override public boolean existsByFireRegionCode(String fireRegionCode) { @@ -86,5 +85,7 @@ public class FireRegionRepositoryImpl extends BaseRepositoryImpl countByCorpinfoIds(List corpinfoIds) { return fireRegionMapper.countByCorpinfoIds(corpinfoIds); } + + } diff --git a/web-infrastructure/src/main/resources/mapper/FireCheckListItemMapper.xml b/web-infrastructure/src/main/resources/mapper/FireCheckListItemMapper.xml index b96c41d..2ae2be7 100644 --- a/web-infrastructure/src/main/resources/mapper/FireCheckListItemMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/FireCheckListItemMapper.xml @@ -5,7 +5,7 @@ + + + diff --git a/web-infrastructure/src/main/resources/mapper/FireCheckRecordPointMapper.xml b/web-infrastructure/src/main/resources/mapper/FireCheckRecordPointMapper.xml index f4290f8..7dda293 100644 --- a/web-infrastructure/src/main/resources/mapper/FireCheckRecordPointMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/FireCheckRecordPointMapper.xml @@ -5,8 +5,8 @@ diff --git a/web-infrastructure/src/main/resources/mapper/FireCheckStandardMapper.xml b/web-infrastructure/src/main/resources/mapper/FireCheckStandardMapper.xml index 6ca24b4..5c3c067 100644 --- a/web-infrastructure/src/main/resources/mapper/FireCheckStandardMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/FireCheckStandardMapper.xml @@ -3,6 +3,15 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/web-infrastructure/src/main/resources/mapper/FireDeviceMapper.xml b/web-infrastructure/src/main/resources/mapper/FireDeviceMapper.xml index fee2ac5..332cc66 100644 --- a/web-infrastructure/src/main/resources/mapper/FireDeviceMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/FireDeviceMapper.xml @@ -161,7 +161,7 @@ WHERE d.delete_enum = 'false' and d.fire_point_id = #{firePointId} +