消防检查init
parent
ba532c0afe
commit
b79f008952
|
|
@ -39,7 +39,7 @@
|
|||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<mainClass>com.zcloud.risk.Application</mainClass>
|
||||
<mainClass>com.zcloud.fire.check.Application</mainClass>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ nacos:
|
|||
application:
|
||||
name: jjb-saas-zcloud-fire-check
|
||||
version:
|
||||
gateway: fire-check
|
||||
gateway: fireCheck
|
||||
cn-name: 消防检查
|
||||
spring:
|
||||
application:
|
||||
|
|
|
|||
|
|
@ -0,0 +1,77 @@
|
|||
package com.zcloud.fire.check.app;
|
||||
|
||||
|
||||
import com.alibaba.cola.dto.MultiResponse;
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.zcloud.fire.check.api.FireCheckListServiceI;
|
||||
import com.zcloud.fire.check.dto.*;
|
||||
import com.zcloud.fire.check.dto.clientobject.*;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
/**
|
||||
* web-adapter
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:08
|
||||
*/
|
||||
@Api(tags = "App消防点位检查表")
|
||||
@RequestMapping("/${application.gateway}/app/fireCheckList")
|
||||
@RestController
|
||||
@AllArgsConstructor
|
||||
public class AppFireCheckListController {
|
||||
private final FireCheckListServiceI fireCheckListService;
|
||||
|
||||
|
||||
@ApiOperation("获取待排查分页")
|
||||
@PostMapping("/checkList")
|
||||
public PageResponse<FireCheckListCO> checkList(@RequestBody FireCheckListPageQry qry) {
|
||||
return fireCheckListService.appCheckList(qry);
|
||||
}
|
||||
|
||||
@ApiOperation("开始检查-获取消防点检列表")
|
||||
@PostMapping("/getCheckPointList")
|
||||
public MultiResponse<FireCheckPointListCO> getCheckPointList(@RequestBody CheckPointListQry qry) {
|
||||
return MultiResponse.of(fireCheckListService.getCheckPointList(qry));
|
||||
}
|
||||
@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) {
|
||||
return fireCheckListService.getCheckListRecord(qry);
|
||||
}
|
||||
|
||||
@ApiOperation("点位统计-点击企业-点位分布")
|
||||
@PostMapping("/pointDistribution")
|
||||
public PageResponse<PointDistributionCO> pointDistributionStatistic(@RequestBody @Validated PointDistributionPageQry qry) {
|
||||
return fireCheckListService.pointDistributionStatistic(qry);
|
||||
}
|
||||
|
||||
/* 使用pc端接口
|
||||
@ApiOperation("点位统计-风险分布-首页")
|
||||
@PostMapping("/riskDistribution")
|
||||
public PageResponse<RiskDistributionCO> riskDistribution(@RequestBody RiskDistributionPageQry qry) {
|
||||
return fireCheckListService.riskDistribution(qry);
|
||||
}
|
||||
@ApiOperation("点位统计-风险分布总统计-首页")
|
||||
@PostMapping("/riskDistributionStatistic")
|
||||
public SingleResponse<RiskDistributionStasticCO> riskDistributionStatistic() {
|
||||
return SingleResponse.of(fireCheckListService.riskDistributionStatistic());
|
||||
}*/
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
package com.zcloud.fire.check.app;
|
||||
|
||||
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.zcloud.fire.check.api.FireCheckRecordServiceI;
|
||||
import com.zcloud.fire.check.dto.*;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireBackCheckRecordCO;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckRecordCO;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckRecordPointCO;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* web-adapter
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:58
|
||||
*/
|
||||
@Api(tags = "App消防点位检查记录表")
|
||||
@RequestMapping("/${application.gateway}/app/fireCheckRecord")
|
||||
@RestController
|
||||
@AllArgsConstructor
|
||||
public class AppFireCheckRecordController {
|
||||
private final FireCheckRecordServiceI fireCheckRecordService;
|
||||
|
||||
@ApiOperation("总检查提交")
|
||||
@PostMapping("/saveCheckRecord")
|
||||
public SingleResponse<FireCheckRecordCO> saveCheckRecord(@RequestBody AppCheckRecordAddCmd appCheckRecordAddCmd) {
|
||||
return SingleResponse.of(fireCheckRecordService.saveCheckRecord(appCheckRecordAddCmd));
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation("获取消防点检记录检查列表 (包括已打回和所有)")
|
||||
@PostMapping("/getCheckRecordList")
|
||||
public PageResponse<FireBackCheckRecordCO> getCheckRecordList(@RequestBody FireBackCheckRecordPageQry qry) {
|
||||
return fireCheckRecordService.getCheckRecordList(qry);
|
||||
}
|
||||
|
||||
/*
|
||||
@ApiOperation("获取消防点检记录详情信息")
|
||||
@GetMapping("/getChecKRecordInfo/{fireRecordId}")
|
||||
public SingleResponse<FireCheckRecordCO> getChecKRecordInfo(@PathVariable("fireRecordId") String fireRecordId) {
|
||||
return SingleResponse.of(fireCheckRecordService.getChecKRecordInfo(fireRecordId));
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
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.FireCheckRecordPointCO;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
/**
|
||||
* web-adapter
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:58
|
||||
*/
|
||||
@Api(tags = "App消防点位检查记录点位表")
|
||||
@RequestMapping("/${application.gateway}/app/fireCheckRecord")
|
||||
@RestController
|
||||
@AllArgsConstructor
|
||||
public class AppFireCheckRecordPointController {
|
||||
private final FireCheckRecordPointServiceI fireCheckRecordPointService;
|
||||
|
||||
@ApiOperation("点位检查提交")
|
||||
@PostMapping("/saveCheckRecordPoint")
|
||||
public SingleResponse<FireCheckRecordPointCO> saveCheckRecordPoint(@RequestBody AppCheckRecordPointAddCmd appCheckRecordPointAddCmd) {
|
||||
return SingleResponse.of(fireCheckRecordPointService.saveCheckRecordPoint(appCheckRecordPointAddCmd));
|
||||
}
|
||||
|
||||
@ApiOperation("获取消防点检记录点位列表(已打回根据状态传入)")
|
||||
@PostMapping("/getCheckRecordPointList")
|
||||
public PageResponse<FireCheckPointListCO> getCheckRecordPointList(@RequestBody CheckRecordPointListQry qry) {
|
||||
return fireCheckRecordPointService.getCheckRecordPointList(qry);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
package com.zcloud.fire.check.app;
|
||||
|
||||
|
||||
import com.alibaba.cola.dto.MultiResponse;
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.Response;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.zcloud.fire.check.api.FireCheckListServiceI;
|
||||
import com.zcloud.fire.check.api.FireDeviceServiceI;
|
||||
import com.zcloud.fire.check.dto.*;
|
||||
import com.zcloud.fire.check.dto.clientobject.CorpStatisticsCO;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireDeviceCO;
|
||||
import com.zcloud.fire.check.dto.clientobject.RiskDistributionStasticCO;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
/**
|
||||
* web-adapter
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-26 10:12:34
|
||||
*/
|
||||
@Api(tags = "消防器材维护表",hidden = true)
|
||||
@RequestMapping("/${application.gateway}/app/fireDevice")
|
||||
@RestController
|
||||
@AllArgsConstructor
|
||||
public class AppFireDeviceController {
|
||||
private final FireDeviceServiceI fireDeviceService;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/* @ApiOperation("消防器材详情")
|
||||
@PostMapping("/info/{id}")
|
||||
public SingleResponse<FireDeviceCO> getInfoById(@PathVariable("id") Long id) {
|
||||
return SingleResponse.of(fireDeviceService.getInfoById(id));
|
||||
}*/
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,94 @@
|
|||
package com.zcloud.fire.check.web;
|
||||
|
||||
|
||||
import com.alibaba.cola.dto.MultiResponse;
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.Response;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.jjb.saas.framework.auth.model.SSOUser;
|
||||
import com.jjb.saas.framework.auth.utils.AuthContext;
|
||||
import com.zcloud.fire.check.api.FireCheckListServiceI;
|
||||
import com.zcloud.fire.check.dto.*;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckListCO;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* web-adapter
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:08
|
||||
*/
|
||||
@Api(tags = "消防点位检查表")
|
||||
@RequestMapping("/${application.gateway}/fireCheckList")
|
||||
@RestController
|
||||
@AllArgsConstructor
|
||||
public class FireCheckListController {
|
||||
private final FireCheckListServiceI fireCheckListService;
|
||||
|
||||
@ApiOperation("消防点检新增")
|
||||
@PostMapping("/save")
|
||||
public SingleResponse<FireCheckListCO> add(@Validated @RequestBody FireCheckListAddCmd cmd) {
|
||||
return fireCheckListService.add(cmd);
|
||||
}
|
||||
|
||||
@ApiOperation("消防点检分页")
|
||||
@PostMapping("/list")
|
||||
public PageResponse<FireCheckListCO> page(@RequestBody FireCheckListPageQry qry) {
|
||||
return fireCheckListService.listPage(qry);
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation("消防点检详情")
|
||||
@GetMapping("/getInfoById/{id}")
|
||||
public SingleResponse<FireCheckListCO> getInfoById(@PathVariable("id") Long id) {
|
||||
return SingleResponse.of(fireCheckListService.getInfoById(id));
|
||||
}
|
||||
|
||||
@ApiOperation("消防点检删除")
|
||||
@GetMapping("/remove/{id}")
|
||||
public Response remove(@PathVariable("id") Long id) {
|
||||
FireCheckListUpdateStateCmd fireCheckListUpdateStateCmd = new FireCheckListUpdateStateCmd();
|
||||
fireCheckListUpdateStateCmd.setId(id);
|
||||
fireCheckListUpdateStateCmd.setState(2);
|
||||
fireCheckListService.editState(fireCheckListUpdateStateCmd);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
|
||||
@ApiOperation("消防点检删除多个")
|
||||
@PostMapping("/remove/ids")
|
||||
public Response removeBatch(@RequestBody FireCheckListRemoveCmd cmd) {
|
||||
for (Long id : cmd.getIds()) {
|
||||
FireCheckListUpdateStateCmd fireCheckListUpdateStateCmd = new FireCheckListUpdateStateCmd();
|
||||
fireCheckListUpdateStateCmd.setId(id);
|
||||
fireCheckListUpdateStateCmd.setState(2);
|
||||
fireCheckListService.editState(fireCheckListUpdateStateCmd);
|
||||
}
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
|
||||
@ApiOperation("消防点检修改")
|
||||
@PostMapping("/edit")
|
||||
public SingleResponse edit(@Validated @RequestBody FireCheckListUpdateCmd fireCheckListUpdateCmd) {
|
||||
fireCheckListService.edit(fireCheckListUpdateCmd);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
@ApiOperation("消防点检修改状态")
|
||||
@PostMapping("/editState")
|
||||
public SingleResponse editState(@Validated @RequestBody FireCheckListUpdateStateCmd fireCheckListUpdateStateCmd) {
|
||||
fireCheckListService.editState(fireCheckListUpdateStateCmd);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
@ApiOperation("PC端-点位检查记录分页")
|
||||
@PostMapping("/checkListRecordList")
|
||||
public PageResponse<FireCheckListCO> checkListRecordList(@RequestBody FireCheckListRecordPageQry qry) {
|
||||
return fireCheckListService.checkListRecordList(qry);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,83 @@
|
|||
package com.zcloud.fire.check.web;
|
||||
|
||||
|
||||
import com.alibaba.cola.dto.MultiResponse;
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.Response;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.jjb.saas.framework.auth.model.SSOUser;
|
||||
import com.jjb.saas.framework.auth.utils.AuthContext;
|
||||
import com.zcloud.fire.check.api.FireCheckListItemServiceI;
|
||||
import com.zcloud.fire.check.dto.FireCheckListItemAddCmd;
|
||||
import com.zcloud.fire.check.dto.FireCheckListItemPageQry;
|
||||
import com.zcloud.fire.check.dto.FireCheckListItemUpdateCmd;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckListItemCO;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* web-adapter
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:28
|
||||
*/
|
||||
@Api(tags = "消防点位检查详细表", hidden = true)
|
||||
@RequestMapping("/${application.gateway}/fireCheckListItem")
|
||||
@RestController
|
||||
@AllArgsConstructor
|
||||
@Deprecated
|
||||
public class FireCheckListItemController {
|
||||
private final FireCheckListItemServiceI fireCheckListItemService;
|
||||
|
||||
@ApiOperation("新增")
|
||||
@PostMapping("/save")
|
||||
public SingleResponse<FireCheckListItemCO> add(@Validated @RequestBody FireCheckListItemAddCmd cmd) {
|
||||
SSOUser ssoUser = AuthContext.getCurrentUser();
|
||||
return fireCheckListItemService.add(cmd);
|
||||
}
|
||||
|
||||
@ApiOperation("分页")
|
||||
@PostMapping("/list")
|
||||
public PageResponse<FireCheckListItemCO> page(@RequestBody FireCheckListItemPageQry qry) {
|
||||
return fireCheckListItemService.listPage(qry);
|
||||
}
|
||||
|
||||
@ApiOperation("所有数据")
|
||||
@GetMapping("/listAll")
|
||||
public MultiResponse<FireCheckListItemCO> listAll() {
|
||||
return MultiResponse.of(new ArrayList<FireCheckListItemCO>());
|
||||
}
|
||||
|
||||
@ApiOperation("详情")
|
||||
@GetMapping("/{id}")
|
||||
public SingleResponse<FireCheckListItemCO> getInfoById(@PathVariable("id") Long id) {
|
||||
return SingleResponse.of(new FireCheckListItemCO());
|
||||
}
|
||||
|
||||
@ApiOperation("删除")
|
||||
@DeleteMapping("/{id}")
|
||||
public Response remove(@PathVariable("id") Long id) {
|
||||
fireCheckListItemService.remove(id);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
|
||||
@ApiOperation("删除多个")
|
||||
@DeleteMapping("/ids")
|
||||
public Response removeBatch(@RequestParam Long[] ids) {
|
||||
fireCheckListItemService.removeBatch(ids);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
|
||||
@ApiOperation("修改")
|
||||
@PutMapping("/edit")
|
||||
public SingleResponse edit(@Validated @RequestBody FireCheckListItemUpdateCmd fireCheckListItemUpdateCmd) {
|
||||
fireCheckListItemService.edit(fireCheckListItemUpdateCmd);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,83 @@
|
|||
package com.zcloud.fire.check.web;
|
||||
|
||||
|
||||
import com.alibaba.cola.dto.MultiResponse;
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.Response;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.jjb.saas.framework.auth.model.SSOUser;
|
||||
import com.jjb.saas.framework.auth.utils.AuthContext;
|
||||
import com.zcloud.fire.check.api.FireCheckListUserServiceI;
|
||||
import com.zcloud.fire.check.dto.FireCheckListUserAddCmd;
|
||||
import com.zcloud.fire.check.dto.FireCheckListUserPageQry;
|
||||
import com.zcloud.fire.check.dto.FireCheckListUserUpdateCmd;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckListUserCO;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* web-adapter
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-11 15:32:49
|
||||
*/
|
||||
@Api(tags = "消防点位检查负责人表",hidden = true)
|
||||
@RequestMapping("/${application.gateway}/fireCheckListUser")
|
||||
@RestController
|
||||
@AllArgsConstructor
|
||||
@Deprecated
|
||||
public class FireCheckListUserController {
|
||||
private final FireCheckListUserServiceI fireCheckListUserService;
|
||||
|
||||
@ApiOperation("新增")
|
||||
@PostMapping("/save")
|
||||
public SingleResponse<FireCheckListUserCO> add(@Validated @RequestBody FireCheckListUserAddCmd cmd) {
|
||||
SSOUser ssoUser = AuthContext.getCurrentUser();
|
||||
return fireCheckListUserService.add(cmd);
|
||||
}
|
||||
|
||||
@ApiOperation("分页")
|
||||
@PostMapping("/list")
|
||||
public PageResponse<FireCheckListUserCO> page(@RequestBody FireCheckListUserPageQry qry) {
|
||||
return fireCheckListUserService.listPage(qry);
|
||||
}
|
||||
|
||||
@ApiOperation("所有数据")
|
||||
@GetMapping("/listAll")
|
||||
public MultiResponse<FireCheckListUserCO> listAll() {
|
||||
return MultiResponse.of(new ArrayList<FireCheckListUserCO>());
|
||||
}
|
||||
|
||||
@ApiOperation("详情")
|
||||
@GetMapping("/{id}")
|
||||
public SingleResponse<FireCheckListUserCO> getInfoById(@PathVariable("id") Long id) {
|
||||
return SingleResponse.of(new FireCheckListUserCO());
|
||||
}
|
||||
|
||||
@ApiOperation("删除")
|
||||
@DeleteMapping("/{id}")
|
||||
public Response remove(@PathVariable("id") Long id) {
|
||||
fireCheckListUserService.remove(id);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
|
||||
@ApiOperation("删除多个")
|
||||
@DeleteMapping("/ids")
|
||||
public Response removeBatch(@RequestParam Long[] ids) {
|
||||
fireCheckListUserService.removeBatch(ids);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
|
||||
@ApiOperation("修改")
|
||||
@PutMapping("/edit")
|
||||
public SingleResponse edit(@Validated @RequestBody FireCheckListUserUpdateCmd fireCheckListUserUpdateCmd) {
|
||||
fireCheckListUserService.edit(fireCheckListUserUpdateCmd);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,77 @@
|
|||
package com.zcloud.fire.check.web;
|
||||
|
||||
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.Response;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.jjb.saas.framework.auth.model.SSOUser;
|
||||
import com.jjb.saas.framework.auth.utils.AuthContext;
|
||||
import com.zcloud.fire.check.api.FireCheckRecordServiceI;
|
||||
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 io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
/**
|
||||
* web-adapter
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:58
|
||||
*/
|
||||
@Api(tags = "消防点位检查记录表")
|
||||
@RequestMapping("/${application.gateway}/fireCheckRecord")
|
||||
@RestController
|
||||
@AllArgsConstructor
|
||||
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) {
|
||||
return fireCheckRecordService.listPage(qry);
|
||||
}
|
||||
|
||||
@ApiOperation("检查记录详情")
|
||||
@GetMapping("/getInfoById/{id}")
|
||||
public SingleResponse<FireCheckRecordCO> getInfoById(@PathVariable("id") Long id) {
|
||||
return SingleResponse.of(fireCheckRecordService.getInfoById(id));
|
||||
}
|
||||
|
||||
@ApiOperation("删除")
|
||||
@GetMapping("/remove/{id}")
|
||||
public Response remove(@PathVariable("id") Long id) {
|
||||
fireCheckRecordService.remove(id);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
|
||||
@ApiOperation("删除多个")
|
||||
@DeleteMapping("/ids")
|
||||
public Response removeBatch(@RequestParam Long[] ids) {
|
||||
fireCheckRecordService.removeBatch(ids);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
|
||||
@ApiOperation("股份端-分公司消防检查记录")
|
||||
@PostMapping("/corpCheckRecordList")
|
||||
public PageResponse<CorpCheckStatisticsCO> corpCheckRecordList(@RequestBody CorpStatisticsPageQry qry) {
|
||||
return fireCheckRecordService.corpCheckRecordList(qry);
|
||||
}
|
||||
@ApiOperation("和H5扫码点位显示检查记录)")
|
||||
@PostMapping("/getCheckRecordPageH5")
|
||||
public PageResponse<FireCheckRecordCO> getCheckRecordPageH5(@Validated @RequestBody FireCheckRecordPagePointQry qry) {
|
||||
return fireCheckRecordService.getCheckRecordPageH5(qry);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
package com.zcloud.fire.check.web;
|
||||
|
||||
|
||||
import com.alibaba.cola.dto.MultiResponse;
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.Response;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.jjb.saas.framework.auth.model.SSOUser;
|
||||
import com.jjb.saas.framework.auth.utils.AuthContext;
|
||||
import com.zcloud.fire.check.api.FireCheckRecordDeviceServiceI;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordDeviceAddCmd;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordDevicePageQry;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordDeviceUpdateCmd;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckRecordDeviceCO;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* web-adapter
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:02
|
||||
*/
|
||||
@Api(tags = "消防点位检查记录消防器材表")
|
||||
@RequestMapping("/${application.gateway}/fireCheckRecordDevice")
|
||||
@RestController
|
||||
@AllArgsConstructor
|
||||
public class FireCheckRecordDeviceController {
|
||||
private final FireCheckRecordDeviceServiceI fireCheckRecordDeviceService;
|
||||
|
||||
|
||||
|
||||
@ApiOperation("打回修改")
|
||||
@PostMapping("/edit")
|
||||
public SingleResponse edit(@Validated @RequestBody FireCheckRecordDeviceUpdateCmd fireCheckRecordDeviceUpdateCmd) {
|
||||
fireCheckRecordDeviceService.edit(fireCheckRecordDeviceUpdateCmd);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,83 @@
|
|||
package com.zcloud.fire.check.web;
|
||||
|
||||
|
||||
import com.alibaba.cola.dto.MultiResponse;
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.Response;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.jjb.saas.framework.auth.model.SSOUser;
|
||||
import com.jjb.saas.framework.auth.utils.AuthContext;
|
||||
import com.zcloud.fire.check.api.FireCheckRecordHiddenServiceI;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordHiddenAddCmd;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordHiddenPageQry;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordHiddenUpdateCmd;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckRecordHiddenCO;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* web-adapter
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:11:15
|
||||
*/
|
||||
@Api(tags = "消防点位检查记录隐患表",hidden = true)
|
||||
@RequestMapping("/${application.gateway}/fireCheckRecordHidden")
|
||||
@RestController
|
||||
@AllArgsConstructor
|
||||
@Deprecated
|
||||
public class FireCheckRecordHiddenController {
|
||||
private final FireCheckRecordHiddenServiceI fireCheckRecordHiddenService;
|
||||
|
||||
@ApiOperation("新增")
|
||||
@PostMapping("/save")
|
||||
public SingleResponse<FireCheckRecordHiddenCO> add(@Validated @RequestBody FireCheckRecordHiddenAddCmd cmd) {
|
||||
SSOUser ssoUser = AuthContext.getCurrentUser();
|
||||
return fireCheckRecordHiddenService.add(cmd);
|
||||
}
|
||||
|
||||
@ApiOperation("分页")
|
||||
@PostMapping("/list")
|
||||
public PageResponse<FireCheckRecordHiddenCO> page(@RequestBody FireCheckRecordHiddenPageQry qry) {
|
||||
return fireCheckRecordHiddenService.listPage(qry);
|
||||
}
|
||||
|
||||
@ApiOperation("所有数据")
|
||||
@GetMapping("/listAll")
|
||||
public MultiResponse<FireCheckRecordHiddenCO> listAll() {
|
||||
return MultiResponse.of(new ArrayList<FireCheckRecordHiddenCO>());
|
||||
}
|
||||
|
||||
@ApiOperation("详情")
|
||||
@GetMapping("/{id}")
|
||||
public SingleResponse<FireCheckRecordHiddenCO> getInfoById(@PathVariable("id") Long id) {
|
||||
return SingleResponse.of(new FireCheckRecordHiddenCO());
|
||||
}
|
||||
|
||||
@ApiOperation("删除")
|
||||
@DeleteMapping("/{id}")
|
||||
public Response remove(@PathVariable("id") Long id) {
|
||||
fireCheckRecordHiddenService.remove(id);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
|
||||
@ApiOperation("删除多个")
|
||||
@DeleteMapping("/ids")
|
||||
public Response removeBatch(@RequestParam Long[] ids) {
|
||||
fireCheckRecordHiddenService.removeBatch(ids);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
|
||||
@ApiOperation("修改")
|
||||
@PutMapping("/edit")
|
||||
public SingleResponse edit(@Validated @RequestBody FireCheckRecordHiddenUpdateCmd fireCheckRecordHiddenUpdateCmd) {
|
||||
fireCheckRecordHiddenService.edit(fireCheckRecordHiddenUpdateCmd);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,83 @@
|
|||
package com.zcloud.fire.check.web;
|
||||
|
||||
|
||||
import com.alibaba.cola.dto.MultiResponse;
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.Response;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.jjb.saas.framework.auth.model.SSOUser;
|
||||
import com.jjb.saas.framework.auth.utils.AuthContext;
|
||||
import com.zcloud.fire.check.api.FireCheckRecordPointServiceI;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordPointAddCmd;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordPointPageQry;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordPointUpdateCmd;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckRecordPointCO;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* web-adapter
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:19
|
||||
*/
|
||||
@Api(tags = "消防点位检查记录点位表",hidden = true)
|
||||
@RequestMapping("/${application.gateway}/fireCheckRecordPoint")
|
||||
@RestController
|
||||
@AllArgsConstructor
|
||||
@Deprecated
|
||||
public class FireCheckRecordPointController {
|
||||
private final FireCheckRecordPointServiceI fireCheckRecordPointService;
|
||||
|
||||
@ApiOperation("新增")
|
||||
@PostMapping("/save")
|
||||
public SingleResponse<FireCheckRecordPointCO> add(@Validated @RequestBody FireCheckRecordPointAddCmd cmd) {
|
||||
SSOUser ssoUser = AuthContext.getCurrentUser();
|
||||
return fireCheckRecordPointService.add(cmd);
|
||||
}
|
||||
|
||||
@ApiOperation("分页")
|
||||
@PostMapping("/list")
|
||||
public PageResponse<FireCheckRecordPointCO> page(@RequestBody FireCheckRecordPointPageQry qry) {
|
||||
return fireCheckRecordPointService.listPage(qry);
|
||||
}
|
||||
|
||||
@ApiOperation("所有数据")
|
||||
@GetMapping("/listAll")
|
||||
public MultiResponse<FireCheckRecordPointCO> listAll() {
|
||||
return MultiResponse.of(new ArrayList<FireCheckRecordPointCO>());
|
||||
}
|
||||
|
||||
@ApiOperation("详情")
|
||||
@GetMapping("/{id}")
|
||||
public SingleResponse<FireCheckRecordPointCO> getInfoById(@PathVariable("id") Long id) {
|
||||
return SingleResponse.of(new FireCheckRecordPointCO());
|
||||
}
|
||||
|
||||
@ApiOperation("删除")
|
||||
@DeleteMapping("/{id}")
|
||||
public Response remove(@PathVariable("id") Long id) {
|
||||
fireCheckRecordPointService.remove(id);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
|
||||
@ApiOperation("删除多个")
|
||||
@DeleteMapping("/ids")
|
||||
public Response removeBatch(@RequestParam Long[] ids) {
|
||||
fireCheckRecordPointService.removeBatch(ids);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
|
||||
@ApiOperation("修改")
|
||||
@PutMapping("/edit")
|
||||
public SingleResponse edit(@Validated @RequestBody FireCheckRecordPointUpdateCmd fireCheckRecordPointUpdateCmd) {
|
||||
fireCheckRecordPointService.edit(fireCheckRecordPointUpdateCmd);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,83 @@
|
|||
package com.zcloud.fire.check.web;
|
||||
|
||||
|
||||
import com.alibaba.cola.dto.MultiResponse;
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.Response;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.jjb.saas.framework.auth.model.SSOUser;
|
||||
import com.jjb.saas.framework.auth.utils.AuthContext;
|
||||
import com.zcloud.fire.check.api.FireCheckRecordUserServiceI;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordUserAddCmd;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordUserPageQry;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordUserUpdateCmd;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckRecordUserCO;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* web-adapter
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:12:04
|
||||
*/
|
||||
@Api(tags = "消防点位检查用户表",hidden = true)
|
||||
@RequestMapping("/${application.gateway}/fireCheckRecordUser")
|
||||
@RestController
|
||||
@AllArgsConstructor
|
||||
@Deprecated
|
||||
public class FireCheckRecordUserController {
|
||||
private final FireCheckRecordUserServiceI fireCheckRecordUserService;
|
||||
|
||||
@ApiOperation("新增")
|
||||
@PostMapping("/save")
|
||||
public SingleResponse<FireCheckRecordUserCO> add(@Validated @RequestBody FireCheckRecordUserAddCmd cmd) {
|
||||
SSOUser ssoUser = AuthContext.getCurrentUser();
|
||||
return fireCheckRecordUserService.add(cmd);
|
||||
}
|
||||
|
||||
@ApiOperation("分页")
|
||||
@PostMapping("/list")
|
||||
public PageResponse<FireCheckRecordUserCO> page(@RequestBody FireCheckRecordUserPageQry qry) {
|
||||
return fireCheckRecordUserService.listPage(qry);
|
||||
}
|
||||
|
||||
@ApiOperation("所有数据")
|
||||
@GetMapping("/listAll")
|
||||
public MultiResponse<FireCheckRecordUserCO> listAll() {
|
||||
return MultiResponse.of(new ArrayList<FireCheckRecordUserCO>());
|
||||
}
|
||||
|
||||
@ApiOperation("详情")
|
||||
@GetMapping("/{id}")
|
||||
public SingleResponse<FireCheckRecordUserCO> getInfoById(@PathVariable("id") Long id) {
|
||||
return SingleResponse.of(new FireCheckRecordUserCO());
|
||||
}
|
||||
|
||||
@ApiOperation("删除")
|
||||
@DeleteMapping("/{id}")
|
||||
public Response remove(@PathVariable("id") Long id) {
|
||||
fireCheckRecordUserService.remove(id);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
|
||||
@ApiOperation("删除多个")
|
||||
@DeleteMapping("/ids")
|
||||
public Response removeBatch(@RequestParam Long[] ids) {
|
||||
fireCheckRecordUserService.removeBatch(ids);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
|
||||
@ApiOperation("修改")
|
||||
@PutMapping("/edit")
|
||||
public SingleResponse edit(@Validated @RequestBody FireCheckRecordUserUpdateCmd fireCheckRecordUserUpdateCmd) {
|
||||
fireCheckRecordUserService.edit(fireCheckRecordUserUpdateCmd);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -56,13 +56,13 @@ public class FireCheckStandardController {
|
|||
}
|
||||
|
||||
@ApiOperation("消防检查标准详情")
|
||||
@PostMapping("/info/{id}")
|
||||
@GetMapping("/getInfoById/{id}")
|
||||
public SingleResponse<FireCheckStandardCO> getInfoById(@PathVariable("id") Long id) {
|
||||
return SingleResponse.of(fireCheckStandardService.getInfoById(id));
|
||||
}
|
||||
|
||||
@ApiOperation("消防检查标准-删除")
|
||||
@PostMapping("/remove/{id}")
|
||||
@GetMapping("/remove/{id}")
|
||||
public Response remove(@PathVariable("id") Long id) {
|
||||
fireCheckStandardService.remove(id);
|
||||
return SingleResponse.buildSuccess();
|
||||
|
|
@ -83,10 +83,9 @@ public class FireCheckStandardController {
|
|||
}
|
||||
@ApiOperation("消防检查标准-导入")
|
||||
@PostMapping("/importFireCheckStandardList")
|
||||
public Response importFireCheckStandardList( @RequestPart(value = "file") MultipartFile file,
|
||||
@Validated FireCheckStandardImportCmd fireCheckStandardImportCmd
|
||||
public Response importFireCheckStandardList(@Validated FireCheckStandardImportCmd fireCheckStandardImportCmd
|
||||
) {
|
||||
fireCheckStandardService.importFireCheckStandardList(file,fireCheckStandardImportCmd);
|
||||
fireCheckStandardService.importFireCheckStandardList(fireCheckStandardImportCmd);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,9 +7,12 @@ import com.alibaba.cola.dto.Response;
|
|||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.jjb.saas.framework.auth.model.SSOUser;
|
||||
import com.jjb.saas.framework.auth.utils.AuthContext;
|
||||
import com.zcloud.fire.check.api.FireCheckListServiceI;
|
||||
import com.zcloud.fire.check.api.FireDeviceServiceI;
|
||||
import com.zcloud.fire.check.dto.*;
|
||||
import com.zcloud.fire.check.dto.clientobject.CorpStatisticsCO;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireDeviceCO;
|
||||
import com.zcloud.fire.check.dto.clientobject.RiskDistributionStasticCO;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.AllArgsConstructor;
|
||||
|
|
@ -32,6 +35,7 @@ import java.util.ArrayList;
|
|||
@AllArgsConstructor
|
||||
public class FireDeviceController {
|
||||
private final FireDeviceServiceI fireDeviceService;
|
||||
private final FireCheckListServiceI fireCheckListService;
|
||||
|
||||
@ApiOperation("消防器材新增")
|
||||
@PostMapping("/save")
|
||||
|
|
@ -39,20 +43,20 @@ public class FireDeviceController {
|
|||
return fireDeviceService.add(cmd);
|
||||
}
|
||||
|
||||
@ApiOperation("分页")
|
||||
@ApiOperation("消防器材分页")
|
||||
@PostMapping("/list")
|
||||
public PageResponse<FireDeviceCO> page(@RequestBody FireDevicePageQry qry) {
|
||||
return fireDeviceService.listPage(qry);
|
||||
}
|
||||
|
||||
@ApiOperation("消防器材详情")
|
||||
@PostMapping("/info/{id}")
|
||||
@GetMapping("/getInfoById/{id}")
|
||||
public SingleResponse<FireDeviceCO> getInfoById(@PathVariable("id") Long id) {
|
||||
return SingleResponse.of(fireDeviceService.getInfoById(id));
|
||||
}
|
||||
|
||||
@ApiOperation("删除")
|
||||
@PostMapping("/remove/{id}")
|
||||
@GetMapping("/remove/{id}")
|
||||
public Response remove(@PathVariable("id") Long id) {
|
||||
fireDeviceService.remove(id);
|
||||
return SingleResponse.buildSuccess();
|
||||
|
|
@ -87,5 +91,21 @@ public class FireDeviceController {
|
|||
return MultiResponse.of(fireDeviceService.getAllList(qry));
|
||||
}
|
||||
|
||||
@ApiOperation("股份端-消防器材统计汇总首页分页")
|
||||
@PostMapping("/corpStatisticslist")
|
||||
public PageResponse<CorpStatisticsCO> corpStatisticslist(@RequestBody CorpStatisticsPageQry qry) {
|
||||
return fireDeviceService.corpStatisticslist(qry);
|
||||
}
|
||||
@ApiOperation("股份端-消防器材统计汇总首页总数")
|
||||
@GetMapping("/corpStatisticsTotal")
|
||||
public SingleResponse<RiskDistributionStasticCO> corpStatisticsTotal() {
|
||||
return SingleResponse.of(fireCheckListService.riskDistributionStatistic());
|
||||
}
|
||||
|
||||
@ApiOperation("H5s扫码-点位分布-消防器材分页查询，(H5扫码点位分布可使用)")
|
||||
@PostMapping("/pageByPointId")
|
||||
public PageResponse<FireDeviceCO> pageByPointId(@RequestBody FireDevicePageQry qry) {
|
||||
return fireDeviceService.listPage(qry);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -51,13 +51,13 @@ public class FirePointController {
|
|||
}
|
||||
|
||||
@ApiOperation("消防点位详情")
|
||||
@PostMapping("/info/{id}")
|
||||
@GetMapping("/getInfoById/{id}")
|
||||
public SingleResponse<FirePointCO> getInfoById(@PathVariable("id") Long id) {
|
||||
return SingleResponse.of(firePointService.getInfoById(id));
|
||||
}
|
||||
|
||||
@ApiOperation("删除")
|
||||
@PostMapping("/remove/{id}")
|
||||
@GetMapping("/remove/{id}")
|
||||
public Response remove(@PathVariable("id") Long id) {
|
||||
firePointService.remove(id);
|
||||
return SingleResponse.buildSuccess();
|
||||
|
|
|
|||
|
|
@ -44,13 +44,13 @@ public class FireRegionController {
|
|||
}
|
||||
|
||||
@ApiOperation("详情")
|
||||
@PostMapping("/info/{id}")
|
||||
@GetMapping("/getInfoById/{id}")
|
||||
public SingleResponse<FireRegionCO> getInfoById(@PathVariable("id") Long id) {
|
||||
return SingleResponse.of(fireRegionService.getInfoById(id));
|
||||
}
|
||||
|
||||
@ApiOperation("删除")
|
||||
@PostMapping("/remove/{id}")
|
||||
@GetMapping("/remove/{id}")
|
||||
public Response remove(@PathVariable("id") Long id) {
|
||||
fireRegionService.remove(id);
|
||||
return SingleResponse.buildSuccess();
|
||||
|
|
|
|||
|
|
@ -0,0 +1,65 @@
|
|||
package com.zcloud.fire.check.command;
|
||||
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckListGateway;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckListItemGateway;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckListUserGateway;
|
||||
import com.zcloud.fire.check.domain.model.FireCheckListE;
|
||||
import com.zcloud.fire.check.domain.model.FireCheckListItemE;
|
||||
import com.zcloud.fire.check.domain.model.FireCheckListUserE;
|
||||
import com.zcloud.fire.check.dto.FireCheckListAddCmd;
|
||||
import com.zcloud.fire.check.persistence.repository.FireCheckListRepository;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:08
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckListAddExe {
|
||||
private final FireCheckListGateway fireCheckListGateway;
|
||||
private final FireCheckListRepository fireCheckListRepository;
|
||||
private final FireCheckListItemGateway fireCheckListItemGateway;
|
||||
private final FireCheckListUserGateway fireCheckListUserGateway;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(FireCheckListAddCmd cmd) {
|
||||
//可以是多个负责人
|
||||
FireCheckListE fireCheckListE = new FireCheckListE();
|
||||
BeanUtils.copyProperties(cmd, fireCheckListE);
|
||||
boolean res = false;
|
||||
try {
|
||||
res = fireCheckListGateway.add(fireCheckListE);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
if (!res) {
|
||||
throw new BizException("保存失败");
|
||||
}
|
||||
//新增负责人信息
|
||||
FireCheckListUserE fireCHeckListUserE = new FireCheckListUserE();
|
||||
List<FireCheckListUserE> fireCheckListUserEList = fireCHeckListUserE.initUser(cmd.getUserIdList(),cmd.getDepartmentId(),fireCheckListE);
|
||||
fireCheckListUserGateway.addBath(fireCheckListUserEList);
|
||||
//新增检查项
|
||||
cmd.getFireCheckListItemAddCmdList().forEach(fireCheckListItemAddCmd -> {
|
||||
FireCheckListItemE fireCheckListItemE = new FireCheckListItemE();
|
||||
BeanUtils.copyProperties(fireCheckListItemAddCmd, fireCheckListItemE);
|
||||
fireCheckListItemE.setFireCheckId(fireCheckListE.getFireCheckId());
|
||||
boolean itemRes = fireCheckListItemGateway.add(fireCheckListItemE);
|
||||
if (!itemRes) {
|
||||
throw new BizException("检查器材保存失败");
|
||||
}
|
||||
});
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
package com.zcloud.fire.check.command;
|
||||
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckListItemGateway;
|
||||
import com.zcloud.fire.check.domain.model.FireCheckListItemE;
|
||||
import com.zcloud.fire.check.dto.FireCheckListItemAddCmd;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:28
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckListItemAddExe {
|
||||
private final FireCheckListItemGateway fireCheckListItemGateway;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(FireCheckListItemAddCmd cmd) {
|
||||
FireCheckListItemE fireCheckListItemE = new FireCheckListItemE();
|
||||
BeanUtils.copyProperties(cmd, fireCheckListItemE);
|
||||
boolean res = false;
|
||||
try {
|
||||
res = fireCheckListItemGateway.add(fireCheckListItemE);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
if (!res) {
|
||||
throw new BizException("保存失败");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
package com.zcloud.fire.check.command;
|
||||
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckListItemGateway;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:28
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckListItemRemoveExe {
|
||||
private final FireCheckListItemGateway fireCheckListItemGateway;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(Long id) {
|
||||
boolean res = fireCheckListItemGateway.deletedFireCheckListItemById(id);
|
||||
if (!res) {
|
||||
throw new BizException("删除失败");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(Long[] ids) {
|
||||
boolean res = fireCheckListItemGateway.deletedFireCheckListItemByIds(ids);
|
||||
if (!res) {
|
||||
throw new BizException("删除失败");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
package com.zcloud.fire.check.command;
|
||||
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckListItemGateway;
|
||||
import com.zcloud.fire.check.domain.model.FireCheckListItemE;
|
||||
import com.zcloud.fire.check.dto.FireCheckListItemUpdateCmd;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:29
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckListItemUpdateExe {
|
||||
private final FireCheckListItemGateway fireCheckListItemGateway;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void execute(FireCheckListItemUpdateCmd fireCheckListItemUpdateCmd) {
|
||||
FireCheckListItemE fireCheckListItemE = new FireCheckListItemE();
|
||||
BeanUtils.copyProperties(fireCheckListItemUpdateCmd, fireCheckListItemE);
|
||||
boolean res = fireCheckListItemGateway.update(fireCheckListItemE);
|
||||
if (!res) {
|
||||
throw new BizException("修改失败");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
package com.zcloud.fire.check.command;
|
||||
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckListGateway;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:09
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckListRemoveExe {
|
||||
private final FireCheckListGateway fireCheckListGateway;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(Long id) {
|
||||
boolean res = fireCheckListGateway.deletedFireCheckListById(id);
|
||||
if (!res) {
|
||||
throw new BizException("删除失败");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(Long[] ids) {
|
||||
boolean res = fireCheckListGateway.deletedFireCheckListByIds(ids);
|
||||
if (!res) {
|
||||
throw new BizException("删除失败");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,87 @@
|
|||
package com.zcloud.fire.check.command;
|
||||
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckListGateway;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckListItemGateway;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckListUserGateway;
|
||||
import com.zcloud.fire.check.domain.model.FireCheckListE;
|
||||
import com.zcloud.fire.check.domain.model.FireCheckListItemE;
|
||||
import com.zcloud.fire.check.domain.model.FireCheckListUserE;
|
||||
import com.zcloud.fire.check.dto.FireCheckListUpdateCmd;
|
||||
import com.zcloud.fire.check.dto.FireCheckListUpdateStateCmd;
|
||||
import com.zcloud.fire.check.persistence.dataobject.FireCheckListDO;
|
||||
import com.zcloud.fire.check.persistence.repository.FireCheckListItemRepository;
|
||||
import com.zcloud.fire.check.persistence.repository.FireCheckListRepository;
|
||||
import com.zcloud.fire.check.persistence.repository.FireCheckListUserRepository;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:10
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckListUpdateExe {
|
||||
private final FireCheckListGateway fireCheckListGateway;
|
||||
private final FireCheckListRepository fireCheckListRepository;
|
||||
private final FireCheckListItemGateway fireCheckListItemGateway;
|
||||
private final FireCheckListItemRepository fireCheckListItemRepository;
|
||||
private final FireCheckListUserRepository fireCheckListUserRepository;
|
||||
private final FireCheckListUserGateway fireCheckListUserGateway;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void execute(FireCheckListUpdateCmd fireCheckListUpdateCmd) {
|
||||
//数据是否存在
|
||||
FireCheckListDO fireCheckListDO = fireCheckListRepository.getById(fireCheckListUpdateCmd.getId());
|
||||
if (fireCheckListDO == null) {
|
||||
throw new BizException("数据不存在");
|
||||
}
|
||||
FireCheckListE fireCheckListE = new FireCheckListE();
|
||||
BeanUtils.copyProperties(fireCheckListUpdateCmd, fireCheckListE);
|
||||
boolean res = fireCheckListGateway.update(fireCheckListE);
|
||||
if (!res) {
|
||||
throw new BizException("修改失败");
|
||||
}
|
||||
fireCheckListE.setFireCheckId(fireCheckListDO.getFireCheckId());
|
||||
//删除负责人信息再添加
|
||||
if(fireCheckListUpdateCmd.getUserIdList() != null) {
|
||||
fireCheckListUserRepository.deleteByFireCheckListId(fireCheckListDO.getFireCheckId());
|
||||
FireCheckListUserE fireCHeckListUserE = new FireCheckListUserE();
|
||||
List<FireCheckListUserE> fireCheckListUserEList = fireCHeckListUserE.initUser(fireCheckListUpdateCmd.getUserIdList(),fireCheckListUpdateCmd.getDepartmentId(),fireCheckListE);
|
||||
fireCheckListUserGateway.addBath(fireCheckListUserEList);
|
||||
|
||||
}
|
||||
|
||||
|
||||
//删除所有消防器材
|
||||
fireCheckListItemRepository.deleteByFireCheckId(fireCheckListDO.getFireCheckId());
|
||||
//新增消防器材
|
||||
fireCheckListUpdateCmd.getFireCheckListItemAddCmdList().forEach(fireCheckListItemAddCmd -> {
|
||||
FireCheckListItemE fireCheckListItemE = new FireCheckListItemE();
|
||||
BeanUtils.copyProperties(fireCheckListItemAddCmd, fireCheckListItemE);
|
||||
fireCheckListItemE.setFireCheckId(fireCheckListE.getFireCheckId());
|
||||
boolean itemRes = fireCheckListItemGateway.add(fireCheckListItemE);
|
||||
if (!itemRes) {
|
||||
throw new BizException("检查器材保存失败");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void editState(FireCheckListUpdateStateCmd fireCheckListUpdateStateCmd) {
|
||||
FireCheckListE fireCheckListE = new FireCheckListE();
|
||||
BeanUtils.copyProperties(fireCheckListUpdateStateCmd, fireCheckListE);
|
||||
boolean res = fireCheckListGateway.update(fireCheckListE);
|
||||
if (!res) {
|
||||
throw new BizException("修改失败");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
package com.zcloud.fire.check.command;
|
||||
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckListUserGateway;
|
||||
import com.zcloud.fire.check.domain.model.FireCheckListUserE;
|
||||
import com.zcloud.fire.check.dto.FireCheckListUserAddCmd;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-11 15:32:49
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckListUserAddExe {
|
||||
private final FireCheckListUserGateway fireCheckListUserGateway;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(FireCheckListUserAddCmd cmd) {
|
||||
FireCheckListUserE fireCheckListUserE = new FireCheckListUserE();
|
||||
BeanUtils.copyProperties(cmd, fireCheckListUserE);
|
||||
boolean res = false;
|
||||
try {
|
||||
res = fireCheckListUserGateway.add(fireCheckListUserE);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
if (!res) {
|
||||
throw new BizException("保存失败");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
package com.zcloud.fire.check.command;
|
||||
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckListUserGateway;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-11 15:32:50
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckListUserRemoveExe {
|
||||
private final FireCheckListUserGateway fireCheckListUserGateway;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(Long id) {
|
||||
boolean res = fireCheckListUserGateway.deletedFireCheckListUserById(id);
|
||||
if (!res) {
|
||||
throw new BizException("删除失败");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(Long[] ids) {
|
||||
boolean res = fireCheckListUserGateway.deletedFireCheckListUserByIds(ids);
|
||||
if (!res) {
|
||||
throw new BizException("删除失败");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
package com.zcloud.fire.check.command;
|
||||
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckListUserGateway;
|
||||
import com.zcloud.fire.check.domain.model.FireCheckListUserE;
|
||||
import com.zcloud.fire.check.dto.FireCheckListUserUpdateCmd;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-11 15:32:50
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckListUserUpdateExe {
|
||||
private final FireCheckListUserGateway fireCheckListUserGateway;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void execute(FireCheckListUserUpdateCmd fireCheckListUserUpdateCmd) {
|
||||
FireCheckListUserE fireCheckListUserE = new FireCheckListUserE();
|
||||
BeanUtils.copyProperties(fireCheckListUserUpdateCmd, fireCheckListUserE);
|
||||
boolean res = fireCheckListUserGateway.update(fireCheckListUserE);
|
||||
if (!res) {
|
||||
throw new BizException("修改失败");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,126 @@
|
|||
package com.zcloud.fire.check.command;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.zcloud.fire.check.domain.enums.CommonFlagEnum;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckRecordGateway;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckRecordHiddenGateway;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckRecordUserGateway;
|
||||
import com.zcloud.fire.check.domain.model.FireCheckRecordE;
|
||||
import com.zcloud.fire.check.domain.model.FireCheckRecordHiddenE;
|
||||
import com.zcloud.fire.check.domain.model.FireCheckRecordUserE;
|
||||
import com.zcloud.fire.check.dto.AppCheckRecordAddCmd;
|
||||
import com.zcloud.fire.check.dto.CorpStatisticsPageQry;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordAddCmd;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordUserAddCmd;
|
||||
import com.zcloud.fire.check.dto.clientobject.CorpStatisticsCO;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckRecordCO;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckRecordPointCO;
|
||||
import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordDO;
|
||||
import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordHiddenDO;
|
||||
import com.zcloud.fire.check.persistence.repository.FireCheckRecordHiddenRepository;
|
||||
import com.zcloud.fire.check.persistence.repository.FireCheckRecordRepository;
|
||||
import com.zcloud.gbscommon.zcloudhidden.face.ZcloudHiddenFacade;
|
||||
import com.zcloud.gbscommon.zcloudhidden.request.HiddenAddCmd;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.dubbo.config.annotation.DubboReference;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:58
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
@Slf4j
|
||||
public class FireCheckRecordAddExe {
|
||||
private final FireCheckRecordGateway fireCheckRecordGateway;
|
||||
private final FireCheckRecordRepository fireCheckRecordRepository;
|
||||
private final FireCheckRecordUserGateway checkRecordUserGateway;
|
||||
private final FireCheckRecordHiddenGateway fireCheckRecordHiddenGateway;
|
||||
private final FireCheckRecordHiddenRepository checkRecordHiddenRepository;
|
||||
private final FireCheckRecordHiddenRepository fireCheckRecordHiddenRepository;
|
||||
@DubboReference
|
||||
private final ZcloudHiddenFacade zcloudHiddenFacade;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(FireCheckRecordAddCmd cmd) {
|
||||
FireCheckRecordE fireCheckRecordE = new FireCheckRecordE();
|
||||
BeanUtils.copyProperties(cmd, fireCheckRecordE);
|
||||
boolean res = false;
|
||||
try {
|
||||
res = fireCheckRecordGateway.add(fireCheckRecordE);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
if (!res) {
|
||||
throw new BizException("保存失败");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public FireCheckRecordCO saveCheckRecord(AppCheckRecordAddCmd appCheckRecordAddCmd) {
|
||||
// 检查点位信息
|
||||
FireCheckRecordDO fireCheckRecordDO = fireCheckRecordRepository.getChecKRecordInfo(appCheckRecordAddCmd.getFireRecordId());
|
||||
if (fireCheckRecordDO == null) {
|
||||
throw new BizException("检查记录不存在");
|
||||
}
|
||||
FireCheckRecordE fireCheckRecordE = new FireCheckRecordE();
|
||||
BeanUtils.copyProperties(appCheckRecordAddCmd, fireCheckRecordE);
|
||||
fireCheckRecordE.setId(fireCheckRecordDO.getId());
|
||||
fireCheckRecordE.setFinishedFlag(CommonFlagEnum.YES.getCode());
|
||||
Boolean update = fireCheckRecordGateway.update(fireCheckRecordE);
|
||||
if (!update) {
|
||||
throw new BizException("修改失败");
|
||||
}
|
||||
//先删除后新增，打回重复提交的
|
||||
fireCheckRecordE.setFireCheckId(fireCheckRecordDO.getFireCheckId());
|
||||
checkRecordUserGateway.deletedByCheckRecordId(appCheckRecordAddCmd.getFireRecordId());
|
||||
appCheckRecordAddCmd.getFireCheckRecordUserAddCmdList().forEach(info -> {
|
||||
FireCheckRecordUserE checkRecordUserE = new FireCheckRecordUserE();
|
||||
BeanUtils.copyProperties(info, checkRecordUserE);
|
||||
checkRecordUserE.init(fireCheckRecordE);
|
||||
checkRecordUserGateway.add(checkRecordUserE);
|
||||
});
|
||||
// 查找隐患，存在更新或删除，不存在新增
|
||||
List<FireCheckRecordHiddenDO> fireCheckRecordHiddenDOList = checkRecordHiddenRepository.getByOtherCheckRecordId(appCheckRecordAddCmd.getFireRecordId());
|
||||
if(CollUtil.isNotEmpty(fireCheckRecordHiddenDOList)){
|
||||
fireCheckRecordHiddenDOList.forEach(info->{
|
||||
checkRecordHiddenRepository.deletedFireCheckRecordHiddenById(info);
|
||||
});
|
||||
}
|
||||
|
||||
//新增隐患信息,隐患需要判断是新增还是修改
|
||||
if(CollUtil.isNotEmpty(appCheckRecordAddCmd.getHiddenAddCmdList())){
|
||||
appCheckRecordAddCmd.getHiddenAddCmdList().forEach(info -> {
|
||||
FireCheckRecordHiddenE fireCheckRecordHiddenE = new FireCheckRecordHiddenE();
|
||||
fireCheckRecordHiddenE.initOtherFireCheckRecordHidden(fireCheckRecordE, info);
|
||||
fireCheckRecordHiddenGateway.addOtherHidden(fireCheckRecordHiddenE,info);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
fireCheckRecordHiddenRepository.updateHiddenStatus(fireCheckRecordE.getFireRecordId(), CollUtil.isNotEmpty(appCheckRecordAddCmd.getHiddenAddCmdList()));
|
||||
|
||||
|
||||
FireCheckRecordCO fireCheckRecordCO = new FireCheckRecordCO();
|
||||
BeanUtils.copyProperties(fireCheckRecordDO, fireCheckRecordCO);
|
||||
return fireCheckRecordCO;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
package com.zcloud.fire.check.command;
|
||||
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckRecordDeviceGateway;
|
||||
import com.zcloud.fire.check.domain.model.FireCheckRecordDeviceE;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordDeviceAddCmd;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:02
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckRecordDeviceAddExe {
|
||||
private final FireCheckRecordDeviceGateway fireCheckRecordDeviceGateway;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(FireCheckRecordDeviceAddCmd cmd) {
|
||||
FireCheckRecordDeviceE fireCheckRecordDeviceE = new FireCheckRecordDeviceE();
|
||||
BeanUtils.copyProperties(cmd, fireCheckRecordDeviceE);
|
||||
boolean res = false;
|
||||
try {
|
||||
res = fireCheckRecordDeviceGateway.add(fireCheckRecordDeviceE);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
if (!res) {
|
||||
throw new BizException("保存失败");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
package com.zcloud.fire.check.command;
|
||||
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckRecordDeviceGateway;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:03
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckRecordDeviceRemoveExe {
|
||||
private final FireCheckRecordDeviceGateway fireCheckRecordDeviceGateway;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(Long id) {
|
||||
boolean res = fireCheckRecordDeviceGateway.deletedFireCheckRecordDeviceById(id);
|
||||
if (!res) {
|
||||
throw new BizException("删除失败");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(Long[] ids) {
|
||||
boolean res = fireCheckRecordDeviceGateway.deletedFireCheckRecordDeviceByIds(ids);
|
||||
if (!res) {
|
||||
throw new BizException("删除失败");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
package com.zcloud.fire.check.command;
|
||||
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckRecordDeviceGateway;
|
||||
import com.zcloud.fire.check.domain.model.FireCheckRecordDeviceE;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordDeviceUpdateCmd;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:03
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckRecordDeviceUpdateExe {
|
||||
private final FireCheckRecordDeviceGateway fireCheckRecordDeviceGateway;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void execute(FireCheckRecordDeviceUpdateCmd fireCheckRecordDeviceUpdateCmd) {
|
||||
FireCheckRecordDeviceE fireCheckRecordDeviceE = new FireCheckRecordDeviceE();
|
||||
BeanUtils.copyProperties(fireCheckRecordDeviceUpdateCmd, fireCheckRecordDeviceE);
|
||||
boolean res = fireCheckRecordDeviceGateway.update(fireCheckRecordDeviceE);
|
||||
if (!res) {
|
||||
throw new BizException("修改失败");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
package com.zcloud.fire.check.command;
|
||||
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckRecordHiddenGateway;
|
||||
import com.zcloud.fire.check.domain.model.FireCheckRecordHiddenE;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordHiddenAddCmd;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:11:15
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckRecordHiddenAddExe {
|
||||
private final FireCheckRecordHiddenGateway fireCheckRecordHiddenGateway;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(FireCheckRecordHiddenAddCmd cmd) {
|
||||
FireCheckRecordHiddenE fireCheckRecordHiddenE = new FireCheckRecordHiddenE();
|
||||
BeanUtils.copyProperties(cmd, fireCheckRecordHiddenE);
|
||||
boolean res = false;
|
||||
try {
|
||||
res = fireCheckRecordHiddenGateway.add(fireCheckRecordHiddenE);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
if (!res) {
|
||||
throw new BizException("保存失败");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
package com.zcloud.fire.check.command;
|
||||
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckRecordHiddenGateway;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:11:15
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckRecordHiddenRemoveExe {
|
||||
private final FireCheckRecordHiddenGateway fireCheckRecordHiddenGateway;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(Long id) {
|
||||
boolean res = fireCheckRecordHiddenGateway.deletedFireCheckRecordHiddenById(id);
|
||||
if (!res) {
|
||||
throw new BizException("删除失败");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(Long[] ids) {
|
||||
boolean res = fireCheckRecordHiddenGateway.deletedFireCheckRecordHiddenByIds(ids);
|
||||
if (!res) {
|
||||
throw new BizException("删除失败");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
package com.zcloud.fire.check.command;
|
||||
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckRecordHiddenGateway;
|
||||
import com.zcloud.fire.check.domain.model.FireCheckRecordHiddenE;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordHiddenUpdateCmd;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:11:16
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckRecordHiddenUpdateExe {
|
||||
private final FireCheckRecordHiddenGateway fireCheckRecordHiddenGateway;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void execute(FireCheckRecordHiddenUpdateCmd fireCheckRecordHiddenUpdateCmd) {
|
||||
FireCheckRecordHiddenE fireCheckRecordHiddenE = new FireCheckRecordHiddenE();
|
||||
BeanUtils.copyProperties(fireCheckRecordHiddenUpdateCmd, fireCheckRecordHiddenE);
|
||||
boolean res = fireCheckRecordHiddenGateway.update(fireCheckRecordHiddenE);
|
||||
if (!res) {
|
||||
throw new BizException("修改失败");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,186 @@
|
|||
package com.zcloud.fire.check.command;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.zcloud.fire.check.domain.enums.CheckFlagEnum;
|
||||
import com.zcloud.fire.check.domain.enums.CheckRecordNormalFlagEnum;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckRecordDeviceGateway;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckRecordGateway;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckRecordHiddenGateway;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckRecordPointGateway;
|
||||
import com.zcloud.fire.check.domain.model.*;
|
||||
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.repository.*;
|
||||
import com.zcloud.gbscommon.zcloudhidden.face.ZcloudHiddenFacade;
|
||||
import com.zcloud.gbscommon.zcloudhidden.request.HiddenAddCmd;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.exception.ExceptionUtils;
|
||||
import org.apache.dubbo.config.annotation.DubboReference;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.function.Function;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:19
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
@Slf4j
|
||||
public class FireCheckRecordPointAddExe {
|
||||
private final FireCheckRecordPointGateway fireCheckRecordPointGateway;
|
||||
private final FireCheckRecordGateway fireCheckRecordGateway;
|
||||
private final FirePointRepository firePointRepository;
|
||||
private final FireDeviceRepository fireDeviceRepository;
|
||||
private final FireCheckRecordDeviceGateway fireCheckRecordDeviceGateway;
|
||||
private final FireCheckRecordDeviceRepository fireCheckRecordDeviceRepository;
|
||||
private final FireCheckRecordHiddenGateway fireCheckRecordHiddenGateway;
|
||||
private final FireCheckRecordHiddenRepository fireCheckRecordHiddenRepository;
|
||||
|
||||
@DubboReference
|
||||
private ZcloudHiddenFacade zcloudHiddenFacade;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(FireCheckRecordPointAddCmd cmd) {
|
||||
FireCheckRecordPointE fireCheckRecordPointE = new FireCheckRecordPointE();
|
||||
BeanUtils.copyProperties(cmd, fireCheckRecordPointE);
|
||||
boolean res = false;
|
||||
try {
|
||||
res = fireCheckRecordPointGateway.add(fireCheckRecordPointE);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
if (!res) {
|
||||
throw new BizException("保存失败");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public FireCheckRecordPointCO saveCheckRecordPoint(AppCheckRecordPointAddCmd appCheckRecordPointAddCmd) {
|
||||
if (CollUtil.isEmpty(appCheckRecordPointAddCmd.getFireCheckRecordDeviceAddCmdList())) {
|
||||
throw new BizException("消防设备检查信息不能为空");
|
||||
}
|
||||
|
||||
// 检查表是否存在，检查记录表是否存在，检查点位是否存在
|
||||
List<FireDeviceDO> fireDeviceDOList = fireDeviceRepository.getDeviceListByFirePointId(appCheckRecordPointAddCmd.getFirePointId());
|
||||
if (CollUtil.isEmpty(fireDeviceDOList)) {
|
||||
throw new BizException("消防点位不存在消防设备");
|
||||
}
|
||||
|
||||
FireCheckRecordE fireCheckRecordE = fireCheckRecordGateway.initCheckRecord(appCheckRecordPointAddCmd.getFireCheckId(), appCheckRecordPointAddCmd.getFireRecordId());
|
||||
if (fireCheckRecordE == null) {
|
||||
throw new BizException("消防点位检查不存在");
|
||||
}
|
||||
FireCheckRecordPointE fireCheckRecordPointE = new FireCheckRecordPointE();
|
||||
//检查点位记录是否存在
|
||||
if (appCheckRecordPointAddCmd.getId() == null) {
|
||||
//新增
|
||||
//查找点位信息
|
||||
FirePointDO firePointDo = firePointRepository.getInfoByUUId(appCheckRecordPointAddCmd.getFirePointId());
|
||||
if (firePointDo == null) {
|
||||
throw new BizException("消防点位不存在");
|
||||
}
|
||||
FirePointE firePointE = new FirePointE();
|
||||
BeanUtils.copyProperties(firePointDo, firePointE);
|
||||
|
||||
BeanUtils.copyProperties(appCheckRecordPointAddCmd, fireCheckRecordPointE);
|
||||
fireCheckRecordPointE.initFireCheckRecordPoint(fireCheckRecordE, firePointE);
|
||||
fireCheckRecordPointE.setLongitude(appCheckRecordPointAddCmd.getLongitude());
|
||||
fireCheckRecordPointE.setLatitude(appCheckRecordPointAddCmd.getLatitude());
|
||||
fireCheckRecordPointE.setCheckedFlag(CheckFlagEnum.CHECK_FLAG_CHECKED.getCode());
|
||||
fireCheckRecordPointGateway.add(fireCheckRecordPointE);
|
||||
} else {
|
||||
//修改
|
||||
BeanUtils.copyProperties(appCheckRecordPointAddCmd, fireCheckRecordPointE);
|
||||
fireCheckRecordPointGateway.update(fireCheckRecordPointE);
|
||||
}
|
||||
//根据消防设备id查询消防设备信息
|
||||
Map<String, FireDeviceDO> fireDeviceDOMap = fireDeviceDOList.stream().collect(Collectors.toMap(FireDeviceDO::getFireDeviceId, Function.identity()));
|
||||
|
||||
appCheckRecordPointAddCmd.getFireCheckRecordDeviceAddCmdList().forEach(fireCheckRecordDeviceAddCmd -> {
|
||||
FireCheckRecordDeviceE fireCheckRecordDeviceE = new FireCheckRecordDeviceE();
|
||||
|
||||
if (fireCheckRecordDeviceAddCmd.getId() == null) {
|
||||
//新增
|
||||
FireDeviceDO fireDeviceDO = fireDeviceDOMap.get(fireCheckRecordDeviceAddCmd.getFireDeviceId());
|
||||
if (fireDeviceDO == null) {
|
||||
throw new BizException("消防设备不存在");
|
||||
}
|
||||
FireDeviceE fireDeviceE = new FireDeviceE();
|
||||
BeanUtils.copyProperties(fireDeviceDO, fireDeviceE);
|
||||
fireCheckRecordDeviceE.initFireCheckRecordDevice(fireCheckRecordPointE, fireDeviceE);
|
||||
fireCheckRecordDeviceE.setLongitude(fireCheckRecordDeviceAddCmd.getLongitude());
|
||||
fireCheckRecordDeviceE.setLatitude(fireCheckRecordDeviceAddCmd.getLatitude());
|
||||
fireCheckRecordDeviceE.setNormalFlag(fireCheckRecordDeviceAddCmd.getNormalFlag());
|
||||
fireCheckRecordDeviceE.setCheckedFlag(CheckFlagEnum.CHECK_FLAG_CHECKED.getCode());
|
||||
fireCheckRecordDeviceGateway.add(fireCheckRecordDeviceE);
|
||||
|
||||
//有隐患就新增
|
||||
if(CheckRecordNormalFlagEnum.NORMAL_FLAG_NOT_NORMAL.getCode().equals(fireCheckRecordDeviceE.getCheckedFlag()) && fireCheckRecordDeviceAddCmd.getHiddenAddCmd()==null){
|
||||
throw new BizException("隐患信息不能为空");
|
||||
}
|
||||
if(fireCheckRecordDeviceAddCmd.getHiddenAddCmd()!=null){
|
||||
HiddenAddCmd hiddenAddCmd = fireCheckRecordDeviceAddCmd.getHiddenAddCmd();
|
||||
hiddenAddCmd.setForeignKey(fireCheckRecordE.getFireRecordId());
|
||||
fireCheckRecordHiddenGateway.addHidden( fireCheckRecordDeviceE,hiddenAddCmd);
|
||||
}
|
||||
} else {
|
||||
//修改
|
||||
FireCheckRecordDeviceDO fireCheckRecordDeviceDO = fireCheckRecordDeviceRepository.getById(fireCheckRecordDeviceAddCmd.getId());
|
||||
if(fireCheckRecordDeviceDO==null){
|
||||
throw new BizException("消防设备检查信息不存在");
|
||||
}
|
||||
BeanUtils.copyProperties(fireCheckRecordDeviceAddCmd, fireCheckRecordDeviceE);
|
||||
fireCheckRecordDeviceGateway.update(fireCheckRecordDeviceE);
|
||||
if(fireCheckRecordDeviceE.getNormalFlag()==null){
|
||||
//手动更新结果为null,因为有未排查记录的为null
|
||||
fireCheckRecordDeviceRepository.updateNormalNull(fireCheckRecordDeviceAddCmd.getId());
|
||||
}
|
||||
//隐患是否更新
|
||||
FireCheckRecordHiddenDO fireCheckRecordHiddenDO = fireCheckRecordHiddenRepository.listByFireCheckRecordDeviceId(fireCheckRecordDeviceDO.getFireRecordDeviceId());
|
||||
|
||||
if(CheckRecordNormalFlagEnum.NORMAL_FLAG_NOT_NORMAL.getCode().equals(fireCheckRecordDeviceE.getCheckedFlag())){
|
||||
//修改隐患信息
|
||||
//根据消防设备id查询隐患信息
|
||||
if(fireCheckRecordHiddenDO==null){
|
||||
HiddenAddCmd hiddenAddCmd = fireCheckRecordDeviceAddCmd.getHiddenAddCmd();
|
||||
fireCheckRecordHiddenGateway.addHidden( fireCheckRecordDeviceE,hiddenAddCmd);
|
||||
}else{
|
||||
FireCheckRecordHiddenE fireCheckRecordHiddenE = new FireCheckRecordHiddenE();
|
||||
BeanUtils.copyProperties(fireCheckRecordHiddenDO, fireCheckRecordHiddenE);
|
||||
fireCheckRecordHiddenGateway.updateHidden(fireCheckRecordHiddenE,fireCheckRecordDeviceAddCmd.getHiddenAddCmd());
|
||||
}
|
||||
}else{
|
||||
//删除隐患
|
||||
if(fireCheckRecordHiddenDO!=null){
|
||||
fireCheckRecordHiddenRepository.deletedFireCheckRecordHiddenById(fireCheckRecordHiddenDO);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
FireCheckRecordPointCO fireCheckRecordPointCO = new FireCheckRecordPointCO();
|
||||
BeanUtils.copyProperties(fireCheckRecordPointE, fireCheckRecordPointCO);
|
||||
return fireCheckRecordPointCO;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
package com.zcloud.fire.check.command;
|
||||
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckRecordPointGateway;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:20
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckRecordPointRemoveExe {
|
||||
private final FireCheckRecordPointGateway fireCheckRecordPointGateway;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(Long id) {
|
||||
boolean res = fireCheckRecordPointGateway.deletedFireCheckRecordPointById(id);
|
||||
if (!res) {
|
||||
throw new BizException("删除失败");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(Long[] ids) {
|
||||
boolean res = fireCheckRecordPointGateway.deletedFireCheckRecordPointByIds(ids);
|
||||
if (!res) {
|
||||
throw new BizException("删除失败");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
package com.zcloud.fire.check.command;
|
||||
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckRecordPointGateway;
|
||||
import com.zcloud.fire.check.domain.model.FireCheckRecordPointE;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordPointUpdateCmd;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:20
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckRecordPointUpdateExe {
|
||||
private final FireCheckRecordPointGateway fireCheckRecordPointGateway;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void execute(FireCheckRecordPointUpdateCmd fireCheckRecordPointUpdateCmd) {
|
||||
FireCheckRecordPointE fireCheckRecordPointE = new FireCheckRecordPointE();
|
||||
BeanUtils.copyProperties(fireCheckRecordPointUpdateCmd, fireCheckRecordPointE);
|
||||
boolean res = fireCheckRecordPointGateway.update(fireCheckRecordPointE);
|
||||
if (!res) {
|
||||
throw new BizException("修改失败");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
package com.zcloud.fire.check.command;
|
||||
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckRecordGateway;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:59
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckRecordRemoveExe {
|
||||
private final FireCheckRecordGateway fireCheckRecordGateway;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(Long id) {
|
||||
boolean res = fireCheckRecordGateway.deletedFireCheckRecordById(id);
|
||||
if (!res) {
|
||||
throw new BizException("删除失败");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(Long[] ids) {
|
||||
boolean res = fireCheckRecordGateway.deletedFireCheckRecordByIds(ids);
|
||||
if (!res) {
|
||||
throw new BizException("删除失败");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
package com.zcloud.fire.check.command;
|
||||
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckRecordGateway;
|
||||
import com.zcloud.fire.check.domain.model.FireCheckRecordE;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordUpdateCmd;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:59
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckRecordUpdateExe {
|
||||
private final FireCheckRecordGateway fireCheckRecordGateway;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void execute(FireCheckRecordUpdateCmd fireCheckRecordUpdateCmd) {
|
||||
FireCheckRecordE fireCheckRecordE = new FireCheckRecordE();
|
||||
BeanUtils.copyProperties(fireCheckRecordUpdateCmd, fireCheckRecordE);
|
||||
boolean res = fireCheckRecordGateway.update(fireCheckRecordE);
|
||||
if (!res) {
|
||||
throw new BizException("修改失败");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
package com.zcloud.fire.check.command;
|
||||
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckRecordUserGateway;
|
||||
import com.zcloud.fire.check.domain.model.FireCheckRecordUserE;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordUserAddCmd;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:12:04
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckRecordUserAddExe {
|
||||
private final FireCheckRecordUserGateway fireCheckRecordUserGateway;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(FireCheckRecordUserAddCmd cmd) {
|
||||
FireCheckRecordUserE fireCheckRecordUserE = new FireCheckRecordUserE();
|
||||
BeanUtils.copyProperties(cmd, fireCheckRecordUserE);
|
||||
boolean res = false;
|
||||
try {
|
||||
res = fireCheckRecordUserGateway.add(fireCheckRecordUserE);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
if (!res) {
|
||||
throw new BizException("保存失败");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
package com.zcloud.fire.check.command;
|
||||
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckRecordUserGateway;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:12:04
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckRecordUserRemoveExe {
|
||||
private final FireCheckRecordUserGateway fireCheckRecordUserGateway;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(Long id) {
|
||||
boolean res = fireCheckRecordUserGateway.deletedFireCheckRecordUserById(id);
|
||||
if (!res) {
|
||||
throw new BizException("删除失败");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(Long[] ids) {
|
||||
boolean res = fireCheckRecordUserGateway.deletedFireCheckRecordUserByIds(ids);
|
||||
if (!res) {
|
||||
throw new BizException("删除失败");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
package com.zcloud.fire.check.command;
|
||||
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.zcloud.fire.check.domain.gateway.FireCheckRecordUserGateway;
|
||||
import com.zcloud.fire.check.domain.model.FireCheckRecordUserE;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordUserUpdateCmd;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:12:05
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckRecordUserUpdateExe {
|
||||
private final FireCheckRecordUserGateway fireCheckRecordUserGateway;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void execute(FireCheckRecordUserUpdateCmd fireCheckRecordUserUpdateCmd) {
|
||||
FireCheckRecordUserE fireCheckRecordUserE = new FireCheckRecordUserE();
|
||||
BeanUtils.copyProperties(fireCheckRecordUserUpdateCmd, fireCheckRecordUserE);
|
||||
boolean res = fireCheckRecordUserGateway.update(fireCheckRecordUserE);
|
||||
if (!res) {
|
||||
throw new BizException("修改失败");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
package com.zcloud.fire.check.command.convertor;
|
||||
|
||||
import com.zcloud.fire.check.dto.clientobject.CorpCheckStatisticsCO;
|
||||
import com.zcloud.fire.check.dto.clientobject.CorpStatisticsCO;
|
||||
import com.zcloud.fire.check.persistence.dataobject.CorpInfoDO;
|
||||
import org.mapstruct.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-10-29 16:02:16
|
||||
*/
|
||||
@Mapper(componentModel = "spring")
|
||||
public interface CorpInfoCoConvertor {
|
||||
|
||||
List<CorpStatisticsCO> converCorpDOsToCorpCO(List<CorpInfoDO> data);
|
||||
|
||||
List<CorpCheckStatisticsCO> converCorpDOsToCorpCheckStatisticsCO(List<CorpInfoDO> data);
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
package com.zcloud.fire.check.command.convertor;
|
||||
|
||||
import com.zcloud.fire.check.dto.clientobject.*;
|
||||
import com.zcloud.fire.check.persistence.FireCheckPointListDO;
|
||||
import com.zcloud.fire.check.persistence.dataobject.FireCheckListDO;
|
||||
import com.zcloud.fire.check.persistence.dataobject.PointDistributionDO;
|
||||
import com.zcloud.fire.check.persistence.dataobject.RiskDistributionDO;
|
||||
import org.mapstruct.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:08
|
||||
*/
|
||||
@Mapper(componentModel = "spring")
|
||||
public interface FireCheckListCoConvertor {
|
||||
/**
|
||||
* @param fireCheckListDOs
|
||||
* @return
|
||||
*/
|
||||
List<FireCheckListCO> converDOsToCOs(List<FireCheckListDO> fireCheckListDOs);
|
||||
|
||||
List<RiskDistributionCO> converStatictisDOsToCOs(List<RiskDistributionDO> data);
|
||||
|
||||
List<PointDistributionCO> converPointDistributionDOsToCOs(List<PointDistributionDO> data);
|
||||
|
||||
List<FireCheckPointListCO> converPointListDOsToCOs(List<FireCheckPointListDO> fireCheckPointListDO);
|
||||
|
||||
List<FireBackCheckListCO> converDOsToBackCOs(List<FireCheckListDO> data);
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
package com.zcloud.fire.check.command.convertor;
|
||||
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckListItemCO;
|
||||
import com.zcloud.fire.check.persistence.dataobject.FireCheckListItemDO;
|
||||
import org.mapstruct.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:28
|
||||
*/
|
||||
@Mapper(componentModel = "spring")
|
||||
public interface FireCheckListItemCoConvertor {
|
||||
/**
|
||||
* @param fireCheckListItemDOs
|
||||
* @return
|
||||
*/
|
||||
List<FireCheckListItemCO> converDOsToCOs(List<FireCheckListItemDO> fireCheckListItemDOs);
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
package com.zcloud.fire.check.command.convertor;
|
||||
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckListUserCO;
|
||||
import com.zcloud.fire.check.persistence.dataobject.FireCheckListUserDO;
|
||||
import org.mapstruct.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-11 15:32:49
|
||||
*/
|
||||
@Mapper(componentModel = "spring")
|
||||
public interface FireCheckListUserCoConvertor {
|
||||
/**
|
||||
* @param fireCheckListUserDOs
|
||||
* @return
|
||||
*/
|
||||
List<FireCheckListUserCO> converDOsToCOs(List<FireCheckListUserDO> fireCheckListUserDOs);
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
package com.zcloud.fire.check.command.convertor;
|
||||
|
||||
import com.zcloud.fire.check.dto.clientobject.FireBackCheckRecordCO;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckRecordCO;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckRecordUserCO;
|
||||
import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordDO;
|
||||
import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordUserDO;
|
||||
import org.mapstruct.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:58
|
||||
*/
|
||||
@Mapper(componentModel = "spring")
|
||||
public interface FireCheckRecordCoConvertor {
|
||||
/**
|
||||
* @param fireCheckRecordDOs
|
||||
* @return
|
||||
*/
|
||||
List<FireCheckRecordCO> converDOsToCOs(List<FireCheckRecordDO> fireCheckRecordDOs);
|
||||
|
||||
List<FireBackCheckRecordCO> converDOsToBackRecordCOs(List<FireCheckRecordDO> data);
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
package com.zcloud.fire.check.command.convertor;
|
||||
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckPointDeviceListCO;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckRecordDeviceCO;
|
||||
import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordDeviceDO;
|
||||
import org.mapstruct.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:02
|
||||
*/
|
||||
@Mapper(componentModel = "spring")
|
||||
public interface FireCheckRecordDeviceCoConvertor {
|
||||
/**
|
||||
* @param fireCheckRecordDeviceDOs
|
||||
* @return
|
||||
*/
|
||||
List<FireCheckRecordDeviceCO> converDOsToCOs(List<FireCheckRecordDeviceDO> fireCheckRecordDeviceDOs);
|
||||
|
||||
|
||||
List<FireCheckRecordDeviceCO> converDOsToDeviceCOs(List<FireCheckRecordDeviceDO> deviceDOList);
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
package com.zcloud.fire.check.command.convertor;
|
||||
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckRecordHiddenCO;
|
||||
import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordHiddenDO;
|
||||
import org.mapstruct.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:11:15
|
||||
*/
|
||||
@Mapper(componentModel = "spring")
|
||||
public interface FireCheckRecordHiddenCoConvertor {
|
||||
/**
|
||||
* @param fireCheckRecordHiddenDOs
|
||||
* @return
|
||||
*/
|
||||
List<FireCheckRecordHiddenCO> converDOsToCOs(List<FireCheckRecordHiddenDO> fireCheckRecordHiddenDOs);
|
||||
|
||||
FireCheckRecordHiddenCO convertToCO(FireCheckRecordHiddenDO hiddenDO);
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
package com.zcloud.fire.check.command.convertor;
|
||||
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckPointListCO;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckRecordPointCO;
|
||||
import com.zcloud.fire.check.persistence.FireCheckPointListDO;
|
||||
import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordPointDO;
|
||||
import org.mapstruct.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:19
|
||||
*/
|
||||
@Mapper(componentModel = "spring")
|
||||
public interface FireCheckRecordPointCoConvertor {
|
||||
/**
|
||||
* @param fireCheckRecordPointDOs
|
||||
* @return
|
||||
*/
|
||||
List<FireCheckRecordPointCO> converDOsToCOs(List<FireCheckRecordPointDO> fireCheckRecordPointDOs);
|
||||
|
||||
List<FireCheckPointListCO> converDOsToPointCOs(List<FireCheckRecordPointDO> data);
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
package com.zcloud.fire.check.command.convertor;
|
||||
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckRecordUserCO;
|
||||
import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordUserDO;
|
||||
import org.mapstruct.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:12:04
|
||||
*/
|
||||
@Mapper(componentModel = "spring")
|
||||
public interface FireCheckRecordUserCoConvertor {
|
||||
/**
|
||||
* @param fireCheckRecordUserDOs
|
||||
* @return
|
||||
*/
|
||||
List<FireCheckRecordUserCO> converDOsToCOs(List<FireCheckRecordUserDO> fireCheckRecordUserDOs);
|
||||
}
|
||||
|
||||
|
|
@ -1,6 +1,8 @@
|
|||
package com.zcloud.fire.check.command.convertor;
|
||||
|
||||
import com.zcloud.fire.check.dto.clientobject.CorpStatisticsCO;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireDeviceCO;
|
||||
import com.zcloud.fire.check.persistence.dataobject.CorpInfoDO;
|
||||
import com.zcloud.fire.check.persistence.dataobject.FireDeviceDO;
|
||||
import com.zcloud.gbscommon.excelEntity.FireDeviceExcelExportEntity;
|
||||
import org.mapstruct.Mapper;
|
||||
|
|
@ -23,5 +25,7 @@ public interface FireDeviceCoConvertor {
|
|||
List<FireDeviceCO> converDOsToCOs(List<FireDeviceDO> fireDeviceDOs);
|
||||
|
||||
List<FireDeviceExcelExportEntity> converCOsToExcelEntitys(List<FireDeviceCO> data);
|
||||
|
||||
List<CorpStatisticsCO> converCorpDOsToCorpCO(List<CorpInfoDO> data);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,42 @@
|
|||
package com.zcloud.fire.check.command.query;
|
||||
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.zcloud.fire.check.command.convertor.FireCheckListItemCoConvertor;
|
||||
import com.zcloud.fire.check.dto.FireCheckListItemPageQry;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckListItemCO;
|
||||
import com.zcloud.fire.check.persistence.dataobject.FireCheckListItemDO;
|
||||
import com.zcloud.fire.check.persistence.repository.FireCheckListItemRepository;
|
||||
import com.zcloud.gbscommon.utils.PageQueryHelper;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:28
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckListItemQueryExe {
|
||||
private final FireCheckListItemRepository fireCheckListItemRepository;
|
||||
private final FireCheckListItemCoConvertor fireCheckListItemCoConvertor;
|
||||
|
||||
/**
|
||||
* 分页
|
||||
*
|
||||
* @param fireCheckListItemPageQry
|
||||
* @return
|
||||
*/
|
||||
public PageResponse<FireCheckListItemCO> execute(FireCheckListItemPageQry fireCheckListItemPageQry) {
|
||||
Map<String, Object> params = PageQueryHelper.toHashMap(fireCheckListItemPageQry);
|
||||
PageResponse<FireCheckListItemDO> pageResponse = fireCheckListItemRepository.listPage(params);
|
||||
List<FireCheckListItemCO> examCenterCOS = fireCheckListItemCoConvertor.converDOsToCOs(pageResponse.getData());
|
||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,453 @@
|
|||
package com.zcloud.fire.check.command.query;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.alibaba.cola.dto.MultiResponse;
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.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.domain.enums.HiddenCheckTypeEnum;
|
||||
import com.zcloud.fire.check.domain.model.FireCheckListE;
|
||||
import com.zcloud.fire.check.dto.*;
|
||||
import com.zcloud.fire.check.dto.clientobject.*;
|
||||
import com.zcloud.fire.check.persistence.FireCheckPointListDO;
|
||||
import com.zcloud.fire.check.persistence.dataobject.*;
|
||||
import com.zcloud.fire.check.persistence.repository.*;
|
||||
import com.zcloud.gbscommon.utils.PageQueryHelper;
|
||||
import com.zcloud.gbscommon.zcloudhidden.face.ZcloudHiddenFacade;
|
||||
import com.zcloud.gbscommon.zcloudhidden.request.HiddenStatisticsQry;
|
||||
import com.zcloud.gbscommon.zcloudhidden.response.HiddenListCO;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.dubbo.config.annotation.DubboReference;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.*;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:09
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
@Slf4j
|
||||
public class FireCheckListQueryExe {
|
||||
private final FireCheckListRepository fireCheckListRepository;
|
||||
private final FireCheckListCoConvertor fireCheckListCoConvertor;
|
||||
private final FireCheckListItemRepository fireCheckListItemRepository;
|
||||
private final FireDeviceRepository fireDeviceRepository;
|
||||
private final FireDeviceCoConvertor fireDeviceCoConvertor;
|
||||
private final FireRegionRepository fireRegionRepository;
|
||||
private final FirePointRepository firePointRepository;
|
||||
private final FireCheckStandardRepository fireCheckStandardRepository;
|
||||
private final FireCheckListUserRepository fireCheckListUserRepository;
|
||||
private final FireCheckRecordRepository fireCheckRecordRepository;
|
||||
private final FireCheckRecordPointRepository fireCheckRecordPointRepository;
|
||||
private final FireCheckStandardCoConvertor fireCheckStandardCoConvertor;
|
||||
private final FireCheckRecordDeviceRepository fireCheckRecordDeviceRepository;
|
||||
private final FireCheckRecordDeviceCoConvertor fireCheckRecordDeviceCoConvertor;
|
||||
private final FireCheckRecordHiddenRepository fireCheckRecordHiddenRepository;
|
||||
|
||||
@DubboReference
|
||||
private ZcloudHiddenFacade zcloudHiddenFacade;
|
||||
|
||||
/**
|
||||
* 分页
|
||||
*
|
||||
* @param fireCheckListPageQry
|
||||
* @return
|
||||
*/
|
||||
public PageResponse<FireCheckListCO> execute(FireCheckListPageQry fireCheckListPageQry) {
|
||||
Map<String, Object> params = PageQueryHelper.toHashMap(fireCheckListPageQry);
|
||||
PageResponse<FireCheckListDO> pageResponse = fireCheckListRepository.listPage(params);
|
||||
List<FireCheckListCO> examCenterCOS = fireCheckListCoConvertor.converDOsToCOs(pageResponse.getData());
|
||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
|
||||
public FireCheckListCO getInfoById(Long id) {
|
||||
FireCheckListDO fireCheckListDO = fireCheckListRepository.getInfoById(id);
|
||||
if (fireCheckListDO == null) {
|
||||
throw new RuntimeException("点位检查表不存在");
|
||||
}
|
||||
FireCheckListCO fireCheckListCO = new FireCheckListCO();
|
||||
BeanUtils.copyProperties(fireCheckListDO, fireCheckListCO);
|
||||
//fireCheckListCO设置检查信息
|
||||
List<FireCheckListItemDO> fireCheckListItemDOList = fireCheckListItemRepository.listByFireCheckId(fireCheckListDO.getFireCheckId());
|
||||
if (CollUtil.isEmpty(fireCheckListItemDOList)) {
|
||||
return fireCheckListCO;
|
||||
}
|
||||
//获取所有id
|
||||
List<String> fireCheckListItemIdList = fireCheckListItemDOList.stream().map(FireCheckListItemDO::getFireDeviceId).collect(Collectors.toList());
|
||||
//获取所有的消防器材信息
|
||||
Map<String, Object> params = new HashMap<>();
|
||||
params.put("fireDeviceIdList", fireCheckListItemIdList);
|
||||
List<FireDeviceDO> fireDeviceDOList = fireDeviceRepository.getAllList(params);
|
||||
List<FireDeviceCO> examCenterCOS = fireDeviceCoConvertor.converDOsToCOs(fireDeviceDOList);
|
||||
fireCheckListCO.setFireDeviceCOList(examCenterCOS);
|
||||
return fireCheckListCO;
|
||||
}
|
||||
|
||||
public PageResponse<FireCheckListCO> appCheckList(FireCheckListPageQry qry) {
|
||||
|
||||
Map<String, Object> params = PageQueryHelper.toHashMap(qry);
|
||||
PageResponse<FireCheckListDO> pageResponse = fireCheckListRepository.appCheckList(params);
|
||||
List<FireCheckListCO> examCenterCOS = fireCheckListCoConvertor.converDOsToCOs(pageResponse.getData());
|
||||
if (CollUtil.isEmpty(examCenterCOS)) {
|
||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
List<String> fireCheckIdList = examCenterCOS.stream().map(FireCheckListCO::getFireCheckId).collect(Collectors.toList());
|
||||
//补充完整的用户负责人
|
||||
List<FireCheckListUserDO> fireCheckListUserDOList = fireCheckListUserRepository.getListUserNameByFireCheckIdList(fireCheckIdList);
|
||||
//fireCheckListUserDOList转换为key value map
|
||||
Map<String, String> fireCheckListUserDONameMap = fireCheckListUserDOList.stream()
|
||||
.collect(Collectors.groupingBy(
|
||||
FireCheckListUserDO::getFireCheckId,
|
||||
Collectors.mapping(FireCheckListUserDO::getUserName, Collectors.joining(","))));
|
||||
//获取所有的检查项目信息
|
||||
List<FireCheckListItemStatisticDO> fireCheckListItemStatisticDOList = fireCheckListItemRepository.statisticListByFireCheckIdList(fireCheckIdList);
|
||||
//fireCheckListItemStatisticDOList转换为key value map
|
||||
|
||||
Map<String, Long> fireCheckListItemStatisticDOMap = fireCheckListItemStatisticDOList.stream().collect(Collectors.toMap(FireCheckListItemStatisticDO::getFireCheckId, FireCheckListItemStatisticDO::getFireCheckItemCount));
|
||||
//补充点位数和排查周期
|
||||
for (FireCheckListCO fireCheckListCO : examCenterCOS) {
|
||||
fireCheckListCO.setFireCheckItemCount(fireCheckListItemStatisticDOMap.getOrDefault(fireCheckListCO.getFireCheckId(), 0L));
|
||||
FireCheckListE info = new FireCheckListE();
|
||||
info.getCheckRecordPeriod(fireCheckListCO.getFireCheckType(), LocalDateTime.now());
|
||||
fireCheckListCO.setCheckStartTime(info.getPeriodStart());
|
||||
fireCheckListCO.setCheckEndTime(info.getPeriodEnd());
|
||||
fireCheckListCO.setUserName(fireCheckListUserDONameMap.getOrDefault(fireCheckListCO.getFireCheckId(), ""));
|
||||
}
|
||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
|
||||
|
||||
}
|
||||
|
||||
public PageResponse<RiskDistributionCO> riskDistribution(RiskDistributionPageQry qry) {
|
||||
Map<String, Object> params = PageQueryHelper.toHashMap(qry);
|
||||
PageResponse<RiskDistributionDO> pageResponse = fireCheckListRepository.riskDistribution(params);
|
||||
List<RiskDistributionCO> examCenterCOS = fireCheckListCoConvertor.converStatictisDOsToCOs(pageResponse.getData());
|
||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
|
||||
public RiskDistributionStasticCO riskDistributionStatistic() {
|
||||
RiskDistributionStasticCO riskDistributionStasticCO = new RiskDistributionStasticCO();
|
||||
riskDistributionStasticCO.setFireRegionCount(fireRegionRepository.getFireRegionCount());
|
||||
riskDistributionStasticCO.setFirePointCount(firePointRepository.getFirePointCount());
|
||||
riskDistributionStasticCO.setFireDeviceCount(fireDeviceRepository.getFireDeviceCount());
|
||||
return riskDistributionStasticCO;
|
||||
}
|
||||
|
||||
public PageResponse<PointDistributionCO> pointDistributionStatistic(PointDistributionPageQry qry) {
|
||||
Map<String, Object> params = PageQueryHelper.toHashMap(qry);
|
||||
PageResponse<PointDistributionDO> pageResponse = fireCheckListRepository.pointDistribution(params);
|
||||
List<PointDistributionCO> examCenterCOS = fireCheckListCoConvertor.converPointDistributionDOsToCOs(pageResponse.getData());
|
||||
//增加检查标准
|
||||
if (CollUtil.isEmpty(examCenterCOS)) {
|
||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
//获取所有的检查类型
|
||||
List<String> fireCheckTypeList = examCenterCOS.stream().map(PointDistributionCO::getFireDeviceType).distinct().collect(Collectors.toList());
|
||||
|
||||
|
||||
List<FireCheckStandardDO> fireCheckStandardDOList = fireCheckStandardRepository.getCheckStandardList(fireCheckTypeList);
|
||||
|
||||
Map<String, List<String>> fireCheckListItemStatisticDOMap = fireCheckStandardDOList.stream()
|
||||
.collect(Collectors.groupingBy(
|
||||
FireCheckStandardDO::getFireDeviceType,
|
||||
Collectors.mapping(FireCheckStandardDO::getFireCheckStandardItem, Collectors.toList())
|
||||
));
|
||||
|
||||
//补充检查标准
|
||||
for (PointDistributionCO pointDistributionCO : examCenterCOS) {
|
||||
List<String> fireCheckTypeItemList = fireCheckListItemStatisticDOMap.get(pointDistributionCO.getFireDeviceType());
|
||||
if (fireCheckTypeItemList != null) {
|
||||
pointDistributionCO.setFireCheckTypeItemList(fireCheckTypeItemList);
|
||||
}
|
||||
}
|
||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
|
||||
public List<FireCheckPointListCO> getCheckPointList(CheckPointListQry qry) {
|
||||
|
||||
Map<String, Object> params = PageQueryHelper.toHashMap(qry);
|
||||
List<FireCheckPointListDO> fireCheckPointListDOList = fireCheckListRepository.getCheckPointList(params);
|
||||
if (CollUtil.isEmpty(fireCheckPointListDOList)) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
//过滤标准数量为0的
|
||||
List<FireCheckPointListDO> missingTypes = fireCheckPointListDOList.stream().filter(item -> item.getStandardCount() == 0).collect(Collectors.toList());
|
||||
if (CollUtil.isNotEmpty(missingTypes)) {
|
||||
//获取类型名称，逗号分隔
|
||||
List<String> fireDeviceTypeNameList = missingTypes.stream().map(FireCheckPointListDO::getFireDeviceTypeName).distinct().collect(Collectors.toList());
|
||||
throw new BizException("检查设备没有检查标准：" + fireDeviceTypeNameList);
|
||||
}
|
||||
// 获取检查标准数据
|
||||
List<String> fireDeviceTypeList = fireCheckPointListDOList.stream().map(FireCheckPointListDO::getFireDeviceType).collect(Collectors.toList());
|
||||
|
||||
List<FireCheckStandardDO> fireCheckStandardDOList = fireCheckStandardRepository.getCheckStandardList(fireDeviceTypeList);
|
||||
// 如果没有找到任何检查标准，抛出异常
|
||||
if (CollUtil.isEmpty(fireCheckStandardDOList)) {
|
||||
throw new BizException("所有检查设备没有检查标准");
|
||||
}
|
||||
// 构建检查标准映射
|
||||
List<FireCheckStandardCO> fireCheckStandardCOList = fireCheckStandardCoConvertor.converDOsToCOs(fireCheckStandardDOList);
|
||||
Map<String, List<FireCheckStandardCO>> fireCheckStandardMap = fireCheckStandardCOList.stream()
|
||||
.collect(Collectors.groupingBy(FireCheckStandardCO::getFireDeviceType));
|
||||
|
||||
|
||||
//fireCheckPointListDOList按照pointid进行分组
|
||||
Map<String, List<FireCheckPointListDO>> fireCheckPointListDOMap = fireCheckPointListDOList.stream().collect(Collectors.groupingBy(FireCheckPointListDO::getFirePointId));
|
||||
|
||||
//获取隐患相关信息
|
||||
List<FireCheckRecordHiddenDO> fireCheckRecordHiddenDOList = fireCheckRecordHiddenRepository.getHiddenListByFireCheckId(qry.getFireCheckId(), HiddenCheckTypeEnum.CHECK_ITEM_HIDDEN.getCode());
|
||||
List<String> hiddenIdList = fireCheckRecordHiddenDOList.stream().map(FireCheckRecordHiddenDO::getHiddenId).collect(Collectors.toList());
|
||||
MultiResponse<HiddenListCO> hiddenListCOMultiResponse = null;
|
||||
if(CollUtil.isNotEmpty(hiddenIdList)){
|
||||
HiddenStatisticsQry hiddenStatisticsQry = new HiddenStatisticsQry();
|
||||
hiddenStatisticsQry.setHiddenIds(hiddenIdList);
|
||||
//获取下所有的检查项隐患信息，根据隐患id查询
|
||||
try {
|
||||
log.info("根据隐患id查询未整改隐患数：请求hiddenStatisticsQry:{}", hiddenStatisticsQry);
|
||||
hiddenListCOMultiResponse = zcloudHiddenFacade.queryHiddenCountByForeignKey(hiddenStatisticsQry);
|
||||
log.info("根据隐患id查询未整改隐患数：响应hiddenListCOMultiResponse:{}", JSONUtil.toJsonStr( hiddenListCOMultiResponse));
|
||||
}catch (Exception e){
|
||||
log.error("根据隐患id查询未整改隐患数失败:{}",e.getMessage());
|
||||
}
|
||||
}
|
||||
//checkRecordHiddenDOList根据事故id进行分组
|
||||
Map<String, List<FireCheckRecordHiddenDO>> fireCheckRecordHiddenDOMap = fireCheckRecordHiddenDOList.stream().collect(Collectors.groupingBy(FireCheckRecordHiddenDO::getFireDeviceId));
|
||||
|
||||
|
||||
// 处理设备类型名和设备编码的聚合显示
|
||||
List<FireCheckPointListCO> result = new ArrayList<>();
|
||||
for (Map.Entry<String, List<FireCheckPointListDO>> entry : fireCheckPointListDOMap.entrySet()) {
|
||||
List<FireCheckPointListDO> fireCheckPointListDOS = entry.getValue();
|
||||
if (CollUtil.isEmpty(fireCheckPointListDOS)) {
|
||||
continue;
|
||||
}
|
||||
FireCheckPointListCO node = new FireCheckPointListCO();
|
||||
node.setFireRegionId(fireCheckPointListDOS.get(0).getFireRegionId());
|
||||
node.setFireRegionCode(fireCheckPointListDOS.get(0).getFireRegionCode());
|
||||
node.setFireRegionName(fireCheckPointListDOS.get(0).getFireRegionName());
|
||||
node.setFirePointId(fireCheckPointListDOS.get(0).getFirePointId());
|
||||
node.setFirePointCode(fireCheckPointListDOS.get(0).getFirePointCode());
|
||||
node.setFirePointName(fireCheckPointListDOS.get(0).getFirePointName());
|
||||
String deviceTypeNames = fireCheckPointListDOS.stream()
|
||||
.map(FireCheckPointListDO::getFireDeviceTypeName)
|
||||
.filter(StringUtils::isNotEmpty)
|
||||
.distinct()
|
||||
.collect(Collectors.joining(","));
|
||||
node.setFireDeviceTypeName(deviceTypeNames);
|
||||
|
||||
// 聚合设备编码
|
||||
String deviceCodes = fireCheckPointListDOS.stream()
|
||||
.map(FireCheckPointListDO::getFireDeviceCode)
|
||||
.filter(StringUtils::isNotEmpty)
|
||||
.distinct()
|
||||
.collect(Collectors.joining(","));
|
||||
node.setFireDeviceCode(deviceCodes);
|
||||
List<FireCheckPointDeviceListCO> fireCheckPointDeviceListCOList = new ArrayList<>();
|
||||
//处理设备信息 ,并且判断设备下是否存在隐患信息
|
||||
MultiResponse<HiddenListCO> finalHiddenListCOMultiResponse = hiddenListCOMultiResponse;
|
||||
fireCheckPointListDOS.forEach(info -> {
|
||||
FireCheckPointDeviceListCO childNode = new FireCheckPointDeviceListCO();
|
||||
childNode.setFireRegionId(info.getFireRegionId());
|
||||
childNode.setFireRegionCode(info.getFireRegionCode());
|
||||
childNode.setFireRegionName(info.getFireRegionName());
|
||||
childNode.setFirePointId(info.getFirePointId());
|
||||
childNode.setFirePointName(info.getFirePointName());
|
||||
childNode.setFirePointCode(info.getFirePointCode());
|
||||
childNode.setFireDeviceId(info.getFireDeviceId());
|
||||
childNode.setFireDeviceType(info.getFireDeviceType());
|
||||
childNode.setFireDeviceCode(info.getFireDeviceCode());
|
||||
childNode.setFireDeviceTypeName(info.getFireDeviceTypeName());
|
||||
if (fireCheckStandardMap != null && !fireCheckStandardMap.isEmpty()) {
|
||||
childNode.setFireCheckStandardCOList(fireCheckStandardMap.get(info.getFireDeviceType()));
|
||||
}
|
||||
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());
|
||||
if (CollUtil.isNotEmpty(hiddenList)) {
|
||||
List<String> hiddenIdsInDevice = hiddenList.stream().map(FireCheckRecordHiddenDO::getHiddenId).collect(Collectors.toList());
|
||||
//如果hiddenIdsInRiskPoint在hiddenIds中，则存在隐患
|
||||
if (CollUtil.containsAny(hiddenIdsInDevice, hiddenIds)) {
|
||||
childNode.setHasHidden(true);
|
||||
} else {
|
||||
childNode.setHasHidden(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
fireCheckPointDeviceListCOList.add(childNode);
|
||||
});
|
||||
node.setFireCheckPointDeviceListCOList(fireCheckPointDeviceListCOList);
|
||||
result.add(node);
|
||||
}
|
||||
|
||||
//查找是否有已完成的检查，有的话，查出来
|
||||
// 查找是否有未完成的检查记录
|
||||
FireCheckRecordDO fireCheckRecordDO = fireCheckRecordRepository.getNoFinishedInfoId(qry.getFireCheckId());
|
||||
if (fireCheckRecordDO != null) {
|
||||
List<FireCheckRecordPointDO> fireCheckRecordPointDOList = fireCheckRecordPointRepository.getInfoByFireCheckRecordId(fireCheckRecordDO.getFireRecordId());
|
||||
List<FireCheckRecordDeviceDO> checkRecordDeviceList = fireCheckRecordDeviceRepository.getCheckRecordDeviceList(fireCheckRecordDO.getFireRecordId());
|
||||
Map<String, List<FireCheckRecordDeviceDO>> checkRecordDeviceMap = checkRecordDeviceList.stream().collect(Collectors.groupingBy(FireCheckRecordDeviceDO::getFireRecordPointId));
|
||||
if (CollUtil.isNotEmpty(fireCheckRecordPointDOList)) {
|
||||
Map<String, FireCheckRecordPointDO> fireCheckRecordPointDOMap = fireCheckRecordPointDOList.stream()
|
||||
.collect(Collectors.toMap(FireCheckRecordPointDO::getFirePointId, Function.identity()));
|
||||
|
||||
result.forEach(fireCheckPointListCO -> {
|
||||
FireCheckRecordPointDO recordPointDO = fireCheckRecordPointDOMap.get(fireCheckPointListCO.getFirePointId());
|
||||
if (recordPointDO != null) {
|
||||
fireCheckPointListCO.setFireRecordPointId(recordPointDO.getFireRecordPointId());
|
||||
fireCheckPointListCO.setFireRecordId(recordPointDO.getFireRecordId());
|
||||
List<FireCheckRecordDeviceDO> fireCheckRecordDeviceDOS = checkRecordDeviceMap.get(recordPointDO.getFireRecordPointId());
|
||||
//转换
|
||||
List<FireCheckRecordDeviceCO> fireCheckPointDeviceListCOList =fireCheckRecordDeviceCoConvertor.converDOsToDeviceCOs(fireCheckRecordDeviceDOS);
|
||||
fireCheckPointListCO.setFireCheckRecordDeviceStatusList(fireCheckPointDeviceListCOList);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private void checkFireDeviceStandard(List<FireCheckPointListDO> fireCheckPointListDOList) {
|
||||
// 获取检查标准数据
|
||||
Map<String, String> fireDeviceTypeNameMap = fireCheckPointListDOList.stream()
|
||||
.collect(Collectors.toMap(
|
||||
FireCheckPointListDO::getFireDeviceType,
|
||||
FireCheckPointListDO::getFireDeviceTypeName,
|
||||
(existing, replacement) -> existing)); // 处理重复key的情况
|
||||
if (CollUtil.isEmpty(fireDeviceTypeNameMap)) {
|
||||
throw new BizException("检查设备没有检查标准");
|
||||
}
|
||||
|
||||
List<String> fireDeviceTypeList = new ArrayList<>(fireDeviceTypeNameMap.keySet());
|
||||
List<FireCheckStandardDO> fireCheckStandardDOList = fireCheckStandardRepository.getCheckStandardList(fireDeviceTypeList);
|
||||
|
||||
// 如果没有找到任何检查标准，抛出异常
|
||||
if (CollUtil.isEmpty(fireCheckStandardDOList)) {
|
||||
throw new BizException("所有检查设备没有检查标准");
|
||||
}
|
||||
// 构建检查标准映射
|
||||
List<FireCheckStandardCO> fireCheckStandardCOList = fireCheckStandardCoConvertor.converDOsToCOs(fireCheckStandardDOList);
|
||||
Map<String, List<FireCheckStandardCO>> fireCheckStandardMap = fireCheckStandardCOList.stream()
|
||||
.collect(Collectors.groupingBy(FireCheckStandardCO::getFireDeviceType));
|
||||
|
||||
// 检查是否存在没有检查标准的设备类型
|
||||
Set<String> availableTypes = fireCheckStandardMap.keySet();
|
||||
List<String> missingTypes = fireDeviceTypeList.stream()
|
||||
.filter(type -> !availableTypes.contains(type))
|
||||
.map(fireDeviceTypeNameMap::get)
|
||||
.collect(Collectors.toList());
|
||||
|
||||
if (CollUtil.isNotEmpty(missingTypes)) {
|
||||
throw new BizException("检查设备没有检查标准：" + missingTypes);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public PageResponse<FireBackCheckListCO> getBackChecKList(FireBackCheckListPageQry qry) {
|
||||
if (qry.getUserId() == null) {
|
||||
qry.setUserId(AuthContext.getUserId());
|
||||
}
|
||||
Map<String, Object> params = PageQueryHelper.toHashMap(qry);
|
||||
|
||||
PageResponse<FireCheckListDO> pageResponse = fireCheckListRepository.getBackChecKList(params);
|
||||
List<FireBackCheckListCO> fireBackCheckListCOList = fireCheckListCoConvertor.converDOsToBackCOs(pageResponse.getData());
|
||||
|
||||
if (CollUtil.isEmpty(fireBackCheckListCOList)) {
|
||||
return PageResponse.of(fireBackCheckListCOList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
|
||||
}
|
||||
//补充检查数和完整检查人
|
||||
|
||||
List<String> fireCheckIdList = fireBackCheckListCOList.stream().map(FireBackCheckListCO::getFireCheckId).collect(Collectors.toList());
|
||||
//补充完整的用户负责人
|
||||
List<FireCheckListStatisticDO> fireCheckListStatisticDOList = fireCheckListUserRepository.getListUserStatisticByFireCheckIdList(fireCheckIdList);
|
||||
//fireCheckListUserDOList转换为key value map
|
||||
Map<String, FireCheckListStatisticDO> fireCheckListUserDONameMap = fireCheckListStatisticDOList.stream()
|
||||
.collect(Collectors.toMap(FireCheckListStatisticDO::getFireCheckId, Function.identity()));
|
||||
//获取清单的检查数量
|
||||
//补充检查数和完整检查人
|
||||
fireBackCheckListCOList.forEach(fireBackCheckListCO -> {
|
||||
//补充检查数量
|
||||
if (CollUtil.isNotEmpty(fireCheckListUserDONameMap) && fireCheckListUserDONameMap.get(fireBackCheckListCO.getFireCheckId()) != null) {
|
||||
FireCheckListStatisticDO fireCheckListStatisticDO = fireCheckListUserDONameMap.get(fireBackCheckListCO.getFireCheckId());
|
||||
fireBackCheckListCO.setUserNameList(fireCheckListStatisticDO.getUserName());
|
||||
fireBackCheckListCO.setCheckCount(fireCheckListStatisticDO.getCheckCount());
|
||||
}
|
||||
});
|
||||
return PageResponse.of(fireBackCheckListCOList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public PageResponse<FireCheckListCO> checkListRecordList(FireCheckListRecordPageQry qry) {
|
||||
Map<String, Object> params = PageQueryHelper.toHashMap(qry);
|
||||
PageResponse<FireCheckListDO> pageResponse = fireCheckListRepository.checkListRecordList(params);
|
||||
List<FireCheckListCO> examCenterCOS = fireCheckListCoConvertor.converDOsToCOs(pageResponse.getData());
|
||||
if (CollUtil.isEmpty(examCenterCOS)) {
|
||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
List<String> fireCheckIdList = examCenterCOS.stream().map(FireCheckListCO::getFireCheckId).collect(Collectors.toList());
|
||||
//补充完整的用户负责人
|
||||
List<FireCheckListUserDO> fireCheckListUserDOList = fireCheckListUserRepository.getListUserNameByFireCheckIdList(fireCheckIdList);
|
||||
//fireCheckListUserDOList转换为key value map
|
||||
Map<String, String> fireCheckListUserDONameMap = fireCheckListUserDOList.stream()
|
||||
.collect(Collectors.groupingBy(
|
||||
FireCheckListUserDO::getFireCheckId,
|
||||
Collectors.mapping(FireCheckListUserDO::getUserName, Collectors.joining(","))));
|
||||
//获取检查次数
|
||||
List<FireCheckRecordStatisticDO> fireCheckRecordStatisticDOList = fireCheckRecordRepository.statisticListByFireCheckIdList(fireCheckIdList);
|
||||
//fireCheckListItemStatisticDOList转换为key value map
|
||||
|
||||
Map<String, Long> fireCheckListItemStatisticDOMap = fireCheckRecordStatisticDOList.stream().collect(Collectors.toMap(FireCheckRecordStatisticDO::getFireCheckId, FireCheckRecordStatisticDO::getFireCheckCount));
|
||||
//补充点位数和排查周期
|
||||
for (FireCheckListCO fireCheckListCO : examCenterCOS) {
|
||||
fireCheckListCO.setCheckCount(fireCheckListItemStatisticDOMap.getOrDefault(fireCheckListCO.getFireCheckId(), 0L));
|
||||
FireCheckListE info = new FireCheckListE();
|
||||
info.getCheckRecordPeriod(fireCheckListCO.getFireCheckType(), LocalDateTime.now());
|
||||
fireCheckListCO.setCheckStartTime(info.getPeriodStart());
|
||||
fireCheckListCO.setCheckEndTime(info.getPeriodEnd());
|
||||
fireCheckListCO.setUserName(fireCheckListUserDONameMap.getOrDefault(fireCheckListCO.getFireCheckId(), ""));
|
||||
}
|
||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
|
||||
public PageResponse<FireCheckListCO> getCheckListRecord(CheckListRecordPageQry qry) {
|
||||
|
||||
Map<String, Object> params = PageQueryHelper.toHashMap(qry);
|
||||
PageResponse<FireCheckListDO> pageResponse = fireCheckListRepository.getCheckListRecord(params);
|
||||
List<FireCheckListCO> examCenterCOS = fireCheckListCoConvertor.converDOsToCOs(pageResponse.getData());
|
||||
if(CollUtil.isEmpty(examCenterCOS)){
|
||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
List<String> fireCheckIdList = examCenterCOS.stream().map(FireCheckListCO::getFireCheckId).collect(Collectors.toList());
|
||||
//补充完整的用户负责人
|
||||
List<FireCheckListUserDO> fireCheckListUserDOList = fireCheckListUserRepository.getListUserNameByFireCheckIdList(fireCheckIdList);
|
||||
//fireCheckListUserDOList转换为key value map
|
||||
Map<String, String> fireCheckListUserDONameMap = fireCheckListUserDOList.stream()
|
||||
.collect(Collectors.groupingBy(
|
||||
FireCheckListUserDO::getFireCheckId,
|
||||
Collectors.mapping(FireCheckListUserDO::getUserName, Collectors.joining(","))));
|
||||
examCenterCOS.forEach(info -> {
|
||||
info.setUserName(fireCheckListUserDONameMap.getOrDefault(info.getFireCheckId(), ""));
|
||||
});
|
||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
package com.zcloud.fire.check.command.query;
|
||||
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.zcloud.fire.check.command.convertor.FireCheckListUserCoConvertor;
|
||||
import com.zcloud.fire.check.dto.FireCheckListUserPageQry;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckListUserCO;
|
||||
import com.zcloud.fire.check.persistence.dataobject.FireCheckListUserDO;
|
||||
import com.zcloud.fire.check.persistence.repository.FireCheckListUserRepository;
|
||||
import com.zcloud.gbscommon.utils.PageQueryHelper;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-11 15:32:50
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckListUserQueryExe {
|
||||
private final FireCheckListUserRepository fireCheckListUserRepository;
|
||||
private final FireCheckListUserCoConvertor fireCheckListUserCoConvertor;
|
||||
|
||||
/**
|
||||
* 分页
|
||||
*
|
||||
* @param fireCheckListUserPageQry
|
||||
* @return
|
||||
*/
|
||||
public PageResponse<FireCheckListUserCO> execute(FireCheckListUserPageQry fireCheckListUserPageQry) {
|
||||
Map<String, Object> params = PageQueryHelper.toHashMap(fireCheckListUserPageQry);
|
||||
PageResponse<FireCheckListUserDO> pageResponse = fireCheckListUserRepository.listPage(params);
|
||||
List<FireCheckListUserCO> examCenterCOS = fireCheckListUserCoConvertor.converDOsToCOs(pageResponse.getData());
|
||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
package com.zcloud.fire.check.command.query;
|
||||
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.zcloud.fire.check.command.convertor.FireCheckRecordDeviceCoConvertor;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordDevicePageQry;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckRecordDeviceCO;
|
||||
import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordDeviceDO;
|
||||
import com.zcloud.fire.check.persistence.repository.FireCheckRecordDeviceRepository;
|
||||
import com.zcloud.gbscommon.utils.PageQueryHelper;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:03
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckRecordDeviceQueryExe {
|
||||
private final FireCheckRecordDeviceRepository fireCheckRecordDeviceRepository;
|
||||
private final FireCheckRecordDeviceCoConvertor fireCheckRecordDeviceCoConvertor;
|
||||
|
||||
/**
|
||||
* 分页
|
||||
*
|
||||
* @param fireCheckRecordDevicePageQry
|
||||
* @return
|
||||
*/
|
||||
public PageResponse<FireCheckRecordDeviceCO> execute(FireCheckRecordDevicePageQry fireCheckRecordDevicePageQry) {
|
||||
Map<String, Object> params = PageQueryHelper.toHashMap(fireCheckRecordDevicePageQry);
|
||||
PageResponse<FireCheckRecordDeviceDO> pageResponse = fireCheckRecordDeviceRepository.listPage(params);
|
||||
List<FireCheckRecordDeviceCO> examCenterCOS = fireCheckRecordDeviceCoConvertor.converDOsToCOs(pageResponse.getData());
|
||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
package com.zcloud.fire.check.command.query;
|
||||
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.zcloud.fire.check.command.convertor.FireCheckRecordHiddenCoConvertor;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordHiddenPageQry;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckRecordHiddenCO;
|
||||
import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordHiddenDO;
|
||||
import com.zcloud.fire.check.persistence.repository.FireCheckRecordHiddenRepository;
|
||||
import com.zcloud.gbscommon.utils.PageQueryHelper;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:11:15
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckRecordHiddenQueryExe {
|
||||
private final FireCheckRecordHiddenRepository fireCheckRecordHiddenRepository;
|
||||
private final FireCheckRecordHiddenCoConvertor fireCheckRecordHiddenCoConvertor;
|
||||
|
||||
/**
|
||||
* 分页
|
||||
*
|
||||
* @param fireCheckRecordHiddenPageQry
|
||||
* @return
|
||||
*/
|
||||
public PageResponse<FireCheckRecordHiddenCO> execute(FireCheckRecordHiddenPageQry fireCheckRecordHiddenPageQry) {
|
||||
Map<String, Object> params = PageQueryHelper.toHashMap(fireCheckRecordHiddenPageQry);
|
||||
PageResponse<FireCheckRecordHiddenDO> pageResponse = fireCheckRecordHiddenRepository.listPage(params);
|
||||
List<FireCheckRecordHiddenCO> examCenterCOS = fireCheckRecordHiddenCoConvertor.converDOsToCOs(pageResponse.getData());
|
||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,111 @@
|
|||
package com.zcloud.fire.check.command.query;
|
||||
|
||||
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.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.gbscommon.utils.PageQueryHelper;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:20
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckRecordPointQueryExe {
|
||||
private final FireCheckRecordPointRepository fireCheckRecordPointRepository;
|
||||
private final FireCheckRecordPointCoConvertor fireCheckRecordPointCoConvertor;
|
||||
private final FireCheckRecordDeviceRepository fireCheckRecordDeviceRepository;
|
||||
private final FireCheckRecordDeviceCoConvertor fireCheckRecordDeviceCoConvertor;
|
||||
private final FireCheckRecordHiddenRepository fireCheckRecordHiddenRepository;
|
||||
private final FireCheckRecordHiddenCoConvertor fireCheckRecordHiddenCoConvertor;
|
||||
/**
|
||||
* 分页
|
||||
*
|
||||
* @param fireCheckRecordPointPageQry
|
||||
* @return
|
||||
*/
|
||||
public PageResponse<FireCheckRecordPointCO> execute(FireCheckRecordPointPageQry fireCheckRecordPointPageQry) {
|
||||
Map<String, Object> params = PageQueryHelper.toHashMap(fireCheckRecordPointPageQry);
|
||||
PageResponse<FireCheckRecordPointDO> pageResponse = fireCheckRecordPointRepository.listPage(params);
|
||||
List<FireCheckRecordPointCO> examCenterCOS = fireCheckRecordPointCoConvertor.converDOsToCOs(pageResponse.getData());
|
||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
|
||||
public PageResponse<FireCheckPointListCO> getCheckRecordPointList(CheckRecordPointListQry qry) {
|
||||
Map<String, Object> params = PageQueryHelper.toHashMap(qry);
|
||||
PageResponse<FireCheckRecordPointDO> pageResponse = fireCheckRecordPointRepository.getCheckRecordPointList(params);
|
||||
List<FireCheckPointListCO> fireCheckPointListCOList = fireCheckRecordPointCoConvertor.converDOsToPointCOs(pageResponse.getData());
|
||||
if(CollUtil.isEmpty(fireCheckPointListCOList)){
|
||||
return PageResponse.of(fireCheckPointListCOList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
//组装设备信息,fireCheckPointListCOList idlist集合
|
||||
|
||||
|
||||
|
||||
List<String> idList = fireCheckPointListCOList.stream().map(FireCheckPointListCO::getFireRecordPointId).collect(Collectors.toList());
|
||||
//idList 获取打回的设备检查项信息
|
||||
List<FireCheckRecordDeviceDO> fireCheckRecordDeviceDOList = fireCheckRecordDeviceRepository.getBackChecKRecordPoiList(idList);
|
||||
if(CollUtil.isEmpty(fireCheckRecordDeviceDOList)){
|
||||
return PageResponse.of(fireCheckPointListCOList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
|
||||
List<String> fireRecordDeviceIdList = fireCheckRecordDeviceDOList.stream().map(FireCheckRecordDeviceDO::getFireRecordDeviceId).collect(Collectors.toList());
|
||||
//获取隐患信息
|
||||
List<FireCheckRecordHiddenDO> fireCheckRecordHiddenDOList = fireCheckRecordHiddenRepository.getChecKRecordDeviceList(fireRecordDeviceIdList);
|
||||
//fireCheckRecordHiddenDOList 按照设备id key value对象
|
||||
|
||||
Map<String, FireCheckRecordHiddenDO> fireCheckRecordHiddenDOMap = fireCheckRecordHiddenDOList.stream()
|
||||
.collect(Collectors.toMap(FireCheckRecordHiddenDO::getFireRecordDeviceId, Function.identity()));
|
||||
|
||||
//fireCheckRecordDeviceDOList 分组
|
||||
Map<String, List<FireCheckRecordDeviceDO>> collect = fireCheckRecordDeviceDOList.stream().collect(Collectors.groupingBy(FireCheckRecordDeviceDO::getFireRecordPointId));
|
||||
//fireCheckPointListCOList 遍历 合并设备信息
|
||||
fireCheckPointListCOList.forEach(item -> {
|
||||
List<FireCheckRecordDeviceDO> deviceDOList = collect.get(item.getFireRecordPointId());
|
||||
if(CollUtil.isNotEmpty(deviceDOList)){
|
||||
List<FireCheckRecordDeviceCO> fireCheckPointDeviceListCOS = fireCheckRecordDeviceCoConvertor.converDOsToDeviceCOs(deviceDOList);
|
||||
fireCheckPointDeviceListCOS.forEach(deviceCO -> {
|
||||
//处理检查标准
|
||||
deviceCO.setFireCheckStandardInfo(deviceCO.getFireCheckStandardInfo());
|
||||
//处理检查隐患信息
|
||||
FireCheckRecordHiddenDO hiddenDO = fireCheckRecordHiddenDOMap.get(deviceCO.getFireRecordDeviceId());
|
||||
if(hiddenDO != null){
|
||||
deviceCO.setFireCheckRecordHiddenCO(fireCheckRecordHiddenCoConvertor.convertToCO(hiddenDO));
|
||||
}
|
||||
});
|
||||
|
||||
item.setFireCheckRecordDeviceStatusList(fireCheckPointDeviceListCOS);
|
||||
//处理检查标准
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
return PageResponse.of(fireCheckPointListCOList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,179 @@
|
|||
package com.zcloud.fire.check.command.query;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
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.UserTypeEnum;
|
||||
import com.zcloud.fire.check.dto.CorpStatisticsPageQry;
|
||||
import com.zcloud.fire.check.dto.FireBackCheckRecordPageQry;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordPagePointQry;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordPageQry;
|
||||
import com.zcloud.fire.check.dto.clientobject.*;
|
||||
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.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:59
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckRecordQueryExe {
|
||||
private final FireCheckRecordRepository fireCheckRecordRepository;
|
||||
private final FireCheckRecordCoConvertor fireCheckRecordCoConvertor;
|
||||
private final FireCheckRecordUserRepository fireCheckRecordUserRepository;
|
||||
private final FireCheckRecordHiddenRepository fireCheckRecordHiddenRepository;
|
||||
private final FireCheckRecordUserCoConvertor fireCheckRecordUserCoConvertor;
|
||||
private final FireCheckRecordHiddenCoConvertor fireCheckRecordHiddenCoConvertor;
|
||||
private final FireCheckRecordDeviceRepository fireCheckRecordDeviceRepository;
|
||||
private final FireCheckRecordDeviceCoConvertor fireCheckRecordDeviceCoConvertor;
|
||||
private final CorpInfoRepository corpInfoRepository;
|
||||
private final CorpInfoCoConvertor corpInfoCoConvertor;
|
||||
private final FireCheckListUserRepository fireCheckListUserRepository;
|
||||
/**
|
||||
* 分页
|
||||
*
|
||||
* @param fireCheckRecordPageQry
|
||||
* @return
|
||||
*/
|
||||
public PageResponse<FireCheckRecordCO> execute(FireCheckRecordPageQry fireCheckRecordPageQry) {
|
||||
Map<String, Object> params = PageQueryHelper.toHashMap(fireCheckRecordPageQry);
|
||||
PageResponse<FireCheckRecordDO> pageResponse = fireCheckRecordRepository.getCheckRecordList(params);
|
||||
List<FireCheckRecordCO> examCenterCOS = fireCheckRecordCoConvertor.converDOsToCOs(pageResponse.getData());
|
||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
|
||||
public PageResponse<FireBackCheckRecordCO> getCheckRecordList(FireBackCheckRecordPageQry qry) {
|
||||
Map<String, Object> params = PageQueryHelper.toHashMap(qry);
|
||||
|
||||
PageResponse<FireCheckRecordDO> pageResponse = fireCheckRecordRepository.getCheckRecordList(params);
|
||||
List<FireBackCheckRecordCO> fireBackCheckRecordCOList = fireCheckRecordCoConvertor.converDOsToBackRecordCOs(pageResponse.getData());
|
||||
if(CollUtil.isEmpty(fireBackCheckRecordCOList)){
|
||||
return PageResponse.of(fireBackCheckRecordCOList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
//涉及点位数和负责人补全
|
||||
List<String> fireCheckIdList =fireBackCheckRecordCOList.stream().map(FireBackCheckRecordCO::getFireCheckId).collect(Collectors.toList());
|
||||
//补充完整的用户负责人
|
||||
List<FireCheckListUserDO> fireCheckListStatisticDOList = fireCheckListUserRepository.getListUserByFireCheckIdList(fireCheckIdList);
|
||||
//fireCheckListUserDOList转换为key value username
|
||||
Map<String, String> fireCheckListUserDOMap = fireCheckListStatisticDOList.stream()
|
||||
.collect(Collectors.toMap(FireCheckListUserDO::getFireCheckId, FireCheckListUserDO::getUserName));
|
||||
|
||||
//获取清单的检查数量
|
||||
//补充检查数和完整检查人
|
||||
fireBackCheckRecordCOList.forEach(fireBackCheckListCO -> {
|
||||
//补充检查数量
|
||||
if (CollUtil.isNotEmpty(fireCheckListUserDOMap) && fireCheckListUserDOMap.get(fireBackCheckListCO.getFireCheckId()) != null) {
|
||||
fireBackCheckListCO.setUserName(fireCheckListUserDOMap.get(fireBackCheckListCO.getFireCheckId()));
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
|
||||
return PageResponse.of(fireBackCheckRecordCOList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
|
||||
|
||||
public FireCheckRecordCO getChecKRecordInfo(String fireRecordId) {
|
||||
FireCheckRecordDO fireCheckRecordDO = fireCheckRecordRepository.getChecKRecordInfo(fireRecordId);
|
||||
|
||||
if(fireCheckRecordDO == null){
|
||||
return null;
|
||||
}
|
||||
FireCheckRecordCO fireCheckRecordCO = new FireCheckRecordCO();
|
||||
BeanUtils.copyProperties(fireCheckRecordDO, fireCheckRecordCO);
|
||||
//补充检查用户信息
|
||||
List<FireCheckRecordUserDO> fireCheckRecordUserDOList =fireCheckRecordUserRepository.getListByFireRecordId(fireRecordId);
|
||||
if(CollUtil.isNotEmpty(fireCheckRecordUserDOList)){
|
||||
fireCheckRecordCO.setFireCheckRecordUserList(fireCheckRecordUserCoConvertor.converDOsToCOs(fireCheckRecordUserDOList));
|
||||
}
|
||||
//补充其他隐患信息
|
||||
List< FireCheckRecordHiddenDO> fireCheckRecordHiddenDOList = fireCheckRecordHiddenRepository.getChecKRecordHiddenList(fireRecordId);
|
||||
if(CollUtil.isNotEmpty(fireCheckRecordHiddenDOList)){
|
||||
fireCheckRecordCO.setFireCheckRecordHiddenList(fireCheckRecordHiddenCoConvertor.converDOsToCOs(fireCheckRecordHiddenDOList));
|
||||
}
|
||||
//添加检查内容
|
||||
List<FireCheckRecordDeviceDO> fireCheckRecordDeviceCOList = fireCheckRecordDeviceRepository.getCheckRecordDeviceList(fireCheckRecordDO.getFireRecordId());
|
||||
|
||||
if(CollUtil.isNotEmpty(fireCheckRecordDeviceCOList)){
|
||||
List<FireCheckRecordDeviceCO> fireCheckRecordDeviceCOS = fireCheckRecordDeviceCoConvertor.converDOsToCOs(fireCheckRecordDeviceCOList);
|
||||
//补充隐患信息
|
||||
//fireCheckRecordDeviceCOS获取List id
|
||||
List<String> idList = fireCheckRecordDeviceCOS.stream().map(FireCheckRecordDeviceCO::getFireRecordDeviceId).collect(Collectors.toList());
|
||||
List<FireCheckRecordHiddenDO> checKRecordDeviceHiddenList = fireCheckRecordHiddenRepository.getChecKRecordDeviceList(idList);
|
||||
Map<String, FireCheckRecordHiddenDO> fireCheckRecordHiddenDOMap = checKRecordDeviceHiddenList.stream()
|
||||
.collect(Collectors.toMap(FireCheckRecordHiddenDO::getFireRecordDeviceId, Function.identity()));
|
||||
|
||||
//补充隐患信息
|
||||
fireCheckRecordDeviceCOS.forEach(info -> {
|
||||
FireCheckRecordHiddenDO fireCheckRecordHiddenDO = fireCheckRecordHiddenDOMap.get(info.getFireRecordDeviceId());
|
||||
if(fireCheckRecordHiddenDO != null){
|
||||
info.setFireCheckRecordHiddenCO(fireCheckRecordHiddenCoConvertor.convertToCO(fireCheckRecordHiddenDO));
|
||||
}
|
||||
});
|
||||
fireCheckRecordCO.setFireCheckRecordDeviceList(fireCheckRecordDeviceCOS);
|
||||
}
|
||||
|
||||
return fireCheckRecordCO;
|
||||
}
|
||||
|
||||
public FireCheckRecordCO getInfoById(Long id) {
|
||||
FireCheckRecordDO fireCheckRecordDO = fireCheckRecordRepository.getById( id);
|
||||
if(fireCheckRecordDO == null){
|
||||
return null;
|
||||
}
|
||||
FireCheckRecordCO checKRecordInfo = getChecKRecordInfo(fireCheckRecordDO.getFireRecordId());
|
||||
|
||||
|
||||
return checKRecordInfo;
|
||||
}
|
||||
|
||||
public PageResponse<CorpCheckStatisticsCO> corpCheckRecordList(CorpStatisticsPageQry qry) {
|
||||
Map<String, Object> params = PageQueryHelper.toHashMap(qry);
|
||||
//企业端
|
||||
params.put("inType", CorpTypeEnum.getCodesByEnterpriseType(UserTypeEnum.QY.getCode()));
|
||||
params.put("eqUseFlag", CommonFlagEnum.YES.getCode());
|
||||
|
||||
PageResponse<CorpInfoDO> pageResponse = corpInfoRepository.listPage(params);
|
||||
if(CollUtil.isEmpty(pageResponse.getData())){
|
||||
return PageResponse.of(null, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
|
||||
List<CorpCheckStatisticsCO> examCenterCOS = corpInfoCoConvertor.converCorpDOsToCorpCheckStatisticsCO(pageResponse.getData());
|
||||
//获取企业id
|
||||
List<Long> corpinfoIds = examCenterCOS.stream().map(CorpCheckStatisticsCO::getId).collect(Collectors.toList());
|
||||
//获取消防区域数量
|
||||
List<DataStatisticDO> fireRegionCountMap = fireCheckRecordRepository.DataStatisticDO(corpinfoIds);
|
||||
examCenterCOS.forEach(info -> {
|
||||
info.setCheckCount(fireRegionCountMap.stream()
|
||||
.filter(item -> item.getCorpinfoId().equals(info.getId()))
|
||||
.map(DataStatisticDO::getTotalCount)
|
||||
.findFirst()
|
||||
.orElse(0));
|
||||
});
|
||||
|
||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
|
||||
public PageResponse<FireCheckRecordCO> getCheckRecordPageH5(FireCheckRecordPagePointQry qry) {
|
||||
Map<String, Object> params = PageQueryHelper.toHashMap(qry);
|
||||
PageResponse<FireCheckRecordDO> pageResponse = fireCheckRecordRepository.getCheckRecordPageH5(params);
|
||||
List<FireCheckRecordCO> examCenterCOS = fireCheckRecordCoConvertor.converDOsToCOs(pageResponse.getData());
|
||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
package com.zcloud.fire.check.command.query;
|
||||
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.zcloud.fire.check.command.convertor.FireCheckRecordUserCoConvertor;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordUserPageQry;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckRecordUserCO;
|
||||
import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordUserDO;
|
||||
import com.zcloud.fire.check.persistence.repository.FireCheckRecordUserRepository;
|
||||
import com.zcloud.gbscommon.utils.PageQueryHelper;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:12:04
|
||||
*/
|
||||
@Component
|
||||
@AllArgsConstructor
|
||||
public class FireCheckRecordUserQueryExe {
|
||||
private final FireCheckRecordUserRepository fireCheckRecordUserRepository;
|
||||
private final FireCheckRecordUserCoConvertor fireCheckRecordUserCoConvertor;
|
||||
|
||||
/**
|
||||
* 分页
|
||||
*
|
||||
* @param fireCheckRecordUserPageQry
|
||||
* @return
|
||||
*/
|
||||
public PageResponse<FireCheckRecordUserCO> execute(FireCheckRecordUserPageQry fireCheckRecordUserPageQry) {
|
||||
Map<String, Object> params = PageQueryHelper.toHashMap(fireCheckRecordUserPageQry);
|
||||
PageResponse<FireCheckRecordUserDO> pageResponse = fireCheckRecordUserRepository.listPage(params);
|
||||
List<FireCheckRecordUserCO> examCenterCOS = fireCheckRecordUserCoConvertor.converDOsToCOs(pageResponse.getData());
|
||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -64,8 +64,8 @@ public class FireCheckStandardQueryExe {
|
|||
}
|
||||
|
||||
|
||||
public void importFireCheckStandardList(MultipartFile file, FireCheckStandardImportCmd fireCheckStandardImportCmd) {
|
||||
List<FireCheckStandardE> fireCheckStandardEs = FireCheckStandardE.importFireCheckStandardList(file, fireCheckStandardImportCmd.getFireDeviceType(), fireCheckStandardImportCmd.getFireDeviceTypeName());
|
||||
public void importFireCheckStandardList(FireCheckStandardImportCmd fireCheckStandardImportCmd) {
|
||||
List<FireCheckStandardE> fireCheckStandardEs = FireCheckStandardE.importFireCheckStandardList(fireCheckStandardImportCmd.getFile(), fireCheckStandardImportCmd.getFireDeviceType(), fireCheckStandardImportCmd.getFireDeviceTypeName());
|
||||
// 批量插入
|
||||
boolean res = false;
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -1,16 +1,24 @@
|
|||
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.cola.exception.BizException;
|
||||
import com.jjb.saas.framework.auth.utils.AuthContext;
|
||||
import com.zcloud.fire.check.command.convertor.FireCheckStandardCoConvertor;
|
||||
import com.zcloud.fire.check.command.convertor.FireDeviceCoConvertor;
|
||||
import com.zcloud.fire.check.domain.enums.CommonFlagEnum;
|
||||
import com.zcloud.fire.check.domain.enums.CorpTypeEnum;
|
||||
import com.zcloud.fire.check.domain.enums.UserTypeEnum;
|
||||
import com.zcloud.fire.check.domain.gateway.FirePointGateway;
|
||||
import com.zcloud.fire.check.domain.gateway.FireRegionGateway;
|
||||
import com.zcloud.fire.check.domain.model.*;
|
||||
import com.zcloud.fire.check.dto.CorpStatisticsPageQry;
|
||||
import com.zcloud.fire.check.dto.FireDeviceListQry;
|
||||
import com.zcloud.fire.check.dto.FireDevicePageQry;
|
||||
import com.zcloud.fire.check.dto.FirePointPageQry;
|
||||
import com.zcloud.fire.check.dto.clientobject.CorpStatisticsCO;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckStandardCO;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireDeviceCO;
|
||||
import com.zcloud.fire.check.dto.clientobject.FirePointCO;
|
||||
import com.zcloud.fire.check.persistence.dataobject.*;
|
||||
|
|
@ -26,10 +34,9 @@ import org.springframework.transaction.annotation.Transactional;
|
|||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.*;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -49,6 +56,9 @@ public class FireDeviceQueryExe {
|
|||
private final FirePointRepository firePointRepository;
|
||||
private final FireRegionGateway fireRegionGateway;
|
||||
private final FirePointGateway firePointGateway;
|
||||
private final CorpInfoRepository corpInfoRepository;
|
||||
private final FireCheckStandardRepository fireCheckStandardRepository;
|
||||
private final FireCheckStandardCoConvertor fireCheckStandardCoConvertor;
|
||||
|
||||
/**
|
||||
* 分页
|
||||
|
|
@ -59,12 +69,29 @@ public class FireDeviceQueryExe {
|
|||
public PageResponse<FireDeviceCO> execute(FireDevicePageQry fireDevicePageQry) {
|
||||
Map<String, Object> params = PageQueryHelper.toHashMap(fireDevicePageQry);
|
||||
PageResponse<FireDeviceDO> pageResponse = fireDeviceRepository.listPage(params);
|
||||
if (CollUtil.isEmpty(pageResponse.getData())) {
|
||||
return PageResponse.of(null, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
List<FireDeviceCO> examCenterCOS = fireDeviceCoConvertor.converDOsToCOs(pageResponse.getData());
|
||||
//拼接消防器材检查标准，获取list
|
||||
List<String> fireDeviceTypeList = examCenterCOS.stream().map(FireDeviceCO::getFireDeviceType).collect(Collectors.toList());
|
||||
//根据list查询消防器材检查标准
|
||||
List<FireCheckStandardDO> fireCheckStandardDOList = fireCheckStandardRepository.getCheckStandardList(fireDeviceTypeList);
|
||||
if (CollUtil.isNotEmpty(fireCheckStandardDOList)) {
|
||||
List<FireCheckStandardCO> fireCheckStandardCOList = fireCheckStandardCoConvertor.converDOsToCOs(fireCheckStandardDOList);
|
||||
Map<String, List<FireCheckStandardCO>> fireCheckStandardMap = fireCheckStandardCOList.stream()
|
||||
.collect(Collectors.groupingBy(FireCheckStandardCO::getFireDeviceType));
|
||||
examCenterCOS.forEach(info -> {
|
||||
info.setFireCheckStandardList(fireCheckStandardMap.get(info.getFireDeviceType()));
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
|
||||
public FireDeviceCO getInfoById(Long id) {
|
||||
FireDeviceDO fireDeviceDO = fireDeviceRepository.getById(id);
|
||||
FireDeviceDO fireDeviceDO = fireDeviceRepository.getInfoById(id);
|
||||
if (fireDeviceDO == null) {
|
||||
return null;
|
||||
}
|
||||
|
|
@ -145,5 +172,41 @@ public class FireDeviceQueryExe {
|
|||
List<FireDeviceCO> examCenterCOS = fireDeviceCoConvertor.converDOsToCOs(pageResponse);
|
||||
return examCenterCOS;
|
||||
}
|
||||
|
||||
public PageResponse<CorpStatisticsCO> corpStatisticslist(CorpStatisticsPageQry qry) {
|
||||
Map<String, Object> params = PageQueryHelper.toHashMap(qry);
|
||||
//企业端
|
||||
params.put("inType", CorpTypeEnum.getCodesByEnterpriseType(UserTypeEnum.QY.getCode()));
|
||||
params.put("eqUseFlag", CommonFlagEnum.YES.getCode());
|
||||
|
||||
PageResponse<CorpInfoDO> pageResponse = corpInfoRepository.listPage(params);
|
||||
if (CollUtil.isEmpty(pageResponse.getData())) {
|
||||
return PageResponse.of(null, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
|
||||
List<CorpStatisticsCO> examCenterCOS = fireDeviceCoConvertor.converCorpDOsToCorpCO(pageResponse.getData());
|
||||
//获取企业id
|
||||
List<Long> corpinfoIds = examCenterCOS.stream().map(CorpStatisticsCO::getId).collect(Collectors.toList());
|
||||
//获取消防区域数量
|
||||
List<DataStatisticDO> fireRegionCountMap = fireRegionRepository.countByCorpinfoIds(corpinfoIds);
|
||||
//按照企业id进行分组
|
||||
Map<Long, DataStatisticDO> fireRegionCountMapGroup = fireRegionCountMap.stream().collect(Collectors.toMap(DataStatisticDO::getCorpinfoId, Function.identity()));
|
||||
//获取消防点位数量
|
||||
List<DataStatisticDO> firePointCountMap = firePointRepository.countByCorpinfoIds(corpinfoIds);
|
||||
Map<Long, DataStatisticDO> firePointCountMapGroup = firePointCountMap.stream().collect(Collectors.toMap(DataStatisticDO::getCorpinfoId, Function.identity()));
|
||||
List<DataStatisticDO> fireDeviceCountMap = fireDeviceRepository.countByCorpinfoIds(corpinfoIds);
|
||||
Map<Long, DataStatisticDO> fireDeviceCountMapGroup = fireDeviceCountMap.stream().collect(Collectors.toMap(DataStatisticDO::getCorpinfoId, Function.identity()));
|
||||
|
||||
examCenterCOS.forEach(examCenterCO -> {
|
||||
examCenterCO.setFireRegionCount(fireRegionCountMapGroup.getOrDefault(examCenterCO.getId(), new DataStatisticDO()).getTotalCount());
|
||||
examCenterCO.setFirePointCount(firePointCountMapGroup.getOrDefault(examCenterCO.getId(), new DataStatisticDO()).getTotalCount());
|
||||
examCenterCO.setFireDeviceCount(fireDeviceCountMapGroup.getOrDefault(examCenterCO.getId(), new DataStatisticDO()).getTotalCount());
|
||||
});
|
||||
|
||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ public class FirePointQueryExe {
|
|||
}
|
||||
|
||||
public FirePointCO getInfoById(Long id) {
|
||||
FirePointDO firePointDO = firePointRepository.getById(id);
|
||||
FirePointDO firePointDO = firePointRepository.getInfoById(id);
|
||||
if(firePointDO == null){
|
||||
return null;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,59 @@
|
|||
package com.zcloud.fire.check.service;
|
||||
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.zcloud.fire.check.api.FireCheckListItemServiceI;
|
||||
import com.zcloud.fire.check.command.FireCheckListItemAddExe;
|
||||
import com.zcloud.fire.check.command.FireCheckListItemRemoveExe;
|
||||
import com.zcloud.fire.check.command.FireCheckListItemUpdateExe;
|
||||
import com.zcloud.fire.check.command.query.FireCheckListItemQueryExe;
|
||||
import com.zcloud.fire.check.dto.FireCheckListItemAddCmd;
|
||||
import com.zcloud.fire.check.dto.FireCheckListItemPageQry;
|
||||
import com.zcloud.fire.check.dto.FireCheckListItemUpdateCmd;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckListItemCO;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:29
|
||||
*/
|
||||
@Service
|
||||
@AllArgsConstructor
|
||||
public class FireCheckListItemServiceImpl implements FireCheckListItemServiceI {
|
||||
private final FireCheckListItemAddExe fireCheckListItemAddExe;
|
||||
private final FireCheckListItemUpdateExe fireCheckListItemUpdateExe;
|
||||
private final FireCheckListItemRemoveExe fireCheckListItemRemoveExe;
|
||||
private final FireCheckListItemQueryExe fireCheckListItemQueryExe;
|
||||
|
||||
@Override
|
||||
public PageResponse<FireCheckListItemCO> listPage(FireCheckListItemPageQry qry) {
|
||||
|
||||
return fireCheckListItemQueryExe.execute(qry);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SingleResponse add(FireCheckListItemAddCmd cmd) {
|
||||
|
||||
fireCheckListItemAddExe.execute(cmd);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void edit(FireCheckListItemUpdateCmd fireCheckListItemUpdateCmd) {
|
||||
fireCheckListItemUpdateExe.execute(fireCheckListItemUpdateCmd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void remove(Long id) {
|
||||
fireCheckListItemRemoveExe.execute(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeBatch(Long[] ids) {
|
||||
fireCheckListItemRemoveExe.execute(ids);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,110 @@
|
|||
package com.zcloud.fire.check.service;
|
||||
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.zcloud.fire.check.api.FireCheckListServiceI;
|
||||
import com.zcloud.fire.check.command.FireCheckListAddExe;
|
||||
import com.zcloud.fire.check.command.FireCheckListRemoveExe;
|
||||
import com.zcloud.fire.check.command.FireCheckListUpdateExe;
|
||||
import com.zcloud.fire.check.command.query.FireCheckListQueryExe;
|
||||
import com.zcloud.fire.check.dto.*;
|
||||
import com.zcloud.fire.check.dto.clientobject.*;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:09
|
||||
*/
|
||||
@Service
|
||||
@AllArgsConstructor
|
||||
public class FireCheckListServiceImpl implements FireCheckListServiceI {
|
||||
private final FireCheckListAddExe fireCheckListAddExe;
|
||||
private final FireCheckListUpdateExe fireCheckListUpdateExe;
|
||||
private final FireCheckListRemoveExe fireCheckListRemoveExe;
|
||||
private final FireCheckListQueryExe fireCheckListQueryExe;
|
||||
|
||||
@Override
|
||||
public PageResponse<FireCheckListCO> listPage(FireCheckListPageQry qry) {
|
||||
return fireCheckListQueryExe.execute(qry);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SingleResponse add(FireCheckListAddCmd cmd) {
|
||||
fireCheckListAddExe.execute(cmd);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void edit(FireCheckListUpdateCmd fireCheckListUpdateCmd) {
|
||||
fireCheckListUpdateExe.execute(fireCheckListUpdateCmd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void remove(Long id) {
|
||||
fireCheckListRemoveExe.execute(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeBatch(Long[] ids) {
|
||||
fireCheckListRemoveExe.execute(ids);
|
||||
}
|
||||
@Override
|
||||
public FireCheckListCO getInfoById(Long id) {
|
||||
return fireCheckListQueryExe.getInfoById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void editState(FireCheckListUpdateStateCmd fireCheckListUpdateStateCmd) {
|
||||
fireCheckListUpdateExe.editState(fireCheckListUpdateStateCmd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageResponse<FireCheckListCO> appCheckList(FireCheckListPageQry qry) {
|
||||
return fireCheckListQueryExe.appCheckList(qry);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageResponse<RiskDistributionCO> riskDistribution(RiskDistributionPageQry qry) {
|
||||
return fireCheckListQueryExe.riskDistribution(qry);
|
||||
}
|
||||
|
||||
@Override
|
||||
public RiskDistributionStasticCO riskDistributionStatistic() {
|
||||
return fireCheckListQueryExe.riskDistributionStatistic();
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageResponse<PointDistributionCO> pointDistributionStatistic(PointDistributionPageQry qry) {
|
||||
return fireCheckListQueryExe.pointDistributionStatistic(qry);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<FireCheckPointListCO> getCheckPointList(CheckPointListQry qry) {
|
||||
return fireCheckListQueryExe.getCheckPointList(qry);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageResponse<FireBackCheckListCO> getBackChecKList(FireBackCheckListPageQry qry) {
|
||||
return fireCheckListQueryExe.getBackChecKList(qry);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public PageResponse<FireCheckListCO> checkListRecordList(FireCheckListRecordPageQry qry) {
|
||||
return fireCheckListQueryExe.checkListRecordList(qry);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageResponse<FireCheckListCO> getCheckListRecord(CheckListRecordPageQry qry) {
|
||||
return fireCheckListQueryExe.getCheckListRecord(qry);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
package com.zcloud.fire.check.service;
|
||||
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.zcloud.fire.check.api.FireCheckListUserServiceI;
|
||||
import com.zcloud.fire.check.command.FireCheckListUserAddExe;
|
||||
import com.zcloud.fire.check.command.FireCheckListUserRemoveExe;
|
||||
import com.zcloud.fire.check.command.FireCheckListUserUpdateExe;
|
||||
import com.zcloud.fire.check.command.query.FireCheckListUserQueryExe;
|
||||
import com.zcloud.fire.check.dto.FireCheckListUserAddCmd;
|
||||
import com.zcloud.fire.check.dto.FireCheckListUserPageQry;
|
||||
import com.zcloud.fire.check.dto.FireCheckListUserUpdateCmd;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckListUserCO;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-11 15:32:50
|
||||
*/
|
||||
@Service
|
||||
@AllArgsConstructor
|
||||
public class FireCheckListUserServiceImpl implements FireCheckListUserServiceI {
|
||||
private final FireCheckListUserAddExe fireCheckListUserAddExe;
|
||||
private final FireCheckListUserUpdateExe fireCheckListUserUpdateExe;
|
||||
private final FireCheckListUserRemoveExe fireCheckListUserRemoveExe;
|
||||
private final FireCheckListUserQueryExe fireCheckListUserQueryExe;
|
||||
|
||||
@Override
|
||||
public PageResponse<FireCheckListUserCO> listPage(FireCheckListUserPageQry qry) {
|
||||
|
||||
return fireCheckListUserQueryExe.execute(qry);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SingleResponse add(FireCheckListUserAddCmd cmd) {
|
||||
|
||||
fireCheckListUserAddExe.execute(cmd);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void edit(FireCheckListUserUpdateCmd fireCheckListUserUpdateCmd) {
|
||||
fireCheckListUserUpdateExe.execute(fireCheckListUserUpdateCmd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void remove(Long id) {
|
||||
fireCheckListUserRemoveExe.execute(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeBatch(Long[] ids) {
|
||||
fireCheckListUserRemoveExe.execute(ids);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
package com.zcloud.fire.check.service;
|
||||
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.zcloud.fire.check.api.FireCheckRecordDeviceServiceI;
|
||||
import com.zcloud.fire.check.command.FireCheckRecordDeviceAddExe;
|
||||
import com.zcloud.fire.check.command.FireCheckRecordDeviceRemoveExe;
|
||||
import com.zcloud.fire.check.command.FireCheckRecordDeviceUpdateExe;
|
||||
import com.zcloud.fire.check.command.query.FireCheckRecordDeviceQueryExe;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordDeviceAddCmd;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordDevicePageQry;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordDeviceUpdateCmd;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckRecordDeviceCO;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:03
|
||||
*/
|
||||
@Service
|
||||
@AllArgsConstructor
|
||||
public class FireCheckRecordDeviceServiceImpl implements FireCheckRecordDeviceServiceI {
|
||||
private final FireCheckRecordDeviceAddExe fireCheckRecordDeviceAddExe;
|
||||
private final FireCheckRecordDeviceUpdateExe fireCheckRecordDeviceUpdateExe;
|
||||
private final FireCheckRecordDeviceRemoveExe fireCheckRecordDeviceRemoveExe;
|
||||
private final FireCheckRecordDeviceQueryExe fireCheckRecordDeviceQueryExe;
|
||||
|
||||
@Override
|
||||
public PageResponse<FireCheckRecordDeviceCO> listPage(FireCheckRecordDevicePageQry qry) {
|
||||
|
||||
return fireCheckRecordDeviceQueryExe.execute(qry);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SingleResponse add(FireCheckRecordDeviceAddCmd cmd) {
|
||||
|
||||
fireCheckRecordDeviceAddExe.execute(cmd);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void edit(FireCheckRecordDeviceUpdateCmd fireCheckRecordDeviceUpdateCmd) {
|
||||
fireCheckRecordDeviceUpdateExe.execute(fireCheckRecordDeviceUpdateCmd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void remove(Long id) {
|
||||
fireCheckRecordDeviceRemoveExe.execute(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeBatch(Long[] ids) {
|
||||
fireCheckRecordDeviceRemoveExe.execute(ids);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
package com.zcloud.fire.check.service;
|
||||
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.zcloud.fire.check.api.FireCheckRecordHiddenServiceI;
|
||||
import com.zcloud.fire.check.command.FireCheckRecordHiddenAddExe;
|
||||
import com.zcloud.fire.check.command.FireCheckRecordHiddenRemoveExe;
|
||||
import com.zcloud.fire.check.command.FireCheckRecordHiddenUpdateExe;
|
||||
import com.zcloud.fire.check.command.query.FireCheckRecordHiddenQueryExe;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordHiddenAddCmd;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordHiddenPageQry;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordHiddenUpdateCmd;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckRecordHiddenCO;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:11:16
|
||||
*/
|
||||
@Service
|
||||
@AllArgsConstructor
|
||||
public class FireCheckRecordHiddenServiceImpl implements FireCheckRecordHiddenServiceI {
|
||||
private final FireCheckRecordHiddenAddExe fireCheckRecordHiddenAddExe;
|
||||
private final FireCheckRecordHiddenUpdateExe fireCheckRecordHiddenUpdateExe;
|
||||
private final FireCheckRecordHiddenRemoveExe fireCheckRecordHiddenRemoveExe;
|
||||
private final FireCheckRecordHiddenQueryExe fireCheckRecordHiddenQueryExe;
|
||||
|
||||
@Override
|
||||
public PageResponse<FireCheckRecordHiddenCO> listPage(FireCheckRecordHiddenPageQry qry) {
|
||||
|
||||
return fireCheckRecordHiddenQueryExe.execute(qry);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SingleResponse add(FireCheckRecordHiddenAddCmd cmd) {
|
||||
|
||||
fireCheckRecordHiddenAddExe.execute(cmd);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void edit(FireCheckRecordHiddenUpdateCmd fireCheckRecordHiddenUpdateCmd) {
|
||||
fireCheckRecordHiddenUpdateExe.execute(fireCheckRecordHiddenUpdateCmd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void remove(Long id) {
|
||||
fireCheckRecordHiddenRemoveExe.execute(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeBatch(Long[] ids) {
|
||||
fireCheckRecordHiddenRemoveExe.execute(ids);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,68 @@
|
|||
package com.zcloud.fire.check.service;
|
||||
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.zcloud.fire.check.api.FireCheckRecordPointServiceI;
|
||||
import com.zcloud.fire.check.command.FireCheckRecordPointAddExe;
|
||||
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.FireCheckPointListCO;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckRecordPointCO;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:20
|
||||
*/
|
||||
@Service
|
||||
@AllArgsConstructor
|
||||
public class FireCheckRecordPointServiceImpl implements FireCheckRecordPointServiceI {
|
||||
private final FireCheckRecordPointAddExe fireCheckRecordPointAddExe;
|
||||
private final FireCheckRecordPointUpdateExe fireCheckRecordPointUpdateExe;
|
||||
private final FireCheckRecordPointRemoveExe fireCheckRecordPointRemoveExe;
|
||||
private final FireCheckRecordPointQueryExe fireCheckRecordPointQueryExe;
|
||||
|
||||
@Override
|
||||
public PageResponse<FireCheckRecordPointCO> listPage(FireCheckRecordPointPageQry qry) {
|
||||
|
||||
return fireCheckRecordPointQueryExe.execute(qry);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SingleResponse add(FireCheckRecordPointAddCmd cmd) {
|
||||
|
||||
fireCheckRecordPointAddExe.execute(cmd);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void edit(FireCheckRecordPointUpdateCmd fireCheckRecordPointUpdateCmd) {
|
||||
fireCheckRecordPointUpdateExe.execute(fireCheckRecordPointUpdateCmd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void remove(Long id) {
|
||||
fireCheckRecordPointRemoveExe.execute(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeBatch(Long[] ids) {
|
||||
fireCheckRecordPointRemoveExe.execute(ids);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageResponse<FireCheckPointListCO> getCheckRecordPointList(CheckRecordPointListQry qry) {
|
||||
return fireCheckRecordPointQueryExe.getCheckRecordPointList(qry);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FireCheckRecordPointCO saveCheckRecordPoint(AppCheckRecordPointAddCmd appCheckRecordPointAddCmd) {
|
||||
return fireCheckRecordPointAddExe.saveCheckRecordPoint(appCheckRecordPointAddCmd);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,88 @@
|
|||
package com.zcloud.fire.check.service;
|
||||
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.zcloud.fire.check.api.FireCheckRecordServiceI;
|
||||
import com.zcloud.fire.check.command.FireCheckRecordAddExe;
|
||||
import com.zcloud.fire.check.command.FireCheckRecordRemoveExe;
|
||||
import com.zcloud.fire.check.command.FireCheckRecordUpdateExe;
|
||||
import com.zcloud.fire.check.command.query.FireCheckRecordQueryExe;
|
||||
import com.zcloud.fire.check.dto.*;
|
||||
import com.zcloud.fire.check.dto.clientobject.*;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:59
|
||||
*/
|
||||
@Service
|
||||
@AllArgsConstructor
|
||||
public class FireCheckRecordServiceImpl implements FireCheckRecordServiceI {
|
||||
private final FireCheckRecordAddExe fireCheckRecordAddExe;
|
||||
private final FireCheckRecordUpdateExe fireCheckRecordUpdateExe;
|
||||
private final FireCheckRecordRemoveExe fireCheckRecordRemoveExe;
|
||||
private final FireCheckRecordQueryExe fireCheckRecordQueryExe;
|
||||
|
||||
@Override
|
||||
public PageResponse<FireCheckRecordCO> listPage(FireCheckRecordPageQry qry) {
|
||||
|
||||
return fireCheckRecordQueryExe.execute(qry);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SingleResponse add(FireCheckRecordAddCmd cmd) {
|
||||
|
||||
fireCheckRecordAddExe.execute(cmd);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void edit(FireCheckRecordUpdateCmd fireCheckRecordUpdateCmd) {
|
||||
fireCheckRecordUpdateExe.execute(fireCheckRecordUpdateCmd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void remove(Long id) {
|
||||
fireCheckRecordRemoveExe.execute(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeBatch(Long[] ids) {
|
||||
fireCheckRecordRemoveExe.execute(ids);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageResponse<FireBackCheckRecordCO> getCheckRecordList(FireBackCheckRecordPageQry qry) {
|
||||
return fireCheckRecordQueryExe.getCheckRecordList(qry);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FireCheckRecordCO getChecKRecordInfo(String fireRecordId) {
|
||||
return fireCheckRecordQueryExe.getChecKRecordInfo(fireRecordId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FireCheckRecordCO getInfoById(Long id) {
|
||||
return fireCheckRecordQueryExe.getInfoById(id);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public FireCheckRecordCO saveCheckRecord(AppCheckRecordAddCmd appCheckRecordAddCmd) {
|
||||
return fireCheckRecordAddExe.saveCheckRecord(appCheckRecordAddCmd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageResponse<CorpCheckStatisticsCO> corpCheckRecordList(CorpStatisticsPageQry qry) {
|
||||
return fireCheckRecordQueryExe.corpCheckRecordList(qry);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageResponse<FireCheckRecordCO> getCheckRecordPageH5(FireCheckRecordPagePointQry qry) {
|
||||
return fireCheckRecordQueryExe.getCheckRecordPageH5(qry);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
package com.zcloud.fire.check.service;
|
||||
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.zcloud.fire.check.api.FireCheckRecordUserServiceI;
|
||||
import com.zcloud.fire.check.command.FireCheckRecordUserAddExe;
|
||||
import com.zcloud.fire.check.command.FireCheckRecordUserRemoveExe;
|
||||
import com.zcloud.fire.check.command.FireCheckRecordUserUpdateExe;
|
||||
import com.zcloud.fire.check.command.query.FireCheckRecordUserQueryExe;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordUserAddCmd;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordUserPageQry;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordUserUpdateCmd;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckRecordUserCO;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* web-app
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:12:05
|
||||
*/
|
||||
@Service
|
||||
@AllArgsConstructor
|
||||
public class FireCheckRecordUserServiceImpl implements FireCheckRecordUserServiceI {
|
||||
private final FireCheckRecordUserAddExe fireCheckRecordUserAddExe;
|
||||
private final FireCheckRecordUserUpdateExe fireCheckRecordUserUpdateExe;
|
||||
private final FireCheckRecordUserRemoveExe fireCheckRecordUserRemoveExe;
|
||||
private final FireCheckRecordUserQueryExe fireCheckRecordUserQueryExe;
|
||||
|
||||
@Override
|
||||
public PageResponse<FireCheckRecordUserCO> listPage(FireCheckRecordUserPageQry qry) {
|
||||
|
||||
return fireCheckRecordUserQueryExe.execute(qry);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SingleResponse add(FireCheckRecordUserAddCmd cmd) {
|
||||
|
||||
fireCheckRecordUserAddExe.execute(cmd);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void edit(FireCheckRecordUserUpdateCmd fireCheckRecordUserUpdateCmd) {
|
||||
fireCheckRecordUserUpdateExe.execute(fireCheckRecordUserUpdateCmd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void remove(Long id) {
|
||||
fireCheckRecordUserRemoveExe.execute(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeBatch(Long[] ids) {
|
||||
fireCheckRecordUserRemoveExe.execute(ids);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -72,8 +72,8 @@ public class FireCheckStandardServiceImpl implements FireCheckStandardServiceI {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void importFireCheckStandardList(MultipartFile file, FireCheckStandardImportCmd fireCheckStandardImportCmd) {
|
||||
fireCheckStandardQueryExe.importFireCheckStandardList(file,fireCheckStandardImportCmd);
|
||||
public void importFireCheckStandardList(FireCheckStandardImportCmd fireCheckStandardImportCmd) {
|
||||
fireCheckStandardQueryExe.importFireCheckStandardList(fireCheckStandardImportCmd);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,10 +7,8 @@ import com.zcloud.fire.check.command.FireDeviceAddExe;
|
|||
import com.zcloud.fire.check.command.FireDeviceRemoveExe;
|
||||
import com.zcloud.fire.check.command.FireDeviceUpdateExe;
|
||||
import com.zcloud.fire.check.command.query.FireDeviceQueryExe;
|
||||
import com.zcloud.fire.check.dto.FireDeviceAddCmd;
|
||||
import com.zcloud.fire.check.dto.FireDeviceListQry;
|
||||
import com.zcloud.fire.check.dto.FireDevicePageQry;
|
||||
import com.zcloud.fire.check.dto.FireDeviceUpdateCmd;
|
||||
import com.zcloud.fire.check.dto.*;
|
||||
import com.zcloud.fire.check.dto.clientobject.CorpStatisticsCO;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireDeviceCO;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
|
@ -80,5 +78,12 @@ public class FireDeviceServiceImpl implements FireDeviceServiceI {
|
|||
public Collection<FireDeviceCO> getAllList(FireDeviceListQry qry) {
|
||||
return fireDeviceQueryExe.getAllList(qry);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageResponse<CorpStatisticsCO> corpStatisticslist(CorpStatisticsPageQry qry) {
|
||||
return fireDeviceQueryExe.corpStatisticslist(qry);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
package com.zcloud.fire.check.api;
|
||||
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.zcloud.fire.check.dto.FireCheckListItemAddCmd;
|
||||
import com.zcloud.fire.check.dto.FireCheckListItemPageQry;
|
||||
import com.zcloud.fire.check.dto.FireCheckListItemUpdateCmd;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckListItemCO;
|
||||
|
||||
/**
|
||||
* web-client
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:29
|
||||
*/
|
||||
public interface FireCheckListItemServiceI {
|
||||
PageResponse<FireCheckListItemCO> listPage(FireCheckListItemPageQry qry);
|
||||
|
||||
SingleResponse<FireCheckListItemCO> add(FireCheckListItemAddCmd cmd);
|
||||
|
||||
void edit(FireCheckListItemUpdateCmd cmd);
|
||||
|
||||
void remove(Long id);
|
||||
|
||||
void removeBatch(Long[] ids);
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
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.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* web-client
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:09
|
||||
*/
|
||||
public interface FireCheckListServiceI {
|
||||
PageResponse<FireCheckListCO> listPage(FireCheckListPageQry qry);
|
||||
|
||||
SingleResponse<FireCheckListCO> add(FireCheckListAddCmd cmd);
|
||||
|
||||
void edit(FireCheckListUpdateCmd cmd);
|
||||
|
||||
void remove(Long id);
|
||||
|
||||
void removeBatch(Long[] ids);
|
||||
|
||||
FireCheckListCO getInfoById(Long id);
|
||||
|
||||
void editState(FireCheckListUpdateStateCmd fireCheckListUpdateStateCmd);
|
||||
|
||||
PageResponse<FireCheckListCO> appCheckList(FireCheckListPageQry qry);
|
||||
|
||||
PageResponse<RiskDistributionCO> riskDistribution(RiskDistributionPageQry qry);
|
||||
|
||||
RiskDistributionStasticCO riskDistributionStatistic();
|
||||
|
||||
PageResponse<PointDistributionCO> pointDistributionStatistic(PointDistributionPageQry qry);
|
||||
|
||||
List<FireCheckPointListCO> getCheckPointList(CheckPointListQry qry);
|
||||
|
||||
PageResponse<FireBackCheckListCO> getBackChecKList(FireBackCheckListPageQry qry);
|
||||
|
||||
|
||||
PageResponse<FireCheckListCO> checkListRecordList(FireCheckListRecordPageQry qry);
|
||||
|
||||
PageResponse<FireCheckListCO> getCheckListRecord(CheckListRecordPageQry qry);
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
package com.zcloud.fire.check.api;
|
||||
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.zcloud.fire.check.dto.FireCheckListUserAddCmd;
|
||||
import com.zcloud.fire.check.dto.FireCheckListUserPageQry;
|
||||
import com.zcloud.fire.check.dto.FireCheckListUserUpdateCmd;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckListUserCO;
|
||||
|
||||
/**
|
||||
* web-client
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-11 15:32:50
|
||||
*/
|
||||
public interface FireCheckListUserServiceI {
|
||||
PageResponse<FireCheckListUserCO> listPage(FireCheckListUserPageQry qry);
|
||||
|
||||
SingleResponse<FireCheckListUserCO> add(FireCheckListUserAddCmd cmd);
|
||||
|
||||
void edit(FireCheckListUserUpdateCmd cmd);
|
||||
|
||||
void remove(Long id);
|
||||
|
||||
void removeBatch(Long[] ids);
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
package com.zcloud.fire.check.api;
|
||||
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordDeviceAddCmd;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordDevicePageQry;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordDeviceUpdateCmd;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckRecordDeviceCO;
|
||||
|
||||
/**
|
||||
* web-client
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:03
|
||||
*/
|
||||
public interface FireCheckRecordDeviceServiceI {
|
||||
PageResponse<FireCheckRecordDeviceCO> listPage(FireCheckRecordDevicePageQry qry);
|
||||
|
||||
SingleResponse<FireCheckRecordDeviceCO> add(FireCheckRecordDeviceAddCmd cmd);
|
||||
|
||||
void edit(FireCheckRecordDeviceUpdateCmd cmd);
|
||||
|
||||
void remove(Long id);
|
||||
|
||||
void removeBatch(Long[] ids);
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
package com.zcloud.fire.check.api;
|
||||
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordHiddenAddCmd;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordHiddenPageQry;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordHiddenUpdateCmd;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckRecordHiddenCO;
|
||||
|
||||
/**
|
||||
* web-client
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:11:16
|
||||
*/
|
||||
public interface FireCheckRecordHiddenServiceI {
|
||||
PageResponse<FireCheckRecordHiddenCO> listPage(FireCheckRecordHiddenPageQry qry);
|
||||
|
||||
SingleResponse<FireCheckRecordHiddenCO> add(FireCheckRecordHiddenAddCmd cmd);
|
||||
|
||||
void edit(FireCheckRecordHiddenUpdateCmd cmd);
|
||||
|
||||
void remove(Long id);
|
||||
|
||||
void removeBatch(Long[] ids);
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
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.FireCheckPointListCO;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckRecordPointCO;
|
||||
|
||||
/**
|
||||
* web-client
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:20
|
||||
*/
|
||||
public interface FireCheckRecordPointServiceI {
|
||||
PageResponse<FireCheckRecordPointCO> listPage(FireCheckRecordPointPageQry qry);
|
||||
|
||||
SingleResponse<FireCheckRecordPointCO> add(FireCheckRecordPointAddCmd cmd);
|
||||
|
||||
void edit(FireCheckRecordPointUpdateCmd cmd);
|
||||
|
||||
void remove(Long id);
|
||||
|
||||
void removeBatch(Long[] ids);
|
||||
|
||||
PageResponse<FireCheckPointListCO> getCheckRecordPointList(CheckRecordPointListQry qry);
|
||||
|
||||
FireCheckRecordPointCO saveCheckRecordPoint(AppCheckRecordPointAddCmd appCheckRecordPointAddCmd);
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
package com.zcloud.fire.check.api;
|
||||
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.zcloud.fire.check.dto.*;
|
||||
import com.zcloud.fire.check.dto.clientobject.*;
|
||||
|
||||
/**
|
||||
* web-client
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:10:59
|
||||
*/
|
||||
public interface FireCheckRecordServiceI {
|
||||
PageResponse<FireCheckRecordCO> listPage(FireCheckRecordPageQry qry);
|
||||
|
||||
SingleResponse<FireCheckRecordCO> add(FireCheckRecordAddCmd cmd);
|
||||
|
||||
void edit(FireCheckRecordUpdateCmd cmd);
|
||||
|
||||
void remove(Long id);
|
||||
|
||||
void removeBatch(Long[] ids);
|
||||
|
||||
PageResponse<FireBackCheckRecordCO> getCheckRecordList(FireBackCheckRecordPageQry qry);
|
||||
|
||||
FireCheckRecordCO getChecKRecordInfo(String fireRecordId);
|
||||
|
||||
FireCheckRecordCO getInfoById(Long id);
|
||||
|
||||
FireCheckRecordCO saveCheckRecord(AppCheckRecordAddCmd appCheckRecordAddCmd);
|
||||
|
||||
PageResponse<CorpCheckStatisticsCO> corpCheckRecordList(CorpStatisticsPageQry qry);
|
||||
|
||||
PageResponse<FireCheckRecordCO> getCheckRecordPageH5(FireCheckRecordPagePointQry qry);
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
package com.zcloud.fire.check.api;
|
||||
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordUserAddCmd;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordUserPageQry;
|
||||
import com.zcloud.fire.check.dto.FireCheckRecordUserUpdateCmd;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireCheckRecordUserCO;
|
||||
|
||||
/**
|
||||
* web-client
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-12-12 11:12:05
|
||||
*/
|
||||
public interface FireCheckRecordUserServiceI {
|
||||
PageResponse<FireCheckRecordUserCO> listPage(FireCheckRecordUserPageQry qry);
|
||||
|
||||
SingleResponse<FireCheckRecordUserCO> add(FireCheckRecordUserAddCmd cmd);
|
||||
|
||||
void edit(FireCheckRecordUserUpdateCmd cmd);
|
||||
|
||||
void remove(Long id);
|
||||
|
||||
void removeBatch(Long[] ids);
|
||||
}
|
||||
|
||||
|
|
@ -33,6 +33,6 @@ public interface FireCheckStandardServiceI {
|
|||
Collection<FireCheckStandardCO> listAll(FireCheckStandardPageQry qry);
|
||||
|
||||
|
||||
void importFireCheckStandardList(MultipartFile file, FireCheckStandardImportCmd fireCheckStandardImportCmd);
|
||||
void importFireCheckStandardList( FireCheckStandardImportCmd fireCheckStandardImportCmd);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,10 +2,8 @@ package com.zcloud.fire.check.api;
|
|||
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.zcloud.fire.check.dto.FireDeviceAddCmd;
|
||||
import com.zcloud.fire.check.dto.FireDeviceListQry;
|
||||
import com.zcloud.fire.check.dto.FireDevicePageQry;
|
||||
import com.zcloud.fire.check.dto.FireDeviceUpdateCmd;
|
||||
import com.zcloud.fire.check.dto.*;
|
||||
import com.zcloud.fire.check.dto.clientobject.CorpStatisticsCO;
|
||||
import com.zcloud.fire.check.dto.clientobject.FireDeviceCO;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
|
|
@ -36,5 +34,8 @@ public interface FireDeviceServiceI {
|
|||
void importFireDevicePage(MultipartFile file);
|
||||
|
||||
Collection<FireDeviceCO> getAllList(FireDeviceListQry qry);
|
||||
|
||||
PageResponse<CorpStatisticsCO> corpStatisticslist(CorpStatisticsPageQry qry);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,53 @@
|
|||
package com.zcloud.fire.check.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.zcloud.gbscommon.zcloudhidden.request.HiddenAddCmd;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* web-client
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:09
|
||||
*/
|
||||
@Data
|
||||
public class AppCheckRecordAddCmd implements Serializable {
|
||||
|
||||
@ApiModelProperty(value = "检查记录表id", name = "fireRecordId")
|
||||
@NotEmpty(message = "检查记录信息不能为空")
|
||||
private String fireRecordId;
|
||||
|
||||
|
||||
@ApiModelProperty(value = "检查时间", name = "checkTime", required = true)
|
||||
@NotEmpty(message = "检查时间不能为空")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime checkTime;
|
||||
|
||||
|
||||
//描述
|
||||
@ApiModelProperty(value = "描述", name = "remarks")
|
||||
private String remarks;
|
||||
|
||||
|
||||
|
||||
@ApiModelProperty(value = "签字url", name = "signUrl", required = true)
|
||||
@NotEmpty(message = "签字url不能为空")
|
||||
private String signUrl;
|
||||
|
||||
//检查人信息
|
||||
@ApiModelProperty(value = "检查人信息", name = "fireCheckRecordUserAddCmdList")
|
||||
private List<FireCheckRecordUserAddCmd> fireCheckRecordUserAddCmdList;
|
||||
|
||||
//隐患信息
|
||||
@ApiModelProperty(value = "隐患信息", name = "hiddenAddCmdList")
|
||||
private List<HiddenAddCmd> hiddenAddCmdList;
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,49 @@
|
|||
package com.zcloud.fire.check.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* web-client
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:09
|
||||
*/
|
||||
@Data
|
||||
public class AppCheckRecordPointAddCmd implements Serializable {
|
||||
@ApiModelProperty(value = "消防点位检查主键", name = "id")
|
||||
private Long id;
|
||||
|
||||
@ApiModelProperty(value = "检查表id", name = "fireCheckId", required = true)
|
||||
@NotEmpty(message = "检查表id不能为空")
|
||||
private String fireCheckId;
|
||||
|
||||
@ApiModelProperty(value = "检查记录表id", name = "fireRecordId")
|
||||
private String fireRecordId;
|
||||
|
||||
@ApiModelProperty(value = "消防点位id", name = "firePointId", required = true)
|
||||
@NotEmpty(message = "消防点位id不能为空")
|
||||
private String firePointId;
|
||||
|
||||
@ApiModelProperty(value = "经度", name = "longitude", required = true)
|
||||
@NotEmpty(message = "经度不能为空")
|
||||
private String longitude;
|
||||
|
||||
@ApiModelProperty(value = "纬度", name = "latitude", required = true)
|
||||
@NotEmpty(message = "纬度不能为空")
|
||||
private String latitude;
|
||||
@ApiModelProperty(value = "是否检查过0已经检查1未检查，2已打回", name = "checkedFlag")
|
||||
private Integer checkedFlag;
|
||||
//消防设备检查信息
|
||||
@ApiModelProperty(value = "消防设备检查信息", name = "fireCheckRecordDeviceAddCmdList", required = true)
|
||||
private List<FireCheckRecordDeviceAddCmd> fireCheckRecordDeviceAddCmdList;
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
package com.zcloud.fire.check.dto;
|
||||
|
||||
import com.alibaba.cola.dto.PageQuery;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
|
||||
/**
|
||||
* web-client
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:09
|
||||
*/
|
||||
@Data
|
||||
public class AppFireCheckRecordPageQry extends PageQuery {
|
||||
|
||||
/**
|
||||
* 查询条件操作前缀,支持以下几种数据库查询操作：
|
||||
* - `like`: 模糊匹配查询，对应SQL的LIKE操作符
|
||||
* - `eq`: 等值查询，对应SQL的=操作符
|
||||
* - `gt`: 大于比较查询
|
||||
* - `lt`: 小于比较查询
|
||||
* - `ge`: 大于等于比较查询
|
||||
* - `le`: 小于等于比较查询
|
||||
* - `ne`: 不等比较查询，对应SQL的!=操作符
|
||||
*/
|
||||
|
||||
//检查表id
|
||||
@ApiModelProperty(value = "检查表名称")
|
||||
private String fireCheckName;
|
||||
//fire_check_type
|
||||
@ApiModelProperty(value = "检查表类型")
|
||||
private String fireCheckType;
|
||||
//department_id
|
||||
@ApiModelProperty(value = "部门id")
|
||||
private Long departmentId;
|
||||
//负责人名称
|
||||
@ApiModelProperty(value = "负责人名称")
|
||||
private String userName;
|
||||
//开始时间
|
||||
@ApiModelProperty(value = "开始时间")
|
||||
private String startTime;
|
||||
//结束时间
|
||||
@ApiModelProperty(value = "结束时间")
|
||||
private String endTime;
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
package com.zcloud.fire.check.dto;
|
||||
|
||||
import com.alibaba.cola.dto.PageQuery;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
|
||||
/**
|
||||
* web-client
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:09
|
||||
*/
|
||||
@Data
|
||||
public class CheckListRecordPageQry extends PageQuery {
|
||||
|
||||
/**
|
||||
* 查询条件操作前缀,支持以下几种数据库查询操作：
|
||||
* - `like`: 模糊匹配查询，对应SQL的LIKE操作符
|
||||
* - `eq`: 等值查询，对应SQL的=操作符
|
||||
* - `gt`: 大于比较查询
|
||||
* - `lt`: 小于比较查询
|
||||
* - `ge`: 大于等于比较查询
|
||||
* - `le`: 小于等于比较查询
|
||||
* - `ne`: 不等比较查询，对应SQL的!=操作符
|
||||
*/
|
||||
@ApiModelProperty(value = "消防点位检查表名称")
|
||||
private String fireCheckName;
|
||||
//部门id
|
||||
@ApiModelProperty(value = "部门id")
|
||||
private String departmentId;
|
||||
//负责人名字
|
||||
@ApiModelProperty(value = "负责人名字")
|
||||
private String userName;
|
||||
//检查表类型
|
||||
@ApiModelProperty(value = "检查表类型")
|
||||
private String fireCheckType;
|
||||
|
||||
|
||||
//开始时间
|
||||
@ApiModelProperty(value = "开始时间")
|
||||
private String startTime;
|
||||
//结束时间
|
||||
@ApiModelProperty(value = "结束时间")
|
||||
private String endTime;
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
package com.zcloud.fire.check.dto;
|
||||
|
||||
import com.alibaba.cola.dto.PageQuery;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import java.io.Serializable;
|
||||
|
||||
|
||||
/**
|
||||
* web-client
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:09
|
||||
*/
|
||||
@Data
|
||||
public class CheckPointListQry implements Serializable {
|
||||
|
||||
|
||||
//消防点位检查表id
|
||||
@ApiModelProperty(value = "消防点检id")
|
||||
@NotEmpty(message = "请选择消防点检")
|
||||
private String fireCheckId;
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
package com.zcloud.fire.check.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import java.io.Serializable;
|
||||
|
||||
|
||||
/**
|
||||
* web-client
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:09
|
||||
*/
|
||||
@Data
|
||||
public class CheckRecordPointListQry implements Serializable {
|
||||
|
||||
|
||||
//消防点位检查表id
|
||||
@ApiModelProperty(value = "消防点检记录id")
|
||||
@NotEmpty(message = "请选择检查记录")
|
||||
private String fireRecordId;
|
||||
@ApiModelProperty(value = "是否检查,2已打回")
|
||||
private Integer checkedFlag;
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
package com.zcloud.fire.check.dto;
|
||||
|
||||
import com.alibaba.cola.dto.PageQuery;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* web-client
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-26 10:12:34
|
||||
*/
|
||||
@Data
|
||||
public class CorpStatisticsPageQry extends PageQuery {
|
||||
|
||||
/**
|
||||
* 查询条件操作前缀,支持以下几种数据库查询操作：
|
||||
* - `like`: 模糊匹配查询，对应SQL的LIKE操作符
|
||||
* - `eq`: 等值查询，对应SQL的=操作符
|
||||
* - `gt`: 大于比较查询
|
||||
* - `lt`: 小于比较查询
|
||||
* - `ge`: 大于等于比较查询
|
||||
* - `le`: 小于等于比较查询
|
||||
* - `ne`: 不等比较查询，对应SQL的!=操作符
|
||||
*/
|
||||
|
||||
|
||||
@ApiModelProperty(value = "公司名称", name = "likeCorpName")
|
||||
private String likeCorpName;
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
package com.zcloud.fire.check.dto;
|
||||
|
||||
import com.alibaba.cola.dto.PageQuery;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* web-client
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:09
|
||||
*/
|
||||
@Data
|
||||
public class FireBackCheckListPageQry extends PageQuery {
|
||||
|
||||
/**
|
||||
* 查询条件操作前缀,支持以下几种数据库查询操作：
|
||||
* - `like`: 模糊匹配查询，对应SQL的LIKE操作符
|
||||
* - `eq`: 等值查询，对应SQL的=操作符
|
||||
* - `gt`: 大于比较查询
|
||||
* - `lt`: 小于比较查询
|
||||
* - `ge`: 大于等于比较查询
|
||||
* - `le`: 小于等于比较查询
|
||||
* - `ne`: 不等比较查询，对应SQL的!=操作符
|
||||
*/
|
||||
//用户id
|
||||
@ApiModelProperty(value = "用户id")
|
||||
private Long userId;
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
package com.zcloud.fire.check.dto;
|
||||
|
||||
import com.alibaba.cola.dto.PageQuery;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
|
||||
|
||||
/**
|
||||
* web-client
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:09
|
||||
*/
|
||||
@Data
|
||||
public class FireBackCheckRecordPageQry extends PageQuery {
|
||||
|
||||
/**
|
||||
* 查询条件操作前缀,支持以下几种数据库查询操作：
|
||||
* - `like`: 模糊匹配查询，对应SQL的LIKE操作符
|
||||
* - `eq`: 等值查询，对应SQL的=操作符
|
||||
* - `gt`: 大于比较查询
|
||||
* - `lt`: 小于比较查询
|
||||
* - `ge`: 大于等于比较查询
|
||||
* - `le`: 小于等于比较查询
|
||||
* - `ne`: 不等比较查询，对应SQL的!=操作符
|
||||
*/
|
||||
//用户id
|
||||
@ApiModelProperty(value = "用户id")
|
||||
private Long userId;
|
||||
//检查表id
|
||||
@ApiModelProperty(value = "检查表id")
|
||||
@NotEmpty(message = "检查表不能为空")
|
||||
private String fireCheckId;
|
||||
//是否检查
|
||||
@ApiModelProperty(value = "是否检查,2已打回")
|
||||
private Integer checkedFlag;
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,49 @@
|
|||
package com.zcloud.fire.check.dto;
|
||||
|
||||
import com.alibaba.cola.dto.Command;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* web-client
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:08
|
||||
*/
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class FireCheckListAddCmd extends Command {
|
||||
|
||||
|
||||
@ApiModelProperty(value = "检查表名字", name = "fireCheckName", required = true)
|
||||
@NotEmpty(message = "检查表名字不能为空")
|
||||
private String fireCheckName;
|
||||
|
||||
@ApiModelProperty(value = "检查表类型", name = "fireCheckType", required = true)
|
||||
@NotEmpty(message = "检查表类型不能为空")
|
||||
private String fireCheckType;
|
||||
|
||||
@ApiModelProperty(value = "检查表类型名称", name = "fireCheckTypeName", required = true)
|
||||
@NotEmpty(message = "检查表类型名称不能为空")
|
||||
private String fireCheckTypeName;
|
||||
@ApiModelProperty(value = "负责部门", name = "departmentId", required = true)
|
||||
private Long departmentId;
|
||||
@ApiModelProperty(value = "负责用户id集合", name = "userIdList", required = true)
|
||||
private List<Long> userIdList;
|
||||
@ApiModelProperty(value = "检查照片上传方式（1相机照相，2相册获取）", name = "photoUploadMethod", required = true)
|
||||
@NotNull(message = "检查照片上传方式不能为空")
|
||||
private Integer photoUploadMethod;
|
||||
|
||||
@ApiModelProperty(value = "检查器材集合", name = "fireCheckListItemAddCmdList", required = true)
|
||||
private List<FireCheckListItemAddCmd> fireCheckListItemAddCmdList;
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
package com.zcloud.fire.check.dto;
|
||||
|
||||
import com.alibaba.cola.dto.Command;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* web-client
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:28
|
||||
*/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class FireCheckListItemAddCmd implements Serializable {
|
||||
|
||||
@ApiModelProperty(value = "消防区域id", name = "fireRegionId", required = true)
|
||||
@NotEmpty(message = "消防区域id不能为空")
|
||||
private String fireRegionId;
|
||||
//消防点位id
|
||||
@ApiModelProperty(value = "消防点位id", name = "firePointId", required = true)
|
||||
@NotEmpty(message = "消防点位id不能为空")
|
||||
private String firePointId;
|
||||
@ApiModelProperty(value = "消防器材id", name = "fireDeviceId", required = true)
|
||||
@NotEmpty(message = "消防器材id不能为空")
|
||||
private String fireDeviceId;
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
package com.zcloud.fire.check.dto;
|
||||
|
||||
import com.alibaba.cola.dto.PageQuery;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* web-client
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:28
|
||||
*/
|
||||
@Data
|
||||
public class FireCheckListItemPageQry extends PageQuery {
|
||||
|
||||
/**
|
||||
* 查询条件操作前缀,支持以下几种数据库查询操作：
|
||||
* - `like`: 模糊匹配查询，对应SQL的LIKE操作符
|
||||
* - `eq`: 等值查询，对应SQL的=操作符
|
||||
* - `gt`: 大于比较查询
|
||||
* - `lt`: 小于比较查询
|
||||
* - `ge`: 大于等于比较查询
|
||||
* - `le`: 小于等于比较查询
|
||||
* - `ne`: 不等比较查询，对应SQL的!=操作符
|
||||
*/
|
||||
private String likeFireCheckListItemId;
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
package com.zcloud.fire.check.dto;
|
||||
|
||||
import com.alibaba.cola.dto.Command;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
/**
|
||||
* web-client
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:29
|
||||
*/
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class FireCheckListItemUpdateCmd extends Command {
|
||||
@ApiModelProperty(value = "主键", name = "id", required = true)
|
||||
@NotNull(message = "主键不能为空")
|
||||
private Long id;
|
||||
@ApiModelProperty(value = "业务主键id", name = "fireCheckListItemId", required = true)
|
||||
@NotEmpty(message = "业务主键id不能为空")
|
||||
private String fireCheckListItemId;
|
||||
@ApiModelProperty(value = "企业id", name = "corpinfoId", required = true)
|
||||
@NotNull(message = "企业id不能为空")
|
||||
private Long corpinfoId;
|
||||
@ApiModelProperty(value = "消防点位检查表主键id", name = "fireCheckId", required = true)
|
||||
@NotEmpty(message = "消防点位检查表主键id不能为空")
|
||||
private String fireCheckId;
|
||||
@ApiModelProperty(value = "消防器材id", name = "fireDeviceId", required = true)
|
||||
@NotEmpty(message = "消防器材id不能为空")
|
||||
private String fireDeviceId;
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
package com.zcloud.fire.check.dto;
|
||||
|
||||
import com.alibaba.cola.dto.PageQuery;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.checkerframework.checker.units.qual.A;
|
||||
|
||||
|
||||
/**
|
||||
* web-client
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:09
|
||||
*/
|
||||
@Data
|
||||
public class FireCheckListPageQry extends PageQuery {
|
||||
|
||||
/**
|
||||
* 查询条件操作前缀,支持以下几种数据库查询操作：
|
||||
* - `like`: 模糊匹配查询，对应SQL的LIKE操作符
|
||||
* - `eq`: 等值查询，对应SQL的=操作符
|
||||
* - `gt`: 大于比较查询
|
||||
* - `lt`: 小于比较查询
|
||||
* - `ge`: 大于等于比较查询
|
||||
* - `le`: 小于等于比较查询
|
||||
* - `ne`: 不等比较查询，对应SQL的!=操作符
|
||||
*/
|
||||
//消防点位检查表名称
|
||||
@ApiModelProperty(value = "消防点位检查表名称")
|
||||
private String fireCheckName;
|
||||
//部门id
|
||||
@ApiModelProperty(value = "部门id")
|
||||
private String departmentId;
|
||||
//负责人名字
|
||||
@ApiModelProperty(value = "负责人名字")
|
||||
private String userName;
|
||||
//检查表类型
|
||||
@ApiModelProperty(value = "检查表类型")
|
||||
private String fireCheckType;
|
||||
|
||||
@ApiModelProperty(value = "消防点位id")
|
||||
private String firePointId;
|
||||
|
||||
@ApiModelProperty(value = "检查状态，1:待检查，2:已检查", name = "checkStatus")
|
||||
private Integer checkStatus;
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
package com.zcloud.fire.check.dto;
|
||||
|
||||
import com.alibaba.cola.dto.PageQuery;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* web-client
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:09
|
||||
*/
|
||||
@Data
|
||||
public class FireCheckListRecordPageQry extends PageQuery {
|
||||
|
||||
/**
|
||||
* 查询条件操作前缀,支持以下几种数据库查询操作：
|
||||
* - `like`: 模糊匹配查询，对应SQL的LIKE操作符
|
||||
* - `eq`: 等值查询，对应SQL的=操作符
|
||||
* - `gt`: 大于比较查询
|
||||
* - `lt`: 小于比较查询
|
||||
* - `ge`: 大于等于比较查询
|
||||
* - `le`: 小于等于比较查询
|
||||
* - `ne`: 不等比较查询，对应SQL的!=操作符
|
||||
*/
|
||||
//消防点位检查表名称
|
||||
@ApiModelProperty(value = "消防点位检查表名称")
|
||||
private String fireCheckName;
|
||||
|
||||
@ApiModelProperty(value = "检查状态，1:待检查，2:已检查", name = "checkStatus")
|
||||
private Integer checkStatus;
|
||||
//部门id
|
||||
@ApiModelProperty(value = "部门id")
|
||||
private String departmentId;
|
||||
//负责人名字
|
||||
@ApiModelProperty(value = "负责人名字")
|
||||
private String userName;
|
||||
//检查表类型
|
||||
@ApiModelProperty(value = "检查表类型")
|
||||
private String fireCheckType;
|
||||
|
||||
|
||||
@ApiModelProperty(value = "状态(禁用1启用0, 已删除2)", name = "listManagerStatus")
|
||||
private String state;
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
package com.zcloud.fire.check.dto;
|
||||
|
||||
import com.alibaba.cola.dto.Command;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* web-client
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:09
|
||||
*/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class FireCheckListRemoveCmd implements Serializable {
|
||||
@ApiModelProperty(value = "主键", name = "id", required = true)
|
||||
@NotNull(message = "主键不能为空")
|
||||
private Long[] ids;
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
package com.zcloud.fire.check.dto;
|
||||
|
||||
import com.alibaba.cola.dto.Command;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* web-client
|
||||
*
|
||||
* @Author zhaokai
|
||||
* @Date 2025-11-28 10:32:09
|
||||
*/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class FireCheckListUpdateCmd implements Serializable {
|
||||
@ApiModelProperty(value = "主键", name = "id", required = true)
|
||||
@NotNull(message = "主键不能为空")
|
||||
private Long id;
|
||||
|
||||
|
||||
@ApiModelProperty(value = "检查表名字", name = "fireCheckName", required = true)
|
||||
@NotEmpty(message = "检查表名字不能为空")
|
||||
private String fireCheckName;
|
||||
@ApiModelProperty(value = "检查表类型", name = "fireCheckType", required = true)
|
||||
@NotEmpty(message = "检查表类型不能为空")
|
||||
private String fireCheckType;
|
||||
@ApiModelProperty(value = "检查表类型名称", name = "fireCheckTypeName", required = true)
|
||||
@NotEmpty(message = "检查表类型名称不能为空")
|
||||
private String fireCheckTypeName;
|
||||
@ApiModelProperty(value = "负责部门", name = "departmentId", required = true)
|
||||
@NotNull(message = "负责部门不能为空")
|
||||
private Long departmentId;
|
||||
@ApiModelProperty(value = "负责用户id集合", name = "userIdList", required = true)
|
||||
private List<Long> userIdList;
|
||||
@ApiModelProperty(value = "禁用1启用0", name = "state")
|
||||
private Integer state;
|
||||
@ApiModelProperty(value = "检查照片上传方式（1相机照相，2相册获取）", name = "photoUploadMethod", required = true)
|
||||
@NotNull(message = "检查照片上传方式不能为空")
|
||||
private Integer photoUploadMethod;
|
||||
@ApiModelProperty(value = "检查器材集合", name = "fireCheckListItemAddCmdList", required = true)
|
||||
private List<FireCheckListItemAddCmd> fireCheckListItemAddCmdList;
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue