zcloud_gbs
/
zcloud_gbs_fire_check_gwj
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

消防检查app修改

main
zhaokai 2026-01-29 15:43:02 +08:00
parent b79f008952
commit 56a3e093eb
85 changed files with 877 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pom.xml
View File

@ -20,6 +20,23 @@
<artifactId>zcloud_gbscommon</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
<version>3.5.3</version>
</dependency>
<!-- JavaSE扩展（包含图片处理） -->
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId>
<version>3.5.3</version>
</dependency>
<dependency>
<groupId>net.coobird</groupId>
<artifactId>thumbnailator</artifactId>
<version>0.4.19</version>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>

4
start/src/main/resources/nacos.yml
View File

@ -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

9
web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckListController.java
View File

@ -38,12 +38,19 @@ public class AppFireCheckListController {
public MultiResponse<FireCheckPointListCO> getCheckPointList(@RequestBody CheckPointListQry qry) {
return MultiResponse.of(fireCheckListService.getCheckPointList(qry));
}
@ApiOperation("开始检查-校验是否存在器材标准")
@PostMapping("/checkStandard")
public SingleResponse<FireCheckPointListCO> checkStandard(@RequestBody CheckPointListQry qry) {
fireCheckListService.checkStandard(qry);
return SingleResponse.buildSuccess();
}
@ApiOperation("已打回-获取消防点检检查列表")
@PostMapping("/getBackChecKList")
public PageResponse<FireBackCheckListCO> getBackChecKList(@RequestBody FireBackCheckListPageQry qry) {
return fireCheckListService.getBackChecKList(qry);
}
//
@ApiOperation(value = "点检记录首页-点检表查询")
@PostMapping("/getCheckListRecord")
public PageResponse<FireCheckListCO> getCheckListRecord(@RequestBody CheckListRecordPageQry qry) {

8
web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckRecordPointController.java
View File

@ -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<FireCheckPointListCO> getCheckRecordPointList(@RequestBody CheckRecordPointListQry qry) {
return fireCheckRecordPointService.getCheckRecordPointList(qry);
public SingleResponse<AppFireCheckRecordCO> getCheckRecordPointList(@RequestBody CheckRecordPointListQry qry) {
return SingleResponse.of(fireCheckRecordPointService.getCheckRecordPointList(qry));
}

2
web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListController.java
View File

@ -40,6 +40,7 @@ public class FireCheckListController {
@ApiOperation("消防点检分页")
@PostMapping("/list")
// @PreAuthorize("@pms.hasAnyPermission('xfdjjl')")
public PageResponse<FireCheckListCO> 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<FireCheckListCO> checkListRecordList(@RequestBody FireCheckListRecordPageQry qry) {
return fireCheckListService.checkListRecordList(qry);
}

2
web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListItemController.java
View File

@ -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

2
web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListUserController.java
View File

@ -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

10
web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordController.java
View File

@ -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<FireCheckRecordCO> add(@Validated @RequestBody FireCheckRecordAddCmd cmd) {
SSOUser ssoUser = AuthContext.getCurrentUser();
return fireCheckRecordService.add(cmd);
}
@ApiOperation("点位检查记录-检查记录分页")
@PostMapping("/list")
public PageResponse<FireCheckRecordCO> page(@RequestBody FireCheckRecordPageQry qry) {
@ -45,7 +39,7 @@ public class FireCheckRecordController {
@ApiOperation("检查记录详情")
@GetMapping("/getInfoById/{id}")
public SingleResponse<FireCheckRecordCO> getInfoById(@PathVariable("id") Long id) {
public SingleResponse<FireCheckRecordInfoCO> getInfoById(@PathVariable("id") Long id) {
return SingleResponse.of(fireCheckRecordService.getInfoById(id));
}

2
web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordHiddenController.java
View File

@ -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

2
web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordPointController.java
View File

@ -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

2
web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordUserController.java
View File

@ -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

3
web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckStandardController.java
View File

@ -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();
}

1
web-adapter/src/main/java/com/zcloud/fire/check/web/FireDeviceController.java
View File

@ -45,6 +45,7 @@ public class FireDeviceController {
@ApiOperation("消防器材分页")
@PostMapping("/list")
// @PreAuthorize("@pms.hasAnyPermission('xfqc')")
public PageResponse<FireDeviceCO> page(@RequestBody FireDevicePageQry qry) {
return fireDeviceService.listPage(qry);
}

5
web-adapter/src/main/java/com/zcloud/fire/check/web/FirePointController.java
View File

@ -40,6 +40,7 @@ public class FirePointController {
@ApiOperation("分页")
@PostMapping("/list")
// @PreAuthorize("@pms.hasAnyPermission('xfdw')")
public PageResponse<FirePointCO> 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);
}
}

6
web-adapter/src/main/java/com/zcloud/fire/check/web/FireRegionController.java
View File

@ -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<FireRegionCO> page(@RequestBody FireRegionPageQry qry) {
return fireRegionService.listPage(qry);
}
@ -83,8 +85,8 @@ public class FireRegionController {
}
//获取所有消防区域
@ApiOperation("获取所有消防区域")
@PostMapping("/listAll/{corpinfoId}")
public MultiResponse<FireRegionCO> listAll(@PathVariable("corpinfoId") Long corpinfoId) {
@GetMapping("/listAll")
public MultiResponse<FireRegionCO> listAll(@RequestParam(value = "corpinfoId", required = false) Long corpinfoId) {
return MultiResponse.of(fireRegionService.listAll(corpinfoId));
}
}

2
web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordAddExe.java
View File

@ -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("检查记录不存在");
}

17
web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordDeviceUpdateExe.java
View File

@ -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);
}
}

30
web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordPointAddExe.java
View File

@ -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<String, FireDeviceDO> fireDeviceDOMap = fireDeviceDOList.stream().collect(Collectors.toMap(FireDeviceDO::getFireDeviceId, Function.identity()));
//获取所有的设备类型
List<String> fireDeviceTypeList = fireDeviceDOList.stream().map(FireDeviceDO::getFireDeviceType).distinct().collect(Collectors.toList());
List<FireCheckStandardDO> fireCheckStandardDOList = fireCheckStandardRepository.getCheckStandardList(fireDeviceTypeList);
Map<String, List<String>> 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{
//删除隐患

3
web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckRecordPointCoConvertor.java
View File

@ -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<FireCheckRecordPointCO> converDOsToCOs(List<FireCheckRecordPointDO> fireCheckRecordPointDOs);
List<FireCheckPointListCO> converDOsToPointCOs(List<FireCheckRecordPointDO> data);
List<AppRecordFireCheckPointListCO> converDOsToAppPointCOs(List<FireCheckRecordPointDO> fireCheckRecordPointDOList);
}

55
web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java
View File

@ -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<String> fireDeviceTypeNameList = missingTypes.stream().map(FireCheckPointListDO::getFireDeviceTypeName).distinct().collect(Collectors.toList());
throw new BizException("检查设备没有检查标准：" + fireDeviceTypeNameList);
throw new BizException(fireDeviceTypeNameList + "无检查标准,无法检查");
}
// 获取检查标准数据
List<String> fireDeviceTypeList = fireCheckPointListDOList.stream().map(FireCheckPointListDO::getFireDeviceType).collect(Collectors.toList());
@ -226,7 +224,7 @@ public class FireCheckListQueryExe {
}
}
//checkRecordHiddenDOList根据事故id进行分组
Map<String, List<FireCheckRecordHiddenDO>> fireCheckRecordHiddenDOMap = fireCheckRecordHiddenDOList.stream().collect(Collectors.groupingBy(FireCheckRecordHiddenDO::getFireDeviceId));
Map<String, List<FireCheckRecordHiddenDO>> fireDeviceCheckRecordHiddenDOMap = fireCheckRecordHiddenDOList.stream().collect(Collectors.groupingBy(FireCheckRecordHiddenDO::getFireDeviceId));
// 处理设备类型名和设备编码的聚合显示
@ -277,7 +275,7 @@ public class FireCheckListQueryExe {
}
if (finalHiddenListCOMultiResponse !=null && CollUtil.isNotEmpty(finalHiddenListCOMultiResponse.getData())) {
List<String> hiddenIds = finalHiddenListCOMultiResponse.getData().stream().map(HiddenListCO::getHiddenId).collect(Collectors.toList());
List<FireCheckRecordHiddenDO> hiddenList = fireCheckRecordHiddenDOMap.get(childNode.getFireDeviceId());
List<FireCheckRecordHiddenDO> hiddenList = fireDeviceCheckRecordHiddenDOMap.get(childNode.getFireDeviceId());
if (CollUtil.isNotEmpty(hiddenList)) {
List<String> hiddenIdsInDevice = hiddenList.stream().map(FireCheckRecordHiddenDO::getHiddenId).collect(Collectors.toList());
//如果hiddenIdsInRiskPoint在hiddenIds中，则存在隐患
@ -307,14 +305,31 @@ public class FireCheckListQueryExe {
Map<String, FireCheckRecordPointDO> fireCheckRecordPointDOMap = fireCheckRecordPointDOList.stream()
.collect(Collectors.toMap(FireCheckRecordPointDO::getFirePointId, Function.identity()));
//获取隐患信息
//fireCheckRecordHiddenDOList 按照设备id key value对象
Map<String, FireCheckRecordHiddenDO> 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<FireCheckRecordDeviceDO> fireCheckRecordDeviceDOS = checkRecordDeviceMap.get(recordPointDO.getFireRecordPointId());
//转换
List<FireCheckRecordDeviceCO> 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<FireCheckRecordStatisticDO> fireCheckRecordStatisticDOList = fireCheckRecordRepository.statisticListByFireCheckIdList(fireCheckIdList);
Map<String, Long> 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<FireCheckStandardStatisticDO> fireCheckStandardDOList = fireCheckStandardRepository.getDeviceStandardList(qry.getFireCheckId());
if(CollUtil.isEmpty(fireCheckStandardDOList)){
throw new BizException("请维护点检设备的检查标准");
}
//获取fireCheckStandardDOList中count未空或者为0的数据，做异常提示
List<FireCheckStandardStatisticDO> fireCheckStandardDOList1 = fireCheckStandardDOList.stream()
.filter(info -> info.getStatisticCount() == null || info.getStatisticCount() == 0).collect(Collectors.toList());
//fireCheckStandardDOList1获取名字集合做提示
if(CollUtil.isNotEmpty(fireCheckStandardDOList1)){
List<String> fireCheckStandardDOList1NameList = fireCheckStandardDOList1.stream().map(FireCheckStandardStatisticDO::getFireDeviceTypeName).collect(Collectors.toList());
throw new BizException(fireCheckStandardDOList1NameList + "无检查标准,无法检查");
}
}
}

57
web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordPointQueryExe.java
View File

@ -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<FireCheckPointListCO> getCheckRecordPointList(CheckRecordPointListQry qry) {
public AppFireCheckRecordCO getCheckRecordPointList(CheckRecordPointListQry qry) {
Map<String, Object> params = PageQueryHelper.toHashMap(qry);
PageResponse<FireCheckRecordPointDO> pageResponse = fireCheckRecordPointRepository.getCheckRecordPointList(params);
List<FireCheckPointListCO> 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<FireCheckRecordPointDO> fireCheckRecordPointDOList = fireCheckRecordPointRepository.getCheckRecordPointList(params);
List<AppRecordFireCheckPointListCO> fireCheckPointListCOList = fireCheckRecordPointCoConvertor.converDOsToAppPointCOs(fireCheckRecordPointDOList);
if(CollUtil.isEmpty(fireCheckPointListCOList)){
return PageResponse.of(fireCheckPointListCOList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
return appFireCheckRecordCO;
}
//组装设备信息,fireCheckPointListCOList idlist集合
List<String> idList = fireCheckPointListCOList.stream().map(FireCheckPointListCO::getFireRecordPointId).collect(Collectors.toList());
List<String> idList = fireCheckPointListCOList.stream().map(AppRecordFireCheckPointListCO::getFireRecordPointId).collect(Collectors.toList());
//idList 获取打回的设备检查项信息
List<FireCheckRecordDeviceDO> fireCheckRecordDeviceDOList = fireCheckRecordDeviceRepository.getBackChecKRecordPoiList(idList);
List<FireCheckRecordDeviceDO> fireCheckRecordDeviceDOList = fireCheckRecordDeviceRepository.getBackChecKRecordPoiList(idList,qry.getCheckedFlag());
if(CollUtil.isEmpty(fireCheckRecordDeviceDOList)){
return PageResponse.of(fireCheckPointListCOList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
return appFireCheckRecordCO;
}
List<String> 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<FireCheckRecordUserDO> 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;
}
}

24
web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordQueryExe.java
View File

@ -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<FireCheckRecordUserDO> fireCheckRecordUserDOList =fireCheckRecordUserRepository.getListByFireRecordId(fireRecordId);
if(CollUtil.isNotEmpty(fireCheckRecordUserDOList)){
fireCheckRecordCO.setFireCheckRecordUserList(fireCheckRecordUserCoConvertor.converDOsToCOs(fireCheckRecordUserDOList));
//补充负责人用户信息
List<FireCheckListUserDO> 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;

9
web-app/src/main/java/com/zcloud/fire/check/command/query/FirePointQueryExe.java
View File

@ -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<FirePointCO> data = firePointCOPageResponse.getData();
List<FirePointExcelExportEntity> listManagerStatisticsExcelExportEntityList = firePointCoConvertor.converCOsToExcelEntitys(data);
FirePointE firePointE = new FirePointE();
firePointE.exportFirePointTable(httpServletResponse, listManagerStatisticsExcelExportEntityList);

5
web-app/src/main/java/com/zcloud/fire/check/service/FireCheckListServiceImpl.java
View File

@ -106,5 +106,10 @@ public class FireCheckListServiceImpl implements FireCheckListServiceI {
public PageResponse<FireCheckListCO> getCheckListRecord(CheckListRecordPageQry qry) {
return fireCheckListQueryExe.getCheckListRecord(qry);
}
@Override
public void checkStandard(CheckPointListQry qry) {
fireCheckListQueryExe.checkStandard(qry);
}
}

3
web-app/src/main/java/com/zcloud/fire/check/service/FireCheckRecordPointServiceImpl.java
View File

@ -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<FireCheckPointListCO> getCheckRecordPointList(CheckRecordPointListQry qry) {
public AppFireCheckRecordCO getCheckRecordPointList(CheckRecordPointListQry qry) {
return fireCheckRecordPointQueryExe.getCheckRecordPointList(qry);
}

6
web-app/src/main/java/com/zcloud/fire/check/service/FireCheckRecordServiceImpl.java
View File

@ -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);
}

4
web-app/src/main/java/com/zcloud/fire/check/service/FirePointServiceImpl.java
View File

@ -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

2
web-client/src/main/java/com/zcloud/fire/check/api/FireCheckListServiceI.java
View File

@ -44,5 +44,7 @@ public interface FireCheckListServiceI {
PageResponse<FireCheckListCO> checkListRecordList(FireCheckListRecordPageQry qry);
PageResponse<FireCheckListCO> getCheckListRecord(CheckListRecordPageQry qry);
void checkStandard(CheckPointListQry qry);
}

3
web-client/src/main/java/com/zcloud/fire/check/api/FireCheckRecordPointServiceI.java
View File

@ -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<FireCheckPointListCO> getCheckRecordPointList(CheckRecordPointListQry qry);
AppFireCheckRecordCO getCheckRecordPointList(CheckRecordPointListQry qry);
FireCheckRecordPointCO saveCheckRecordPoint(AppCheckRecordPointAddCmd appCheckRecordPointAddCmd);
}

3
web-client/src/main/java/com/zcloud/fire/check/api/FireCheckRecordServiceI.java
View File

@ -24,9 +24,8 @@ public interface FireCheckRecordServiceI {
PageResponse<FireBackCheckRecordCO> getCheckRecordList(FireBackCheckRecordPageQry qry);
FireCheckRecordCO getChecKRecordInfo(String fireRecordId);
FireCheckRecordCO getInfoById(Long id);
FireCheckRecordInfoCO getInfoById(Long id);
FireCheckRecordCO saveCheckRecord(AppCheckRecordAddCmd appCheckRecordAddCmd);

2
web-client/src/main/java/com/zcloud/fire/check/api/FirePointServiceI.java
View File

@ -32,7 +32,7 @@ public interface FirePointServiceI {
void editAllDepartment(FirePointUpdateDepartmentCmd firePointUpdateDepartmentCmd);
void exportFirePointPage(Long[] ids, HttpServletResponse httpServletResponse);
void exportFirePointPage( HttpServletResponse httpServletResponse);
MultiResponse<FirePointCO> listByFireRegionId(String fireRegionId);
}

2
web-client/src/main/java/com/zcloud/fire/check/dto/AppCheckRecordAddCmd.java
View File

@ -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;

4
web-client/src/main/java/com/zcloud/fire/check/dto/AppCheckRecordPointAddCmd.java
View File

@ -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;

6
web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordDeviceAddCmd.java
View File

@ -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 = "消防设备不能为空")

3
web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordDeviceUpdateCmd.java
View File

@ -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;

2
web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordHiddenPageQry.java
View File

@ -23,6 +23,6 @@ public class FireCheckRecordHiddenPageQry extends PageQuery {
* - `le`: 小于等于比较查询
* - `ne`: 不等比较查询，对应SQL的!=操作符
*/
private String likeFireRecordHidedenId;
private String likeFireRecordHiddenId;
}

4
web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordHiddenUpdateCmd.java
View File

@ -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;

72
web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/AppFireCheckRecordCO.java Normal file
View File

@ -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<FireCheckRecordUserCO> fireCheckRecordUserList;
//消防点检记录隐患列表
@ApiModelProperty(value = "消防点检记录隐患列表")
private List<FireCheckRecordHiddenCO> fireCheckRecordHiddenList;
//检查内容
private List<AppRecordFireCheckPointListCO> fireCheckPointListCOList;
}

87
web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/AppRecordFireCheckPointListCO.java Normal file
View File

@ -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<FireCheckRecordDeviceCO> fireCheckRecordDeviceStatusList;
@ApiModelProperty(value = "消防检查ID")
private String fireRecordId;
@ApiModelProperty(value = "消防检查点位ID")
private String fireRecordPointId;
@ApiModelProperty(value = "是否检查过0已经检查1未检查，2已打回")
private Integer checkedFlag;
}

56
web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/AppStartFireCheckRecordCO.java Normal file
View File

@ -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<FireCheckRecordUserCO> fireCheckRecordUserList;
//消防点检记录隐患列表
@ApiModelProperty(value = "消防点检记录隐患列表")
private List<FireCheckRecordHiddenCO> fireCheckRecordHiddenList;
//检查内容
private List<AppRecordFireCheckPointListCO> fireCheckPointListCOList;
}

1
web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireBackCheckRecordCO.java
View File

@ -37,6 +37,7 @@ public class FireBackCheckRecordCO implements Serializable {
@ApiModelProperty(value = "检查表类型名称")
private String fireCheckTypeName;
//部门id
@ApiModelProperty(value = "部门id")
private Long departmentId;

2
web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckPointListCO.java
View File

@ -17,6 +17,8 @@ import java.util.List;
*/
@Data
public class FireCheckPointListCO implements Serializable {
@ApiModelProperty(value = "消防点位检查记录id")
private Long id;
/**
* 消防区域名称
*/

5
web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordCO.java
View File

@ -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 = "消防点检检查用户列表")

2
web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordDeviceCO.java
View File

@ -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;

44
web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordHiddenCO.java
View File

@ -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;
}

76
web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordInfoCO.java Normal file
View File

