From b25e5954a2226e14b15753eb4deccf292a212150 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Wed, 4 Feb 2026 09:38:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E9=98=B2=E6=A3=80=E6=9F=A5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- start/src/main/resources/nacos.yml | 4 +- .../web/FireCheckStandardController.java | 2 +- .../fire/check/web/FireDeviceController.java | 2 +- .../fire/check/web/FirePointController.java | 2 +- .../fire/check/command/FireDeviceAddExe.java | 4 ++ .../fire/check/command/FirePointAddExe.java | 5 ++ .../command/query/FireCheckListQueryExe.java | 21 +++++++ .../query/FireCheckRecordQueryExe.java | 19 +++++++ .../command/query/FireDeviceQueryExe.java | 29 +++++++++- .../command/query/FirePointQueryExe.java | 46 +++++++++++++-- .../check/service/FireDeviceServiceImpl.java | 5 +- .../fire/check/api/FireDeviceServiceI.java | 1 + .../fire/check/dto/FireCheckListPageQry.java | 4 ++ .../check/dto/FireCheckListRecordPageQry.java | 6 ++ .../dto/FireCheckRecordDeviceAddCmd.java | 4 +- .../check/dto/FireCheckStandardPageQry.java | 3 + .../fire/check/dto/FireDeviceAddCmd.java | 9 +-- .../fire/check/dto/FireDevicePageQry.java | 2 +- .../fire/check/dto/FireDeviceUpdateCmd.java | 9 +-- .../fire/check/dto/FireRegionUpdateCmd.java | 3 +- .../dto/clientobject/FireCheckListCO.java | 3 + .../dto/clientobject/FireCheckListUserCO.java | 40 +------------ .../FireCheckPointDeviceListCO.java | 4 +- .../dto/clientobject/FireCheckRecordCO.java | 7 +++ .../clientobject/FireCheckRecordDeviceCO.java | 4 +- .../clientobject/FireCheckRecordInfoCO.java | 2 + .../check/dto/clientobject/FireDeviceCO.java | 11 ++-- .../check/dto/clientobject/FirePointCO.java | 3 + .../fire/check/domain/config/PointConfig.java | 15 +++++ .../domain/model/FireCheckRecordDeviceE.java | 2 +- .../fire/check/domain/model/FireDeviceE.java | 10 ++-- .../fire/check/domain/model/FirePointE.java | 10 +++- .../dataobject/FireCheckListUserDO.java | 3 + .../dataobject/FireCheckRecordDO.java | 9 --- .../dataobject/FireCheckRecordDeviceDO.java | 4 +- .../persistence/dataobject/FireDeviceDO.java | 8 ++- .../mapper/FireCheckListUserMapper.java | 2 + .../mapper/FireCheckRecordPointMapper.java | 4 ++ .../persistence/mapper/FireDeviceMapper.java | 2 + .../FireCheckListUserRepository.java | 1 + .../FireCheckRecordPointRepository.java | 4 ++ .../repository/FireDeviceRepository.java | 2 + .../repository/FireRegionRepository.java | 2 + .../impl/FireCheckListUserRepositoryImpl.java | 6 ++ .../FireCheckRecordPointRepositoryImpl.java | 10 ++++ .../impl/FireDeviceRepositoryImpl.java | 8 +++ .../impl/FireRegionRepositoryImpl.java | 10 +++- .../resources/mapper/FireCheckListMapper.xml | 22 +++++-- .../mapper/FireCheckListUserMapper.xml | 14 ++++- .../mapper/FireCheckRecordMapper.xml | 6 +- .../mapper/FireCheckRecordPointMapper.xml | 24 ++++++++ .../resources/mapper/FireDeviceMapper.xml | 57 ++++++++++++++++++- 52 files changed, 384 insertions(+), 105 deletions(-) create mode 100644 web-domain/src/main/java/com/zcloud/fire/check/domain/config/PointConfig.java diff --git a/start/src/main/resources/nacos.yml b/start/src/main/resources/nacos.yml index 50c072e..36f10c9 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,5 +36,3 @@ 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/web/FireCheckStandardController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckStandardController.java index ea8fa3a..e82f684 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 @@ -69,7 +69,7 @@ public class FireCheckStandardController { } @ApiOperation("消防检查标准-删除多个") - @PostMapping("/remove/ids") + @GetMapping("/remove/ids") public Response removeBatch(@RequestParam Long[] ids) { fireCheckStandardService.removeBatch(ids); 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 4c59622..fdecd50 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 @@ -106,7 +106,7 @@ public class FireDeviceController { @ApiOperation("H5s扫码-点位分布-消防器材分页查询，(H5扫码点位分布可使用)") @PostMapping("/pageByPointId") public PageResponse pageByPointId(@RequestBody FireDevicePageQry qry) { - return fireDeviceService.listPage(qry); + return fireDeviceService.pageByPointId(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 38919f0..a8ca24f 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 @@ -46,7 +46,7 @@ public class FirePointController { } @ApiOperation("根据消防区域获取消防点位所有") - @PostMapping("/listByFireRegionId/{fireRegionId}") + @GetMapping("/listByFireRegionId/{fireRegionId}") public MultiResponse listByFireRegionId(@PathVariable("fireRegionId") String fireRegionId) { return firePointService.listByFireRegionId(fireRegionId); } diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireDeviceAddExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireDeviceAddExe.java index 8bd6e8b..2e6e5bc 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/FireDeviceAddExe.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireDeviceAddExe.java @@ -5,6 +5,7 @@ import com.zcloud.fire.check.domain.gateway.FireDeviceGateway; import com.zcloud.fire.check.domain.model.FireDeviceE; import com.zcloud.fire.check.dto.FireDeviceAddCmd; import com.zcloud.fire.check.persistence.repository.FireDeviceRepository; +import com.zcloud.fire.check.persistence.repository.FireRegionRepository; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -22,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional; public class FireDeviceAddExe { private final FireDeviceGateway fireDeviceGateway; private final FireDeviceRepository fireDeviceRepository; + private final FireRegionRepository fireRegionRepository; @Transactional(rollbackFor = Exception.class) public boolean execute(FireDeviceAddCmd cmd) { @@ -29,6 +31,8 @@ public class FireDeviceAddExe { if (fireDeviceRepository.existsByDeviceCode(cmd.getFireDeviceCode())) { throw new BizException("消防器材编码已存在"); } + //校验区域 + fireRegionRepository.checkRegion(cmd.getFireRegionId()); FireDeviceE fireDeviceE = new FireDeviceE(); BeanUtils.copyProperties(cmd, fireDeviceE); diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FirePointAddExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FirePointAddExe.java index c4e8029..bdd31a7 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/FirePointAddExe.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FirePointAddExe.java @@ -5,6 +5,7 @@ import com.zcloud.fire.check.domain.gateway.FirePointGateway; import com.zcloud.fire.check.domain.model.FirePointE; import com.zcloud.fire.check.dto.FirePointAddCmd; import com.zcloud.fire.check.persistence.repository.FirePointRepository; +import com.zcloud.fire.check.persistence.repository.FireRegionRepository; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -22,6 +23,8 @@ import org.springframework.transaction.annotation.Transactional; public class FirePointAddExe { private final FirePointGateway firePointGateway; private final FirePointRepository firePointRepository; + private final FireRegionRepository fireRegionRepository; + @Transactional(rollbackFor = Exception.class) public boolean execute(FirePointAddCmd cmd) { @@ -29,6 +32,8 @@ public class FirePointAddExe { if (firePointRepository.existsByFirePointCode(cmd.getFirePointCode())) { throw new BizException("点位编码已存在"); } + //校验区域 + fireRegionRepository.checkRegion(cmd.getFireRegionId()); FirePointE firePointE = new FirePointE(); BeanUtils.copyProperties(cmd, firePointE); boolean res = false; 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 ba65b3d..6d982b8 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 @@ -56,6 +56,7 @@ public class FireCheckListQueryExe { private final FireCheckRecordDeviceCoConvertor fireCheckRecordDeviceCoConvertor; private final FireCheckRecordHiddenRepository fireCheckRecordHiddenRepository; private final FireCheckRecordHiddenCoConvertor fireCheckRecordHiddenCoConvertor; + private final FireCheckListUserCoConvertor fireCheckListUserCoConvertor; @DubboReference private ZcloudHiddenFacade zcloudHiddenFacade; @@ -70,6 +71,22 @@ public class FireCheckListQueryExe { Map params = PageQueryHelper.toHashMap(fireCheckListPageQry); PageResponse pageResponse = fireCheckListRepository.listPage(params); List examCenterCOS = fireCheckListCoConvertor.converDOsToCOs(pageResponse.getData()); + //按照负责人搜索的话，需要补充名字 + if(StringUtils.isNotEmpty(fireCheckListPageQry.getUserName())){ + //补充完整的用户负责人 +// examCenterCOS.stream() + List fireCheckIdList = examCenterCOS.stream().map(FireCheckListCO::getFireCheckId).collect(Collectors.toList()); + List fireCheckListUserDOList = fireCheckListUserRepository.getListUserNameByFireCheckIdList(fireCheckIdList); + //fireCheckListUserDOList转换为key value map + Map fireCheckListUserDONameMap = fireCheckListUserDOList.stream() + .collect(Collectors.groupingBy( + FireCheckListUserDO::getFireCheckId, + Collectors.mapping(FireCheckListUserDO::getUserName, Collectors.joining(",")))); + examCenterCOS.forEach(fireCheckListCO->{ + fireCheckListCO.setUserName(fireCheckListUserDONameMap.getOrDefault(fireCheckListCO.getFireCheckId(), "")); + + }); + } return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } @@ -93,6 +110,10 @@ public class FireCheckListQueryExe { List fireDeviceDOList = fireDeviceRepository.getAllList(params); List examCenterCOS = fireDeviceCoConvertor.converDOsToCOs(fireDeviceDOList); fireCheckListCO.setFireDeviceCOList(examCenterCOS); + List fireCheckListUserDOList = fireCheckListUserRepository.getListByFireCheckId(fireCheckListDO.getFireCheckId()); + List fireCheckListUserCOS = fireCheckListUserCoConvertor.converDOsToCOs(fireCheckListUserDOList); + fireCheckListCO.setFireCheckListUserCOList(fireCheckListUserCOS); + return fireCheckListCO; } 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 84bb1ba..c913beb 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 @@ -46,6 +46,8 @@ public class FireCheckRecordQueryExe { private final CorpInfoRepository corpInfoRepository; private final CorpInfoCoConvertor corpInfoCoConvertor; private final FireCheckListUserRepository fireCheckListUserRepository; + private final FireCheckRecordPointRepository fireCheckRecordPointRepository; + /** * 分页 * @@ -103,6 +105,7 @@ public class FireCheckRecordQueryExe { List listUserByFireCheckIdList = fireCheckListUserRepository.getListUserByFireCheckIdList(Arrays.asList(fireCheckRecordDO.getFireCheckId())); if(CollUtil.isNotEmpty(listUserByFireCheckIdList)){ fireCheckRecordCO.setResponsibleUserNameList(listUserByFireCheckIdList.stream().map(FireCheckListUserDO::getUserName).collect(Collectors.joining(","))); + fireCheckRecordCO.setResponsiblePostNameList(listUserByFireCheckIdList.stream().map(FireCheckListUserDO::getPostName).collect(Collectors.joining(","))); } //补充其他隐患信息 @@ -177,6 +180,22 @@ public class FireCheckRecordQueryExe { Map params = PageQueryHelper.toHashMap(qry); PageResponse pageResponse = fireCheckRecordRepository.getCheckRecordPageH5(params); List examCenterCOS = fireCheckRecordCoConvertor.converDOsToCOs(pageResponse.getData()); + //组装点位名称 和区域名称 + List fireCheckRecordIdList = examCenterCOS.stream().map(FireCheckRecordCO::getFireRecordId).collect(Collectors.toList()); + List fireCheckRecordPointDOList =fireCheckRecordPointRepository.getCheckRecordPointListByCheckRecordIds(fireCheckRecordIdList); + //按照fireRecordId进行分组 + Map fireCheckRecordPointDOMap = fireCheckRecordPointDOList.stream() + .collect(Collectors.toMap( + FireCheckRecordPointDO::getFireRecordId, + Function.identity(), + (existing, replacement) -> existing // 保留第一个值，丢弃后续重复项 + )); + + examCenterCOS.forEach(info -> { + info.setFirePointNameList(fireCheckRecordPointDOMap.get(info.getFireRecordId()).getFirePointName()); + info.setFireRegionNameList(fireCheckRecordPointDOMap.get(info.getFireRecordId()).getFireRegionName()); + + }); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } } diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireDeviceQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireDeviceQueryExe.java index c3df8e4..0635ef1 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireDeviceQueryExe.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireDeviceQueryExe.java @@ -107,8 +107,10 @@ public class FireDeviceQueryExe { fireDevicePageQry.setIds(idList); fireDevicePageQry.setPageSize(100000); - PageResponse fireDeviceCOPageResponse = execute(fireDevicePageQry); - List data = fireDeviceCOPageResponse.getData(); + Map params = PageQueryHelper.toHashMap(fireDevicePageQry); + List fireDeviceDOList = fireDeviceRepository.getAllList(params); + List data = fireDeviceCoConvertor.converDOsToCOs(fireDeviceDOList); + List listManagerStatisticsExcelExportEntityList = fireDeviceCoConvertor.converCOsToExcelEntitys(data); FireDeviceE fireDeviceE = new FireDeviceE(); fireDeviceE.exportFireDeviceTable(httpServletResponse, listManagerStatisticsExcelExportEntityList); @@ -208,5 +210,28 @@ public class FireDeviceQueryExe { } + public PageResponse pageByPointId(FireDevicePageQry fireDevicePageQry) { + Map params = PageQueryHelper.toHashMap(fireDevicePageQry); + PageResponse pageResponse = fireDeviceRepository.pageByPointId(params); + if (CollUtil.isEmpty(pageResponse.getData())) { + return PageResponse.of(null, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + List examCenterCOS = fireDeviceCoConvertor.converDOsToCOs(pageResponse.getData()); + //拼接消防器材检查标准，获取list + List fireDeviceTypeList = examCenterCOS.stream().map(FireDeviceCO::getFireDeviceType).collect(Collectors.toList()); + //根据list查询消防器材检查标准 + List fireCheckStandardDOList = fireCheckStandardRepository.getCheckStandardList(fireDeviceTypeList); + if (CollUtil.isNotEmpty(fireCheckStandardDOList)) { + List fireCheckStandardCOList = fireCheckStandardCoConvertor.converDOsToCOs(fireCheckStandardDOList); + Map> fireCheckStandardMap = fireCheckStandardCOList.stream() + .collect(Collectors.groupingBy(FireCheckStandardCO::getFireDeviceType)); + examCenterCOS.forEach(info -> { + info.setFireCheckStandardList(fireCheckStandardMap.get(info.getFireDeviceType())); + }); + } + + + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } } 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 0313b09..429fdb4 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 @@ -1,19 +1,28 @@ package com.zcloud.fire.check.command.query; import cn.hutool.core.collection.CollUtil; +import cn.hutool.json.JSONUtil; 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.config.PointConfig; import com.zcloud.fire.check.domain.model.FirePointE; import com.zcloud.fire.check.dto.FirePointPageQry; import com.zcloud.fire.check.dto.clientobject.FirePointCO; import com.zcloud.fire.check.dto.clientobject.FireRegionCO; import com.zcloud.fire.check.persistence.dataobject.FirePointDO; +import com.zcloud.fire.check.persistence.repository.FireCheckRecordPointRepository; import com.zcloud.fire.check.persistence.repository.FireDeviceRepository; import com.zcloud.fire.check.persistence.repository.FirePointRepository; import com.zcloud.gbscommon.excelEntity.FirePointExcelExportEntity; -import com.zcloud.gbscommon.excelEntity.ListManagerStatisticExcelExportEntity; +import com.zcloud.gbscommon.zcloudimgfiles.facade.ZcloudImgFilesFacade; +import com.zcloud.gbscommon.zcloudimgfiles.request.ZcloudImgFilesQryCmd; +import com.zcloud.gbscommon.zcloudimgfiles.response.ZcloudImgFilesCO; +import lombok.extern.slf4j.Slf4j; +import org.apache.dubbo.config.annotation.DubboReference; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import com.zcloud.gbscommon.utils.PageQueryHelper; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; @@ -22,6 +31,7 @@ import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; @@ -33,14 +43,18 @@ import java.util.stream.Collectors; */ @Component @AllArgsConstructor +@Slf4j public class FirePointQueryExe { private final FirePointRepository firePointRepository; private final FirePointCoConvertor firePointCoConvertor; private final FireDeviceRepository fireDeviceRepository; + private final FireCheckRecordPointRepository fireCheckRecordPointRepository; -// @NacosValue("${point:url:prefix}") -// private String pointUrlPrefix; + @Autowired + private PointConfig pointConfig; + @DubboReference(check = false) + private ZcloudImgFilesFacade zcloudImgFilesFacade; /** * 分页 * @@ -68,6 +82,30 @@ public class FirePointQueryExe { } FirePointCO firePointCO = new FirePointCO(); BeanUtils.copyProperties(firePointDO, firePointCO); + //获取点位检查的最新三个检查点位id + List fireRecordPointIdList = fireCheckRecordPointRepository.getLastThreeRecord(firePointCO.getFirePointId()); + if(CollUtil.isNotEmpty(fireRecordPointIdList)){ + ZcloudImgFilesQryCmd zcloudImgFilesQryCmd = new ZcloudImgFilesQryCmd(); + String[] foreignKeys = fireRecordPointIdList.toArray(new String[0]); + zcloudImgFilesQryCmd.setInForeignKey(foreignKeys); + log.info("调用统一用户获取点位最新图片请求:{}", JSONUtil.toJsonStr(zcloudImgFilesQryCmd)); + try{ + MultiResponse zcloudImgFilesCOs = zcloudImgFilesFacade.listAll(zcloudImgFilesQryCmd); + log.info("调用统一用户获取点位最新图片返回:{}", JSONUtil.toJsonStr(zcloudImgFilesCOs)); + List data = zcloudImgFilesCOs.getData(); + if(CollUtil.isNotEmpty(data)){ + List urlList = data.stream() + .filter(Objects::nonNull) // 过滤掉 null 元素 + .sorted((o1, o2) -> o2.getCreateTime().compareTo(o1.getCreateTime())) + .limit(3) + .map(ZcloudImgFilesCO::getFilePath) + .collect(Collectors.toList()); + firePointCO.setUrlList(urlList); + } + }catch (Exception e){ + log.error("调用统一用户获取点位最新图片异常:", e); + } + } return firePointCO; } @@ -83,7 +121,7 @@ public class FirePointQueryExe { List listManagerStatisticsExcelExportEntityList = firePointCoConvertor.converCOsToExcelEntitys(data); FirePointE firePointE = new FirePointE(); - firePointE.exportFirePointTable(httpServletResponse, listManagerStatisticsExcelExportEntityList); + firePointE.exportFirePointTable(httpServletResponse, listManagerStatisticsExcelExportEntityList,pointConfig.getPrefix() ); } diff --git a/web-app/src/main/java/com/zcloud/fire/check/service/FireDeviceServiceImpl.java b/web-app/src/main/java/com/zcloud/fire/check/service/FireDeviceServiceImpl.java index 25c4b1e..b9a05de 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/service/FireDeviceServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/fire/check/service/FireDeviceServiceImpl.java @@ -84,6 +84,9 @@ public class FireDeviceServiceImpl implements FireDeviceServiceI { return fireDeviceQueryExe.corpStatisticslist(qry); } - + @Override + public PageResponse pageByPointId(FireDevicePageQry qry) { + return fireDeviceQueryExe.pageByPointId(qry); + } } diff --git a/web-client/src/main/java/com/zcloud/fire/check/api/FireDeviceServiceI.java b/web-client/src/main/java/com/zcloud/fire/check/api/FireDeviceServiceI.java index a6d41b4..6bb78c0 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/api/FireDeviceServiceI.java +++ b/web-client/src/main/java/com/zcloud/fire/check/api/FireDeviceServiceI.java @@ -37,5 +37,6 @@ public interface FireDeviceServiceI { PageResponse corpStatisticslist(CorpStatisticsPageQry qry); + PageResponse pageByPointId(FireDevicePageQry qry); } diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListPageQry.java index 9b16e4e..f02e13b 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListPageQry.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListPageQry.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.checkerframework.checker.units.qual.A; +import java.util.List; + /** * web-client @@ -43,5 +45,7 @@ public class FireCheckListPageQry extends PageQuery { @ApiModelProperty(value = "检查状态，1:待检查，2:已检查", name = "checkStatus") private Integer checkStatus; + @ApiModelProperty(value = "点检表状态: 禁用1,启用0, 已删除2", name = "checkStatus") + private List stateList; } diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListRecordPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListRecordPageQry.java index eddd489..33eebef 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListRecordPageQry.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListRecordPageQry.java @@ -4,6 +4,8 @@ import com.alibaba.cola.dto.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * web-client @@ -24,6 +26,8 @@ public class FireCheckListRecordPageQry extends PageQuery { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询，对应SQL的!=操作符 */ + @ApiModelProperty(value = "企业id") + private Long corpinfoId; //消防点位检查表名称 @ApiModelProperty(value = "消防点位检查表名称") private String fireCheckName; @@ -43,5 +47,7 @@ public class FireCheckListRecordPageQry extends PageQuery { @ApiModelProperty(value = "状态(禁用1启用0, 已删除2)", name = "listManagerStatus") private String state; + @ApiModelProperty(value = "点检表状态: 禁用1,启用0, 已删除2", name = "checkStatus") + private List stateList; } 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 0b05581..b025276 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 @@ -35,8 +35,8 @@ public class FireCheckRecordDeviceAddCmd { @ApiModelProperty(value = "是否检查过0已经检查1未检查，2已打回", name = "checkedFlag") private Integer checkedFlag; - @ApiModelProperty(value = "0合格1不合格2不涉及", name = "normalFlag", required = true) - @NotNull(message = "0合格1不合格2不涉及不能为空") + @ApiModelProperty(value = "0合格1不合格", name = "normalFlag", required = true) + @NotNull(message = "0合格1不合格不能为空") private Integer normalFlag; @ApiModelProperty(value = "经度", name = "longitude", required = true) diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckStandardPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckStandardPageQry.java index 6033835..109a31b 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckStandardPageQry.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckStandardPageQry.java @@ -29,5 +29,8 @@ public class FireCheckStandardPageQry extends PageQuery { @ApiModelProperty(value = "消防器材类型", name = "eqFireDeviceType") private String eqFireDeviceType; + @ApiModelProperty(value = "消防器材名称", name = "likeDeviceName") + private String likeDeviceName; + } diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceAddCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceAddCmd.java index f6229b3..94d2f6c 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceAddCmd.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceAddCmd.java @@ -11,6 +11,7 @@ import org.codehaus.jackson.annotate.JsonProperty; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +import java.time.LocalDate; import java.time.LocalDateTime; /** @@ -52,12 +53,12 @@ public class FireDeviceAddCmd extends Command { private String fireDeviceCode; @ApiModelProperty(value = "有效期开始时间", name = "validityStartTime") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime validityStartTime; + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate validityStartTime; @ApiModelProperty(value = "有效期结束时间", name = "validityEndTime") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime validityEndTime; + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate validityEndTime; @ApiModelProperty(value = "存放地点", name = "storageLocation", required = true) @NotEmpty(message = "存放地点不能为空") diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireDevicePageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireDevicePageQry.java index 4ea066c..cabbbfa 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/FireDevicePageQry.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireDevicePageQry.java @@ -27,7 +27,7 @@ public class FireDevicePageQry extends PageQuery { * - `ne`: 不等比较查询，对应SQL的!=操作符 */ @ApiModelProperty(value = "消防器材主键ID", name = "ids",hidden = true) - private List ids; + private List ids; @ApiModelProperty(value = "消防器材类型", name = "fireDeviceType") private String fireDeviceType; diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceUpdateCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceUpdateCmd.java index cf85f46..891e1f0 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceUpdateCmd.java @@ -10,6 +10,7 @@ import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +import java.time.LocalDate; import java.time.LocalDateTime; /** @@ -47,11 +48,11 @@ public class FireDeviceUpdateCmd extends Command { @NotEmpty(message = "器材编号不能为空") private String fireDeviceCode; @ApiModelProperty(value = "有效期开始时间", name = "validityStartTime") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime validityStartTime; + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate validityStartTime; @ApiModelProperty(value = "有效期结束时间", name = "validityEndTime") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime validityEndTime; + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate validityEndTime; @ApiModelProperty(value = "存放地点", name = "storageLocation", required = true) @NotEmpty(message = "存放地点不能为空") private String storageLocation; diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionUpdateCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionUpdateCmd.java index 2e98b5e..b5d91e2 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionUpdateCmd.java @@ -39,7 +39,8 @@ public class FireRegionUpdateCmd extends Command { private Long departmentId; @ApiModelProperty(value = "0启用,1禁用", name = "state") private Integer state; - + @ApiModelProperty(value = "描述") + private String remarks; } diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckListCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckListCO.java index 40e357d..fd64f86 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckListCO.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckListCO.java @@ -81,5 +81,8 @@ public class FireCheckListCO extends ClientObject { //周期检查次数 @ApiModelProperty(value = "周期检查次数") private Long checkCycleCount; + + @ApiModelProperty(value = "检查人员列表") + private List fireCheckListUserCOList; } diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckListUserCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckListUserCO.java index eefe352..6a4761b 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckListUserCO.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckListUserCO.java @@ -4,6 +4,7 @@ import com.alibaba.cola.dto.ClientObject; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.time.LocalDateTime; @@ -14,7 +15,7 @@ import java.time.LocalDateTime; * @Date 2025-12-11 15:32:49 */ @Data -public class FireCheckListUserCO extends ClientObject { +public class FireCheckListUserCO implements Serializable { //主键 @ApiModelProperty(value = "主键") private Long id; @@ -33,41 +34,6 @@ public class FireCheckListUserCO extends ClientObject { //负责人 @ApiModelProperty(value = "负责人") private Long userId; - //乐观锁 - @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/FireCheckPointDeviceListCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckPointDeviceListCO.java index 0ea6862..9a2630e 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckPointDeviceListCO.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckPointDeviceListCO.java @@ -72,8 +72,8 @@ public class FireCheckPointDeviceListCO implements Serializable { private String fireDeviceType; @ApiModelProperty(value = "是否检查过0已经检查1未检查，2已打回") private Integer checkedFlag; - //0合格1不合格2不涉及 - @ApiModelProperty(value = "0合格1不合格2不涉及") + //0合格1不合格 + @ApiModelProperty(value = "0合格1不合格") private Integer normalFlag; //打回原因 @ApiModelProperty(value = "打回原因") 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 28a8ee5..28ae653 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 @@ -1,6 +1,7 @@ package com.zcloud.fire.check.dto.clientobject; import com.alibaba.cola.dto.ClientObject; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -92,5 +93,11 @@ public class FireCheckRecordCO { private List fireCheckRecordHiddenList; //检查内容 private List fireCheckRecordDeviceList; + + @ApiModelProperty(value = "消防点位名称") + private String firePointNameList; + + @ApiModelProperty(value = "消防区域名称") + private String fireRegionNameList; } 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 a18ad02..74391ea 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 @@ -35,8 +35,8 @@ public class FireCheckRecordDeviceCO { //是否检查过0已经检查1未检查，2已打回 @ApiModelProperty(value = "是否检查过0已经检查1未检查，2已打回") private Integer checkedFlag; - //0合格1不合格2不涉及 - @ApiModelProperty(value = "0合格1不合格2不涉及") + //0合格1不合格 + @ApiModelProperty(value = "0合格1不合格") private Integer normalFlag; //打回原因 @ApiModelProperty(value = "打回原因") 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 index c41d34d..dfa6e33 100644 --- 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 @@ -62,6 +62,8 @@ public class FireCheckRecordInfoCO { private String userNameList; @ApiModelProperty(value = "消防点检负责人用户名称逗号分隔") private String responsibleUserNameList; + @ApiModelProperty(value = "消防点检负责人岗位名称逗号分隔") + private String responsiblePostNameList; @ApiModelProperty(value = "消防点检负责人部门") private String departmentName; 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 772c0c1..ba786f7 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 @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; @@ -47,12 +48,12 @@ public class FireDeviceCO { private String fireDeviceCode; //有效期开始时间 @ApiModelProperty(value = "有效期开始时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime validityStartTime; + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate validityStartTime; //有效期结束时间 @ApiModelProperty(value = "有效期结束时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime validityEndTime; + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate validityEndTime; //存放地点 @ApiModelProperty(value = "存放地点") private String storageLocation; @@ -97,6 +98,8 @@ public class FireDeviceCO { //描述 @ApiModelProperty(value = "描述") private String remarks; + @ApiModelProperty(value = "企业名称") + private String corpName; //消防器材检查标准列表 @ApiModelProperty(value = "消防器材检查标准列表") private List fireCheckStandardList; diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FirePointCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FirePointCO.java index 9c454d0..a37b652 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FirePointCO.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FirePointCO.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.time.LocalDateTime; +import java.util.List; /** @@ -80,5 +81,7 @@ public class FirePointCO extends ClientObject { @ApiModelProperty(value = "描述") private String remarks; + @ApiModelProperty(value = "图片地址") + private List urlList; } diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/config/PointConfig.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/config/PointConfig.java new file mode 100644 index 0000000..012f1fe --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/config/PointConfig.java @@ -0,0 +1,15 @@ +package com.zcloud.fire.check.domain.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.stereotype.Component; + +@Component +@ConfigurationProperties(prefix = "point.url") +@RefreshScope +@Data +public class PointConfig { + + private String prefix; +} diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckRecordDeviceE.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckRecordDeviceE.java index 74989e6..e40f69e 100644 --- a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckRecordDeviceE.java +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckRecordDeviceE.java @@ -28,7 +28,7 @@ public class FireCheckRecordDeviceE extends BaseE { private String fireRecordPointId; //是否检查过0已经检查1未检查，2已打回 private Integer checkedFlag; - //0合格1不合格2不涉及 + //0合格1不合格 private Integer normalFlag; //打回原因 private String hitBackTheReason; diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireDeviceE.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireDeviceE.java index bed82aa..245820a 100644 --- a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireDeviceE.java +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireDeviceE.java @@ -54,9 +54,9 @@ public class FireDeviceE extends BaseE { //器材编号 private String fireDeviceCode; //有效期开始时间 - private LocalDateTime validityStartTime; + private LocalDate validityStartTime; //有效期结束时间 - private LocalDateTime validityEndTime; + private LocalDate validityEndTime; //存放地点 private String storageLocation; //乐观锁 @@ -201,8 +201,7 @@ public class FireDeviceE extends BaseE { // 定义输入格式 DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("yyyy年M月d日"); LocalDate date = LocalDate.parse(entity.getValidityStartTime(), inputFormatter); - LocalDateTime dateTime = date.atTime(0, 0, 0); - fireDeviceE.setValidityStartTime(dateTime); + fireDeviceE.setValidityStartTime(date); } catch (DateTimeParseException e) { errList.add("第" + (i + 2) + "行有效期开始时间格式错误"); continue; @@ -215,8 +214,7 @@ public class FireDeviceE extends BaseE { DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("yyyy年M月d日"); // 解析日期并设置时间为00:00:00 LocalDate date = LocalDate.parse(entity.getValidityEndTime(), inputFormatter); - LocalDateTime dateTime = date.atTime(0, 0, 0); - fireDeviceE.setValidityEndTime(dateTime); + fireDeviceE.setValidityEndTime(date); } catch (DateTimeParseException e) { errList.add("第" + (i + 2) + "行有效期结束时间格式错误"); continue; 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 29a73c8..c19a6fd 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 @@ -1,5 +1,6 @@ package com.zcloud.fire.check.domain.model; +import cn.hutool.json.JSONObject; import com.alibaba.cola.exception.BizException; import com.baomidou.mybatisplus.annotation.TableField; import com.google.zxing.BarcodeFormat; @@ -89,14 +90,17 @@ public class FirePointE extends BaseE { } } - public void exportFirePointTable(HttpServletResponse httpServletResponse, List listFirePointExcelExportEntityList) { + public void exportFirePointTable(HttpServletResponse httpServletResponse, List listFirePointExcelExportEntityList,String pointUrlPrefix) { try { //获取当前年月日时分秒字符串 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")); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("firePointId", listManagerStatisticsExcelExportEntity.getFirePointId()); + listManagerStatisticsExcelExportEntity.setCheckQrcode(generateQrCodeImage(jsonObject.toString())); + + listManagerStatisticsExcelExportEntity.setViewQrcode(generateQrCodeImage(pointUrlPrefix+"/Container/QrCode/PartQrCode/List?firePointId="+listManagerStatisticsExcelExportEntity.getFirePointId())); }); ExcelUtils.exportExcel(httpServletResponse, FirePointExcelExportEntity.class,dateTimeString, listFirePointExcelExportEntityList); }catch (Exception e) { diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListUserDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListUserDO.java index deb8d16..55d0be9 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListUserDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListUserDO.java @@ -37,6 +37,9 @@ public class FireCheckListUserDO extends BaseDO { @ApiModelProperty(value = "负责人姓名") @TableField(exist = false) private String userName; + @ApiModelProperty(value = "负责人岗位姓名") + @TableField(exist = false) + private String postName; public FireCheckListUserDO(String fireCheckListUserId) { this.fireCheckListUserId = fireCheckListUserId; diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordDO.java index 357e26f..bd45d54 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordDO.java @@ -55,15 +55,6 @@ public class FireCheckRecordDO extends BaseDO { @ApiModelProperty(value = "签字url") private String signUrl; - @ApiModelProperty(value = "消防点位名称") - @TableField(exist = false) - private String firePointNameList; - - @ApiModelProperty(value = "消防区域名称") - @TableField(exist = false) - private String fireRegionNameList; - - @ApiModelProperty(value = "涉及点位数") @TableField(exist = false) private Integer checkRecordPointCount; diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordDeviceDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordDeviceDO.java index 92d903f..b634029 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordDeviceDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordDeviceDO.java @@ -35,8 +35,8 @@ public class FireCheckRecordDeviceDO extends BaseDO { //是否检查过0已经检查1未检查，2已打回 @ApiModelProperty(value = "是否检查过0已经检查1未检查，2已打回") private Integer checkedFlag; - //0合格1不合格2不涉及 - @ApiModelProperty(value = "0合格1不合格2不涉及") + //0合格1不合格 + @ApiModelProperty(value = "0合格1不合格") private Integer normalFlag; //打回原因 @ApiModelProperty(value = "打回原因") diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireDeviceDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireDeviceDO.java index 077eb8f..e159c6a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireDeviceDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireDeviceDO.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import java.time.LocalDate; import java.time.LocalDateTime; /** @@ -48,10 +49,10 @@ public class FireDeviceDO extends BaseDO { private String fireDeviceCode; //有效期开始时间 @ApiModelProperty(value = "有效期开始时间") - private LocalDateTime validityStartTime; + private LocalDate validityStartTime; //有效期结束时间 @ApiModelProperty(value = "有效期结束时间") - private LocalDateTime validityEndTime; + private LocalDate validityEndTime; //存放地点 @ApiModelProperty(value = "存放地点") private String storageLocation; @@ -82,6 +83,9 @@ public class FireDeviceDO extends BaseDO { @ApiModelProperty(value = "负责人岗位") @TableField(exist = false) private String userPostName; + @ApiModelProperty(value = "企业名称") + @TableField(exist = false) + private String corpName; public FireDeviceDO(String fireDeviceId) { this.fireDeviceId = fireDeviceId; diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListUserMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListUserMapper.java index 33a3eca..5858937 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListUserMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListUserMapper.java @@ -23,5 +23,7 @@ public interface FireCheckListUserMapper extends BaseMapper List getListUserByFireCheckIdList(List fireCheckIdList); + + List getListByFireCheckId(String fireCheckId); } 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 45419ec..5f55c06 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 @@ -19,5 +19,9 @@ import java.util.Map; public interface FireCheckRecordPointMapper extends BaseMapper { List getCheckRecordPointList(Map params); + + List getLastThreeRecord(String firePointId); + + List getCheckRecordPointListByCheckRecordIds(List fireCheckRecordIdList); } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireDeviceMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireDeviceMapper.java index 8b943a3..8e0146f 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireDeviceMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireDeviceMapper.java @@ -33,5 +33,7 @@ public interface FireDeviceMapper extends BaseMapper { List countByCorpinfoIds(List corpinfoIds); Long getFireDeviceCount(Map params); + + IPage pageByPointId(IPage iPage, Map params); } 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 244e855..2561be7 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 @@ -27,5 +27,6 @@ public interface FireCheckListUserRepository extends BaseRepository getListUserByFireCheckIdList(List fireCheckIdList); + List getListByFireCheckId(String fireCheckId); } 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 14b39de..43d5c5a 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 @@ -22,5 +22,9 @@ public interface FireCheckRecordPointRepository extends BaseRepository getCheckRecordPointList(Map params); void updateCheckFlag(FireCheckRecordPointDO pointInfo); + + List getLastThreeRecord(String firePointId); + + List getCheckRecordPointListByCheckRecordIds(List fireCheckRecordIdList); } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireDeviceRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireDeviceRepository.java index 07f2991..db31b18 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireDeviceRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireDeviceRepository.java @@ -37,5 +37,7 @@ public interface FireDeviceRepository extends BaseRepository { List getDeviceListByFirePointId(@NotEmpty(message = "消防点位id不能为空") String firePointId); List countByCorpinfoIds(List corpinfoIds); + + PageResponse pageByPointId(Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireRegionRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireRegionRepository.java index fbf86b2..d9c0bf8 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireRegionRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireRegionRepository.java @@ -28,5 +28,7 @@ public interface FireRegionRepository extends BaseRepository { Long getFireRegionCount(); List countByCorpinfoIds(List corpinfoIds); + + void checkRegion(@NotEmpty(message = "消防区域id不能为空") String fireRegionId); } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListUserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListUserRepositoryImpl.java index 69138ac..6e82d6a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListUserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListUserRepositoryImpl.java @@ -61,5 +61,11 @@ public class FireCheckListUserRepositoryImpl extends BaseRepositoryImpl getListUserByFireCheckIdList(List fireCheckIdList) { return fireCheckListUserMapper.getListUserByFireCheckIdList(fireCheckIdList); } + + @Override + public List getListByFireCheckId(String fireCheckId) { + return fireCheckListUserMapper.getListByFireCheckId(fireCheckId); + + } } 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 f090c44..e729139 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 @@ -63,5 +63,15 @@ public class FireCheckRecordPointRepositoryImpl extends BaseRepositoryImpl getLastThreeRecord(String firePointId) { + return fireCheckRecordPointMapper.getLastThreeRecord(firePointId); + } + + @Override + public List getCheckRecordPointListByCheckRecordIds(List fireCheckRecordIdList) { + return fireCheckRecordPointMapper.getCheckRecordPointListByCheckRecordIds(fireCheckRecordIdList); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireDeviceRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireDeviceRepositoryImpl.java index c5edb8b..57052a8 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireDeviceRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireDeviceRepositoryImpl.java @@ -117,5 +117,13 @@ public class FireDeviceRepositoryImpl extends BaseRepositoryImpl countByCorpinfoIds(List corpinfoIds) { return fireDeviceMapper.countByCorpinfoIds(corpinfoIds); } + + @Override + public PageResponse pageByPointId(Map params) { + IPage iPage = new Query().getPage(params); + + IPage result = fireDeviceMapper.pageByPointId(iPage, params); + return PageHelper.pageToResponse(result, result.getRecords()); + } } 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 a809cdd..7683ac3 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 @@ -86,6 +86,14 @@ public class FireRegionRepositoryImpl extends BaseRepositoryImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_region_id", fireRegionId); + FireRegionDO one = getOne(queryWrapper); + if(CommonFlagEnum.YES.getCode().equals(one.getState())){ + throw new RuntimeException("该区域已禁用"); + } + } } diff --git a/web-infrastructure/src/main/resources/mapper/FireCheckListMapper.xml b/web-infrastructure/src/main/resources/mapper/FireCheckListMapper.xml index 80aede4..c7b1aac 100644 --- a/web-infrastructure/src/main/resources/mapper/FireCheckListMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/FireCheckListMapper.xml @@ -42,6 +42,12 @@ and u.name like CONCAT('%', #{params.userName}, '%') + + and cl.state IN + + #{item} + + group by cl.id ORDER BY cl.create_time DESC @@ -268,6 +274,12 @@ AND cl.state = #{params.state} + + and cl.state IN + + #{item} + + GROUP BY cl.fire_check_id HAVING @@ -275,15 +287,17 @@ - AND (cl.fire_check_type = 'fireCheckPeriod0009' OR checkedCount = 0) + AND (cl.fire_check_type = 'fireCheckPeriod0009' OR checkCycleCount = 0) - AND (cl.fire_check_type = 'fireCheckPeriod0009' OR checkedCount > 0) + AND (cl.fire_check_type = 'fireCheckPeriod0009' OR checkCycleCount > 0) - ORDER BY cl.create_time desc - + ORDER BY CASE + WHEN cl.state=0 THEN 1 + ELSE 2 + END asc, cl.create_time desc select cu.fire_check_list_user_id as fireCheckListUserId, cu.fire_check_id as fireCheckId, - GROUP_CONCAT(DISTINCT u.name) AS userName + GROUP_CONCAT(DISTINCT u.name) AS userName, + GROUP_CONCAT(DISTINCT p.post_name) AS postName from fire_check_list_user cu left join user u on cu.user_id = u.id + left join post p on u.post_id = p.id where cu.delete_enum = 'FALSE' and cu.fire_check_id in #{fireCheckId} @@ -69,5 +71,15 @@ group by cu.fire_check_id + diff --git a/web-infrastructure/src/main/resources/mapper/FireCheckRecordMapper.xml b/web-infrastructure/src/main/resources/mapper/FireCheckRecordMapper.xml index 83219a4..16dbea8 100644 --- a/web-infrastructure/src/main/resources/mapper/FireCheckRecordMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/FireCheckRecordMapper.xml @@ -64,10 +64,8 @@ + + diff --git a/web-infrastructure/src/main/resources/mapper/FireDeviceMapper.xml b/web-infrastructure/src/main/resources/mapper/FireDeviceMapper.xml index 332cc66..b8e16c6 100644 --- a/web-infrastructure/src/main/resources/mapper/FireDeviceMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/FireDeviceMapper.xml @@ -29,7 +29,7 @@ LEFT JOIN user u ON u.id = p.user_id WHERE d.delete_enum = 'false' AND d.corpinfo_id = #{params.corpinfoId} - + AND d.id IN #{id} @@ -82,7 +82,7 @@ left join post po on u.post_id = po.id WHERE d.delete_enum = 'false' AND d.corpinfo_id = #{params.corpinfoId} - + AND d.id IN #{id} @@ -181,5 +181,58 @@ and c.use_flag = 1 and r.delete_enum = 'FALSE' + +