@ -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<FireCheckRecordHiddenCO> fireCheckRecordHiddenList;
//检查内容
private List<FireCheckRecordDeviceCO> fireCheckRecordDeviceList;
}

39
web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordUserCO.java
View File

@ -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;
}

2
web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireDeviceCO.java
View File

@ -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;

2
web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/PointDistributionCO.java
View File

@ -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 = "部门名称")

18
web-domain/src/main/java/com/zcloud/fire/check/domain/enums/ListManagerCheckPeriodEnum.java
View File

@ -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;

71
web-domain/src/main/java/com/zcloud/fire/check/domain/enums/MenuEnum.java Normal file
View File

@ -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<String, MenuEnum> 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
}
}

10
web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckListE.java
View File

@ -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;
}
}
}

5
web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckRecordHiddenE.java
View File

@ -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

36
web-domain/src/main/java/com/zcloud/fire/check/domain/model/FirePointE.java
View File

@ -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();
}
}

2
web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckRecordGatewayImpl.java
View File

@ -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());

12
web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckRecordHiddenGatewayImpl.java
View File

@ -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());

5
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListDO.java
View File

@ -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) {

9
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordHiddenDO.java
View File

@ -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;
}
}

38
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckStandardStatisticDO.java Normal file
View File

@ -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;
}

2
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/PointDistributionDO.java
View File

@ -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 = "部门名称")

3
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckRecordMapper.java
View File

@ -26,5 +26,8 @@ public interface FireCheckRecordMapper extends BaseMapper<FireCheckRecordDO> {
List<DataStatisticDO> DataStatisticDO(List<Long> corpinfoIds);
IPage<FireCheckRecordDO> getCheckRecordPageH5(IPage<FireCheckRecordDO> iPage, Map<String, Object> params);
FireCheckRecordDO getCheckRecordInfo(String fireRecordId);
}

3
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckRecordPointMapper.java
View File

@ -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<FireCheckRecordPointDO> {
IPage<FireCheckRecordPointDO> getCheckRecordPointList(IPage<FireCheckRecordPointDO> iPage, Map<String, Object> params);
List<FireCheckRecordPointDO> getCheckRecordPointList(Map<String, Object> params);
}

4
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckStandardMapper.java
View File

@ -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<FireCheckStandardDO> {
List<FireCheckStandardStatisticDO> getDeviceStandardList(String fireCheckId);
}

2
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireRegionMapper.java
View File

@ -23,5 +23,7 @@ public interface FireRegionMapper extends BaseMapper<FireRegionDO> {
List<DataStatisticDO> countByCorpinfoIds(List<Long> corpinfoIds);
Long getFireRegionCount(Map<String, Object> params);
List<FireRegionDO> listByCorpinfoId(Long corpinfoId);
}

1
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckListUserRepository.java
View File

@ -26,5 +26,6 @@ public interface FireCheckListUserRepository extends BaseRepository<FireCheckLis
List<FireCheckListUserDO> getListUserByFireCheckIdList(List<String> fireCheckIdList);
}

2
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordDeviceRepository.java
View File

@ -16,7 +16,7 @@ import java.util.Map;
public interface FireCheckRecordDeviceRepository extends BaseRepository<FireCheckRecordDeviceDO> {
PageResponse<FireCheckRecordDeviceDO> listPage(Map<String, Object> params);
List<FireCheckRecordDeviceDO> getBackChecKRecordPoiList(List<String> idList);
List<FireCheckRecordDeviceDO> getBackChecKRecordPoiList(List<String> idList, Integer checkedFlag);
List<FireCheckRecordDeviceDO> getCheckRecordDeviceList(String fireRecordId);

2
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordHiddenRepository.java
View File

@ -23,7 +23,7 @@ public interface FireCheckRecordHiddenRepository extends BaseRepository<FireChec
List<FireCheckRecordHiddenDO> getChecKRecordDeviceList(List<String> fireRecordDeviceIdList);
List<FireCheckRecordHiddenDO> getChecKRecordHiddenList(String fireRecordId);
List<FireCheckRecordHiddenDO> getChecKRecordHiddenList(String fireRecordId, Integer hiddenCheckType);
FireCheckRecordHiddenDO listByFireCheckRecordDeviceId(String fireRecordDeviceId);

4
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordPointRepository.java
View File

@ -19,6 +19,8 @@ public interface FireCheckRecordPointRepository extends BaseRepository<FireCheck
List<FireCheckRecordPointDO> getInfoByFireCheckRecordId(String fireCheckId);
PageResponse<FireCheckRecordPointDO> getCheckRecordPointList(Map<String, Object> params);
List<FireCheckRecordPointDO> getCheckRecordPointList(Map<String, Object> params);
void updateCheckFlag(FireCheckRecordPointDO pointInfo);
}

5
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordRepository.java
View File

@ -22,12 +22,15 @@ public interface FireCheckRecordRepository extends BaseRepository<FireCheckRecor
PageResponse<FireCheckRecordDO> getCheckRecordList(Map<String, Object> params);
FireCheckRecordDO getChecKRecordInfo(String fireRecordId);
FireCheckRecordDO getCheckRecordInfo(String fireRecordId);
List<FireCheckRecordStatisticDO> statisticListByFireCheckIdList(List<String> fireCheckIdList);
List<DataStatisticDO> DataStatisticDO(List<Long> corpinfoIds);
PageResponse<FireCheckRecordDO> getCheckRecordPageH5(Map<String, Object> params);
FireCheckRecordDO getCheckRecordInfoByFireRecordId(String fireRecordId);
}

3
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckStandardRepository.java
View File

@ -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<FireCheckSta
boolean addBatch(List<FireCheckStandardDO> fireCheckStandardDOList);
List<FireCheckStandardDO> getCheckStandardList(List<String> fireDeviceTypeList);
List<FireCheckStandardStatisticDO> getDeviceStandardList(String fireCheckId);
}

2
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java
View File

@ -122,7 +122,7 @@ public class FireCheckListRepositoryImpl extends BaseRepositoryImpl<FireCheckLis
if(!corpInfoRepository.isSupper()){
params.put("corpinfoId", AuthContext.getTenantId());
if(!CorpInfoE.isCorp()){
//是个人，只能查询自己的清单
//是个人，只能查询自己的清单和自己检查过的清单
params.put("userId", AuthContext.getUserId());
}
}

7
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordDeviceRepositoryImpl.java
View File

@ -39,10 +39,13 @@ public class FireCheckRecordDeviceRepositoryImpl extends BaseRepositoryImpl<Fire
}
@Override
public List<FireCheckRecordDeviceDO> getBackChecKRecordPoiList(List<String> idList) {
public List<FireCheckRecordDeviceDO> getBackChecKRecordPoiList(List<String> idList,Integer checkedFlag) {
QueryWrapper<FireCheckRecordDeviceDO> 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);
}

5
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordHiddenRepositoryImpl.java
View File

@ -59,9 +59,12 @@ public class FireCheckRecordHiddenRepositoryImpl extends BaseRepositoryImpl<Fire
}
@Override
public List<FireCheckRecordHiddenDO> getChecKRecordHiddenList(String fireRecordId) {
public List<FireCheckRecordHiddenDO> getChecKRecordHiddenList(String fireRecordId,Integer hiddenCheckType) {
QueryWrapper<FireCheckRecordHiddenDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("fire_record_id", fireRecordId);
if(hiddenCheckType != null){
queryWrapper.eq("hidden_check_type", hiddenCheckType);
}
return fireCheckRecordHiddenMapper.selectList(queryWrapper);
}

15
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordPointRepositoryImpl.java
View File

@ -51,10 +51,17 @@ public class FireCheckRecordPointRepositoryImpl extends BaseRepositoryImpl<FireC
return fireCheckRecordPointDOS;
}
@Override
public PageResponse<FireCheckRecordPointDO> getCheckRecordPointList(Map<String, Object> params) {
IPage<FireCheckRecordPointDO> iPage = new Query<FireCheckRecordPointDO>().getPage(params);
IPage<FireCheckRecordPointDO> result = fireCheckRecordPointMapper.getCheckRecordPointList(iPage, params);
return PageHelper.pageToResponse(result, result.getRecords());
public List<FireCheckRecordPointDO> getCheckRecordPointList(Map<String, Object> params) {
List<FireCheckRecordPointDO> result = fireCheckRecordPointMapper.getCheckRecordPointList(params);
return result;
}
@Override
public void updateCheckFlag(FireCheckRecordPointDO pointInfo) {
QueryWrapper<FireCheckRecordPointDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("fire_record_point_id", pointInfo.getFireRecordPointId());
fireCheckRecordPointMapper.update(pointInfo, queryWrapper);
}
}

20
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordRepositoryImpl.java
View File

@ -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<FireCheckR
} else {
if(!corpInfoRepository.isSupper()){
params.put("corpinfoId", AuthContext.getTenantId());
if(!CorpInfoE.isCorp()){
/* if(!CorpInfoE.isCorp()){
//是个人，只能查询自己的清单
params.put("userId", AuthContext.getUserId());
}
}*/
}
}
IPage<FireCheckRecordDO> result = fireCheckRecordMapper.getCheckRecordList(iPage, params);
@ -81,10 +80,8 @@ public class FireCheckRecordRepositoryImpl extends BaseRepositoryImpl<FireCheckR
}
@Override
public FireCheckRecordDO getChecKRecordInfo(String fireRecordId) {
QueryWrapper<FireCheckRecordDO> 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<FireCheckR
IPage<FireCheckRecordDO> result = fireCheckRecordMapper.getCheckRecordPageH5(iPage, params);
return PageHelper.pageToResponse(result, result.getRecords());
}
@Override
public FireCheckRecordDO getCheckRecordInfoByFireRecordId(String fireRecordId) {
QueryWrapper<FireCheckRecordDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("fire_record_id", fireRecordId);
return fireCheckRecordMapper.selectOne(queryWrapper);
}
}

6
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckStandardRepositoryImpl.java
View File

@ -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<FireChec
queryWrapper.in("fire_device_type", fireDeviceTypeList);
return fireCheckStandardMapper.selectList(queryWrapper);
}
@Override
public List<FireCheckStandardStatisticDO> getDeviceStandardList(String fireCheckId) {
return fireCheckStandardMapper.getDeviceStandardList(fireCheckId);
}
}

17
web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireRegionRepositoryImpl.java
View File

@ -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<FireRegionMappe
// }
}
IPage<FireRegionDO> iPage = new Query<FireRegionDO>().getPage(params);
/* String menuPerms = "";
if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){
menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
}*/
IPage<FireRegionDO> result =fireRegionMapper.getFireRegionPage(iPage,params);
return PageHelper.pageToResponse(result, result.getRecords());
}
@ -61,10 +63,7 @@ public class FireRegionRepositoryImpl extends BaseRepositoryImpl<FireRegionMappe
@Override
public List<FireRegionDO> listByCorpinfoId(Long corpinfoId) {
QueryWrapper<FireRegionDO> 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<FireRegionMappe
public List<DataStatisticDO> countByCorpinfoIds(List<Long> corpinfoIds) {
return fireRegionMapper.countByCorpinfoIds(corpinfoIds);
}
}

2
web-infrastructure/src/main/resources/mapper/FireCheckListItemMapper.xml
View File

@ -5,7 +5,7 @@
<mapper namespace="com.zcloud.fire.check.persistence.mapper.FireCheckListItemMapper">
<select id="statisticListByFireCheckIdList" resultType="com.zcloud.fire.check.persistence.dataobject.FireCheckListItemStatisticDO">
select fire_check_id as fireCheckId, count(*) as fireCheckItemCount
select fire_check_id as fireCheckId, count(distinct fire_point_id) as fireCheckItemCount
from fire_check_list_item
where
delete_enum='FALSE' and fire_check_id in

53
web-infrastructure/src/main/resources/mapper/FireCheckListMapper.xml
View File

@ -61,15 +61,15 @@
LEFT JOIN fire_check_record cr ON cl.fire_check_id = cr.fire_check_id
AND cr.delete_enum = 'FALSE'
AND (
(cl.fire_check_type = 'checkPeriod0001' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.dayStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.dayEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'checkPeriod0002' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.weeklyStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.weeklyEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'checkPeriod0003' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.tenDaysStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.tenDaysEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'checkPeriod0004' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.monthlyStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.monthlyEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'checkPeriod0005' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.quarterlyStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.quarterlyEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'checkPeriod0006' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.yearlyStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.yearlyEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'checkPeriod0007' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.halfYearStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.halfYearEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'checkPeriod0008' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.halfMonthStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.halfMonthEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'checkPeriod0009' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.weeklyStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.weeklyEndTime} and cr.finished_flag=1)
(cl.fire_check_type = 'fireCheckPeriod0001' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.dayStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.dayEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'fireCheckPeriod0002' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.weeklyStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.weeklyEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'fireCheckPeriod0003' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.tenDaysStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.tenDaysEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'FireCheckPeriod0004' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.monthlyStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.monthlyEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'fireCheckPeriod0005' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.quarterlyStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.quarterlyEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'fireCheckPeriod0006' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.yearlyStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.yearlyEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'fireCheckPeriod0007' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.halfYearStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.halfYearEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'fireCheckPeriod0008' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.halfMonthStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.halfMonthEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'fireCheckPeriod0009' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.weeklyStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.weeklyEndTime} and cr.finished_flag=1)
)
WHERE
cl.delete_enum = 'FALSE'
@ -88,10 +88,10 @@
<if test="params.checkStatus != null and params.checkStatus != ''">
<choose>
<when test="params.checkStatus == 1">
AND (cl.fire_check_type = 'checkPeriod0009' OR checkedCount = 0)
AND (cl.fire_check_type = 'fireCheckPeriod0009' OR checkedCount = 0)
</when>
<when test="params.checkStatus == 2">
AND (cl.fire_check_type = 'checkPeriod0009' OR checkedCount > 0)
AND (cl.fire_check_type = 'fireCheckPeriod0009' OR checkedCount > 0)
</when>
</choose>
</if>
@ -235,23 +235,23 @@
LEFT JOIN fire_check_record cr ON cl.fire_check_id = cr.fire_check_id
AND cr.delete_enum = 'FALSE'
AND (
(cl.fire_check_type = 'checkPeriod0001' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.dayStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.dayEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'checkPeriod0002' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.weeklyStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.weeklyEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'checkPeriod0003' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.tenDaysStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.tenDaysEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'checkPeriod0004' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.monthlyStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.monthlyEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'checkPeriod0005' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.quarterlyStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.quarterlyEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'checkPeriod0006' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.yearlyStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.yearlyEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'checkPeriod0007' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.halfYearStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.halfYearEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'checkPeriod0008' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.halfMonthStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.halfMonthEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'checkPeriod0009' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.weeklyStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.weeklyEndTime} and cr.finished_flag=1)
(cl.fire_check_type = 'fireCheckPeriod0001' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.dayStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.dayEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'fireCheckPeriod0002' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.weeklyStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.weeklyEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'fireCheckPeriod0003' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.tenDaysStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.tenDaysEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'FireCheckPeriod0004' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.monthlyStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.monthlyEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'fireCheckPeriod0005' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.quarterlyStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.quarterlyEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'fireCheckPeriod0006' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.yearlyStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.yearlyEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'fireCheckPeriod0007' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.halfYearStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.halfYearEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'fireCheckPeriod0008' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.halfMonthStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.halfMonthEndTime} and cr.finished_flag=1)
OR (cl.fire_check_type = 'fireCheckPeriod0009' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.weeklyStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.weeklyEndTime} and cr.finished_flag=1)
)
left join fire_check_record_user cru on cr.fire_record_id = cru.fire_record_id and cru.delete_enum = 'FALSE'
WHERE
cl.delete_enum = 'FALSE'
AND cl.corpinfo_id = #{params.corpinfoId}
<if test="params.userId != null and params.userId != ''">
AND cl.user_id = #{params.userId}
AND (fclu.user_id = #{params.userId} or cru.user_id= #{params.userId})
</if>
<if test="params.fireCheckName != null and params.fireCheckName != ''">
AND cl.fire_check_name like CONCAT('%', #{params.fireCheckName}, '%')
@ -275,10 +275,10 @@
<if test="params.checkStatus != null and params.checkStatus != ''">
<choose>
<when test="params.checkStatus == 1">
AND (cl.fire_check_type = 'checkPeriod0009' OR checkedCount = 0)
AND (cl.fire_check_type = 'fireCheckPeriod0009' OR checkedCount = 0)
</when>
<when test="params.checkStatus == 2">
AND (cl.fire_check_type = 'checkPeriod0009' OR checkedCount > 0)
AND (cl.fire_check_type = 'fireCheckPeriod0009' OR checkedCount > 0)
</when>
</choose>
</if>
@ -290,7 +290,7 @@
select
cl.*,
GROUP_CONCAT(DISTINCT u.name) AS userName,
COUNT(distinct cr.id) AS checkCycleCount,
d.name AS departmentName
from fire_check_list cl
LEFT JOIN fire_check_list_user fclu on cl.fire_check_id = fclu.fire_check_id
@ -304,12 +304,13 @@
<if test="params.endTime != null and params.endTime != ''">
and cr.check_time <![CDATA[<=]]> #{params.endTime}
</if>
left join fire_check_record_user cru on cr.fire_record_id = cru.fire_record_id and cru.delete_enum = 'FALSE'
WHERE
cl.delete_enum = 'FALSE'
AND cl.corpinfo_id = #{params.corpinfoId}
<if test="params.userId != null and params.userId != ''">
AND fclu.user_id = #{params.userId}
AND (fclu.user_id = #{params.userId} or cru.user_id= #{params.userId})
</if>
<if test="params.fireCheckName != null and params.fireCheckName != ''">
AND cl.fire_check_name like CONCAT('%', #{params.fireCheckName}, '%')

22
web-infrastructure/src/main/resources/mapper/FireCheckRecordMapper.xml
View File

@ -25,9 +25,7 @@
<if test="params.checkedFlag != null ">
and crd.checked_flag = #{params.checkedFlag}
</if>
<if test="params.userId != null ">
and cru.user_id >= #{params.userId}
</if>
<if test="params.startTime != null and params.startTime != ''">
AND DATE(cr.check_time) <![CDATA[>=]]> #{params.startDate}
@ -73,7 +71,7 @@
from fire_check_record cr
left join fire_check_record_user cru on cr.fire_record_id = cru.fire_record_id and cru.delete_enum = 'FALSE'
left join user u on cru.user_id = u.id
left join department d on cru.department_id = d.department_id
left join department d on cru.department_id = d.id
left join fire_check_record_point cfp on cr.fire_record_id = cfp.fire_record_id and cfp.delete_enum = 'FALSE'
left join fire_check_record_device crd
on cr.fire_record_id = crd.fire_record_id and crd.fire_record_point_id = cfp.fire_record_point_id and
@ -84,5 +82,21 @@
group by cr.fire_record_id
order by cr.create_time desc
</select>
<select id="getCheckRecordInfo" resultType="com.zcloud.fire.check.persistence.dataobject.FireCheckRecordDO">
select cr.*,
GROUP_CONCAT(DISTINCT u.name) AS userNameList,
GROUP_CONCAT(DISTINCT d.name) AS departmentName
from fire_check_record cr
left join fire_check_record_user cru on cr.fire_record_id = cru.fire_record_id and cru.delete_enum = 'FALSE'
left join user u on cru.user_id = u.id
left join department d on cru.department_id = d.id
where cr.delete_enum = 'FALSE'
and cr.finished_flag = 1
and cr.fire_record_id= #{fireRecordId}
group by cr.fire_record_id
order by cr.create_time desc
</select>
</mapper>

16
web-infrastructure/src/main/resources/mapper/FireCheckRecordPointMapper.xml
View File

@ -5,8 +5,8 @@
<mapper namespace="com.zcloud.fire.check.persistence.mapper.FireCheckRecordPointMapper">
<select id="getCheckRecordPointList" resultType="com.zcloud.fire.check.persistence.dataobject.FireCheckRecordPointDO">
select GROUP_CONCAT(DISTINCT crd.fire_device_code) as fireDeviceCode, -- 合并多个值
GROUP_CONCAT(DISTINCT crd.fire_device_type_name) as fireDeviceTypeName, -- 合并多个值
select GROUP_CONCAT(DISTINCT crd.fire_device_code) as fireDeviceCode,
GROUP_CONCAT(DISTINCT crd.fire_device_type_name) as fireDeviceTypeName,
cfp.fire_region_code as fireRegionCode,
cfp.fire_region_id as fireRegionId,
cfp.fire_region_name as fireRegionName,
@ -16,18 +16,20 @@
cfp.checked_flag as checkedFlag,
cfp.fire_record_id as fireRecordId,
cfp.fire_record_point_id as fireRecordPointId,
cfp.fire_check_id as fireCheckId
cfp.fire_check_id as fireCheckId,
cfp.id
from fire_check_record_point cfp
left join fire_check_record_device crd
on crd.fire_record_point_id = cfp.fire_record_point_id and
crd.delete_enum = 'FALSE'
where cfp.fire_record_id = #{params.fireRecordId}
left join fire_point fp on fp.fire_point_id = cfp.fire_point_id
where cfp.fire_record_id = #{fireRecordId}
and crd.delete_enum = 'FALSE'
<if test="params.checkedFlag != null">
and crd.checked_flag = #{params.checkedFlag}
<if test="checkedFlag != null">
and crd.checked_flag = #{checkedFlag}
</if>
group by cfp.fire_record_point_id
order by cfp.create_time desc
order by fp.create_time desc ,cfp.create_time desc
</select>
</mapper>

11
web-infrastructure/src/main/resources/mapper/FireCheckStandardMapper.xml
View File

@ -3,6 +3,15 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zcloud.fire.check.persistence.mapper.FireCheckStandardMapper">
<select id="getDeviceStandardList"
resultType="com.zcloud.fire.check.persistence.dataobject.FireCheckStandardStatisticDO">
select d.fire_device_type,d.fire_device_type_name,count(cs.id) as statisticCount
from fire_check_list_item cli left join fire_device d on cli.fire_device_id = d.fire_device_id and
d.delete_enum='FALSE'
left join fire_check_standard cs on d.fire_device_type = cs.fire_device_type and cs.delete_enum='FALSE'
where cli.fire_check_id = #{fireCheckId}
and cli.delete_enum='FALSE'
group by cli.fire_device_id
</select>
</mapper>

2
web-infrastructure/src/main/resources/mapper/FireDeviceMapper.xml
View File

@ -161,7 +161,7 @@
WHERE d.delete_enum = 'false' and d.fire_point_id = #{firePointId}
</select>
<select id="countByCorpinfoIds" resultType="com.zcloud.fire.check.persistence.dataobject.DataStatisticDO">
select d.corpinfo_id as corpinfoId,count(1) as count
select d.corpinfo_id as corpinfoId,count(1) as totalCount
from fire_device d
where d.delete_enum = 'FALSE'
and d.corpinfo_id in

5
web-infrastructure/src/main/resources/mapper/FirePointMapper.xml
View File

@ -31,6 +31,9 @@
#{id}
</foreach>
</if>
<if test="params.corpinfoId != null and params.corpinfoId != ''">
AND p.corpinfo_id = #{params.corpinfoId}
</if>
<if test="params.fireRegionId != null and params.fireRegionId != ''">
AND p.fire_region_id = #{params.fireRegionId}
</if>
@ -78,7 +81,7 @@
and p.delete_enum = 'FALSE'
</select>
<select id="countByCorpinfoIds" resultType="com.zcloud.fire.check.persistence.dataobject.DataStatisticDO">
select p.corpinfo_id as corpinfoId,count(1) as count
select p.corpinfo_id as corpinfoId,count(1) as totalCount
from fire_point p
where p.delete_enum = 'FALSE'
and p.corpinfo_id in

15
web-infrastructure/src/main/resources/mapper/FireRegionMapper.xml
View File

@ -30,7 +30,7 @@
</where>
</select>
<select id="countByCorpinfoIds" resultType="com.zcloud.fire.check.persistence.dataobject.DataStatisticDO">
select fr.corpinfo_id as corpinfoId,count(1) as count
select fr.corpinfo_id as corpinfoId,count(1) as totalCount
from fire_region fr
where fr.delete_enum = 'FALSE'
and fr.state = 0
@ -52,5 +52,18 @@
and r.state = #{state}
and r.delete_enum = 'FALSE'
</select>
<select id="listByCorpinfoId" resultType="com.zcloud.fire.check.persistence.dataobject.FireRegionDO">
select fr.*,d.name AS departmentName
from fire_region fr
left join department d on fr.department_id=d.id
where
fr.delete_enum = 'FALSE'
AND fr.corpinfo_id = #{corpinfoId}
and fr.state = 0
order by fr.create_time desc
</select>
</mapper>