diff --git a/start/pom.xml b/start/pom.xml index d765ec4..ca27620 100644 --- a/start/pom.xml +++ b/start/pom.xml @@ -39,7 +39,7 @@ org.springframework.boot spring-boot-maven-plugin - com.zcloud.risk.Application + com.zcloud.fire.check.Application diff --git a/start/src/main/resources/nacos.yml b/start/src/main/resources/nacos.yml index 95efe69..36f10c9 100644 --- a/start/src/main/resources/nacos.yml +++ b/start/src/main/resources/nacos.yml @@ -4,7 +4,7 @@ nacos: application: name: jjb-saas-zcloud-fire-check version: - gateway: fire-check + gateway: fireCheck cn-name: 消防检查 spring: application: diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckListController.java b/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckListController.java new file mode 100644 index 0000000..c713543 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckListController.java @@ -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 checkList(@RequestBody FireCheckListPageQry qry) { + return fireCheckListService.appCheckList(qry); + } + + @ApiOperation("开始检查-获取消防点检列表") + @PostMapping("/getCheckPointList") + public MultiResponse getCheckPointList(@RequestBody CheckPointListQry qry) { + return MultiResponse.of(fireCheckListService.getCheckPointList(qry)); + } + @ApiOperation("已打回-获取消防点检检查列表") + @PostMapping("/getBackChecKList") + public PageResponse getBackChecKList(@RequestBody FireBackCheckListPageQry qry) { + return fireCheckListService.getBackChecKList(qry); + } + // + @ApiOperation(value = "点检记录首页-点检表查询") + @PostMapping("/getCheckListRecord") + public PageResponse getCheckListRecord(@RequestBody CheckListRecordPageQry qry) { + return fireCheckListService.getCheckListRecord(qry); + } + + @ApiOperation("点位统计-点击企业-点位分布") + @PostMapping("/pointDistribution") + public PageResponse pointDistributionStatistic(@RequestBody @Validated PointDistributionPageQry qry) { + return fireCheckListService.pointDistributionStatistic(qry); + } + +/* 使用pc端接口 + @ApiOperation("点位统计-风险分布-首页") + @PostMapping("/riskDistribution") + public PageResponse riskDistribution(@RequestBody RiskDistributionPageQry qry) { + return fireCheckListService.riskDistribution(qry); + } + @ApiOperation("点位统计-风险分布总统计-首页") + @PostMapping("/riskDistributionStatistic") + public SingleResponse riskDistributionStatistic() { + return SingleResponse.of(fireCheckListService.riskDistributionStatistic()); + }*/ + + + + + + +} + diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckRecordController.java b/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckRecordController.java new file mode 100644 index 0000000..75ee5f3 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckRecordController.java @@ -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 saveCheckRecord(@RequestBody AppCheckRecordAddCmd appCheckRecordAddCmd) { + return SingleResponse.of(fireCheckRecordService.saveCheckRecord(appCheckRecordAddCmd)); + } + + + @ApiOperation("获取消防点检记录检查列表 (包括已打回和所有)") + @PostMapping("/getCheckRecordList") + public PageResponse getCheckRecordList(@RequestBody FireBackCheckRecordPageQry qry) { + return fireCheckRecordService.getCheckRecordList(qry); + } + +/* + @ApiOperation("获取消防点检记录详情信息") + @GetMapping("/getChecKRecordInfo/{fireRecordId}") + public SingleResponse getChecKRecordInfo(@PathVariable("fireRecordId") String fireRecordId) { + return SingleResponse.of(fireCheckRecordService.getChecKRecordInfo(fireRecordId)); + } +*/ + + +} + diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckRecordPointController.java b/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckRecordPointController.java new file mode 100644 index 0000000..c4b017d --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckRecordPointController.java @@ -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 saveCheckRecordPoint(@RequestBody AppCheckRecordPointAddCmd appCheckRecordPointAddCmd) { + return SingleResponse.of(fireCheckRecordPointService.saveCheckRecordPoint(appCheckRecordPointAddCmd)); + } + + @ApiOperation("获取消防点检记录点位列表(已打回根据状态传入)") + @PostMapping("/getCheckRecordPointList") + public PageResponse getCheckRecordPointList(@RequestBody CheckRecordPointListQry qry) { + return fireCheckRecordPointService.getCheckRecordPointList(qry); + } + + +} + diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireDeviceController.java b/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireDeviceController.java new file mode 100644 index 0000000..9540f1d --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireDeviceController.java @@ -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 getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(fireDeviceService.getInfoById(id)); + }*/ + + +} + diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListController.java new file mode 100644 index 0000000..ec91647 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListController.java @@ -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 add(@Validated @RequestBody FireCheckListAddCmd cmd) { + return fireCheckListService.add(cmd); + } + + @ApiOperation("消防点检分页") + @PostMapping("/list") + public PageResponse page(@RequestBody FireCheckListPageQry qry) { + return fireCheckListService.listPage(qry); + } + + + @ApiOperation("消防点检详情") + @GetMapping("/getInfoById/{id}") + public SingleResponse 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 checkListRecordList(@RequestBody FireCheckListRecordPageQry qry) { + return fireCheckListService.checkListRecordList(qry); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListItemController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListItemController.java new file mode 100644 index 0000000..e9960cc --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListItemController.java @@ -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 add(@Validated @RequestBody FireCheckListItemAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + return fireCheckListItemService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody FireCheckListItemPageQry qry) { + return fireCheckListItemService.listPage(qry); + } + + @ApiOperation("所有数据") + @GetMapping("/listAll") + public MultiResponse listAll() { + return MultiResponse.of(new ArrayList()); + } + + @ApiOperation("详情") + @GetMapping("/{id}") + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(new 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(); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListUserController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListUserController.java new file mode 100644 index 0000000..80f80bf --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListUserController.java @@ -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 add(@Validated @RequestBody FireCheckListUserAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + return fireCheckListUserService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody FireCheckListUserPageQry qry) { + return fireCheckListUserService.listPage(qry); + } + + @ApiOperation("所有数据") + @GetMapping("/listAll") + public MultiResponse listAll() { + return MultiResponse.of(new ArrayList()); + } + + @ApiOperation("详情") + @GetMapping("/{id}") + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(new 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(); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordController.java new file mode 100644 index 0000000..4614d76 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordController.java @@ -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 add(@Validated @RequestBody FireCheckRecordAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + return fireCheckRecordService.add(cmd); + } + + @ApiOperation("点位检查记录-检查记录分页") + @PostMapping("/list") + public PageResponse page(@RequestBody FireCheckRecordPageQry qry) { + return fireCheckRecordService.listPage(qry); + } + + @ApiOperation("检查记录详情") + @GetMapping("/getInfoById/{id}") + public SingleResponse 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 corpCheckRecordList(@RequestBody CorpStatisticsPageQry qry) { + return fireCheckRecordService.corpCheckRecordList(qry); + } + @ApiOperation("和H5扫码点位显示检查记录)") + @PostMapping("/getCheckRecordPageH5") + public PageResponse getCheckRecordPageH5(@Validated @RequestBody FireCheckRecordPagePointQry qry) { + return fireCheckRecordService.getCheckRecordPageH5(qry); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordDeviceController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordDeviceController.java new file mode 100644 index 0000000..7c9b557 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordDeviceController.java @@ -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(); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordHiddenController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordHiddenController.java new file mode 100644 index 0000000..b92ab04 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordHiddenController.java @@ -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 add(@Validated @RequestBody FireCheckRecordHiddenAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + return fireCheckRecordHiddenService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody FireCheckRecordHiddenPageQry qry) { + return fireCheckRecordHiddenService.listPage(qry); + } + + @ApiOperation("所有数据") + @GetMapping("/listAll") + public MultiResponse listAll() { + return MultiResponse.of(new ArrayList()); + } + + @ApiOperation("详情") + @GetMapping("/{id}") + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(new 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(); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordPointController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordPointController.java new file mode 100644 index 0000000..6ca595e --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordPointController.java @@ -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 add(@Validated @RequestBody FireCheckRecordPointAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + return fireCheckRecordPointService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody FireCheckRecordPointPageQry qry) { + return fireCheckRecordPointService.listPage(qry); + } + + @ApiOperation("所有数据") + @GetMapping("/listAll") + public MultiResponse listAll() { + return MultiResponse.of(new ArrayList()); + } + + @ApiOperation("详情") + @GetMapping("/{id}") + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(new 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(); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordUserController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordUserController.java new file mode 100644 index 0000000..42eba1f --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordUserController.java @@ -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 add(@Validated @RequestBody FireCheckRecordUserAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + return fireCheckRecordUserService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody FireCheckRecordUserPageQry qry) { + return fireCheckRecordUserService.listPage(qry); + } + + @ApiOperation("所有数据") + @GetMapping("/listAll") + public MultiResponse listAll() { + return MultiResponse.of(new ArrayList()); + } + + @ApiOperation("详情") + @GetMapping("/{id}") + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(new 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(); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckStandardController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckStandardController.java index 3ced341..d4edc29 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckStandardController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckStandardController.java @@ -56,13 +56,13 @@ public class FireCheckStandardController { } @ApiOperation("消防检查标准详情") - @PostMapping("/info/{id}") + @GetMapping("/getInfoById/{id}") public SingleResponse 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(); } } diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireDeviceController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireDeviceController.java index 05172b9..ae6ac92 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireDeviceController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireDeviceController.java @@ -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 page(@RequestBody FireDevicePageQry qry) { return fireDeviceService.listPage(qry); } @ApiOperation("消防器材详情") - @PostMapping("/info/{id}") + @GetMapping("/getInfoById/{id}") public SingleResponse 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 corpStatisticslist(@RequestBody CorpStatisticsPageQry qry) { + return fireDeviceService.corpStatisticslist(qry); + } + @ApiOperation("股份端-消防器材统计汇总首页总数") + @GetMapping("/corpStatisticsTotal") + public SingleResponse corpStatisticsTotal() { + return SingleResponse.of(fireCheckListService.riskDistributionStatistic()); + } + + @ApiOperation("H5s扫码-点位分布-消防器材分页查询，(H5扫码点位分布可使用)") + @PostMapping("/pageByPointId") + public PageResponse pageByPointId(@RequestBody FireDevicePageQry qry) { + return fireDeviceService.listPage(qry); + } } diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FirePointController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FirePointController.java index f308186..7b9642e 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FirePointController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FirePointController.java @@ -51,13 +51,13 @@ public class FirePointController { } @ApiOperation("消防点位详情") - @PostMapping("/info/{id}") + @GetMapping("/getInfoById/{id}") public SingleResponse 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(); diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireRegionController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireRegionController.java index bcf8bce..8eb590f 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireRegionController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireRegionController.java @@ -44,13 +44,13 @@ public class FireRegionController { } @ApiOperation("详情") - @PostMapping("/info/{id}") + @GetMapping("/getInfoById/{id}") public SingleResponse 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(); diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListAddExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListAddExe.java new file mode 100644 index 0000000..b9f8dee --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListAddExe.java @@ -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 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; + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListItemAddExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListItemAddExe.java new file mode 100644 index 0000000..75ddfae --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListItemAddExe.java @@ -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; + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListItemRemoveExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListItemRemoveExe.java new file mode 100644 index 0000000..0b7e078 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListItemRemoveExe.java @@ -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; + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListItemUpdateExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListItemUpdateExe.java new file mode 100644 index 0000000..8c6617c --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListItemUpdateExe.java @@ -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("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListRemoveExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListRemoveExe.java new file mode 100644 index 0000000..b4742cc --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListRemoveExe.java @@ -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; + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListUpdateExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListUpdateExe.java new file mode 100644 index 0000000..24c2d43 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListUpdateExe.java @@ -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 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("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListUserAddExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListUserAddExe.java new file mode 100644 index 0000000..a7befca --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListUserAddExe.java @@ -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; + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListUserRemoveExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListUserRemoveExe.java new file mode 100644 index 0000000..6f5f93f --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListUserRemoveExe.java @@ -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; + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListUserUpdateExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListUserUpdateExe.java new file mode 100644 index 0000000..2a34590 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListUserUpdateExe.java @@ -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("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordAddExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordAddExe.java new file mode 100644 index 0000000..e3d9873 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordAddExe.java @@ -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 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; + } + + +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordDeviceAddExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordDeviceAddExe.java new file mode 100644 index 0000000..ffa69bd --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordDeviceAddExe.java @@ -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; + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordDeviceRemoveExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordDeviceRemoveExe.java new file mode 100644 index 0000000..2ab461e --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordDeviceRemoveExe.java @@ -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; + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordDeviceUpdateExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordDeviceUpdateExe.java new file mode 100644 index 0000000..5c03edd --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordDeviceUpdateExe.java @@ -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("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordHiddenAddExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordHiddenAddExe.java new file mode 100644 index 0000000..7b102ae --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordHiddenAddExe.java @@ -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; + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordHiddenRemoveExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordHiddenRemoveExe.java new file mode 100644 index 0000000..ec31a4d --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordHiddenRemoveExe.java @@ -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; + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordHiddenUpdateExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordHiddenUpdateExe.java new file mode 100644 index 0000000..38d8b5f --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordHiddenUpdateExe.java @@ -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("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordPointAddExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordPointAddExe.java new file mode 100644 index 0000000..0135aa8 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordPointAddExe.java @@ -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 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 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; + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordPointRemoveExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordPointRemoveExe.java new file mode 100644 index 0000000..44b47d6 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordPointRemoveExe.java @@ -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; + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordPointUpdateExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordPointUpdateExe.java new file mode 100644 index 0000000..c5df7d5 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordPointUpdateExe.java @@ -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("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordRemoveExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordRemoveExe.java new file mode 100644 index 0000000..7d72c40 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordRemoveExe.java @@ -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; + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordUpdateExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordUpdateExe.java new file mode 100644 index 0000000..df760e5 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordUpdateExe.java @@ -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("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordUserAddExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordUserAddExe.java new file mode 100644 index 0000000..ba4d2cf --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordUserAddExe.java @@ -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; + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordUserRemoveExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordUserRemoveExe.java new file mode 100644 index 0000000..6a30ddb --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordUserRemoveExe.java @@ -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; + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordUserUpdateExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordUserUpdateExe.java new file mode 100644 index 0000000..8b96fbc --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckRecordUserUpdateExe.java @@ -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("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/convertor/CorpInfoCoConvertor.java b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/CorpInfoCoConvertor.java new file mode 100644 index 0000000..0d449ac --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/CorpInfoCoConvertor.java @@ -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 converCorpDOsToCorpCO(List data); + + List converCorpDOsToCorpCheckStatisticsCO(List data); +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckListCoConvertor.java b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckListCoConvertor.java new file mode 100644 index 0000000..c6af117 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckListCoConvertor.java @@ -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 converDOsToCOs(List fireCheckListDOs); + + List converStatictisDOsToCOs(List data); + + List converPointDistributionDOsToCOs(List data); + + List converPointListDOsToCOs(List fireCheckPointListDO); + + List converDOsToBackCOs(List data); +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckListItemCoConvertor.java b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckListItemCoConvertor.java new file mode 100644 index 0000000..336f704 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckListItemCoConvertor.java @@ -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 converDOsToCOs(List fireCheckListItemDOs); +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckListUserCoConvertor.java b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckListUserCoConvertor.java new file mode 100644 index 0000000..f2d9058 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckListUserCoConvertor.java @@ -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 converDOsToCOs(List fireCheckListUserDOs); +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckRecordCoConvertor.java b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckRecordCoConvertor.java new file mode 100644 index 0000000..4556464 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckRecordCoConvertor.java @@ -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 converDOsToCOs(List fireCheckRecordDOs); + + List converDOsToBackRecordCOs(List data); + +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckRecordDeviceCoConvertor.java b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckRecordDeviceCoConvertor.java new file mode 100644 index 0000000..39ad212 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckRecordDeviceCoConvertor.java @@ -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 converDOsToCOs(List fireCheckRecordDeviceDOs); + + + List converDOsToDeviceCOs(List deviceDOList); +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckRecordHiddenCoConvertor.java b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckRecordHiddenCoConvertor.java new file mode 100644 index 0000000..b2c0746 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckRecordHiddenCoConvertor.java @@ -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 converDOsToCOs(List fireCheckRecordHiddenDOs); + + FireCheckRecordHiddenCO convertToCO(FireCheckRecordHiddenDO hiddenDO); + +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckRecordPointCoConvertor.java b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckRecordPointCoConvertor.java new file mode 100644 index 0000000..e162928 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckRecordPointCoConvertor.java @@ -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 converDOsToCOs(List fireCheckRecordPointDOs); + + List converDOsToPointCOs(List data); +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckRecordUserCoConvertor.java b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckRecordUserCoConvertor.java new file mode 100644 index 0000000..cf0dd3b --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireCheckRecordUserCoConvertor.java @@ -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 converDOsToCOs(List fireCheckRecordUserDOs); +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireDeviceCoConvertor.java b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireDeviceCoConvertor.java index a5a3dd8..620f4e8 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireDeviceCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/convertor/FireDeviceCoConvertor.java @@ -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 converDOsToCOs(List fireDeviceDOs); List converCOsToExcelEntitys(List data); + + List converCorpDOsToCorpCO(List data); } diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListItemQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListItemQueryExe.java new file mode 100644 index 0000000..9477780 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListItemQueryExe.java @@ -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 execute(FireCheckListItemPageQry fireCheckListItemPageQry) { + Map params = PageQueryHelper.toHashMap(fireCheckListItemPageQry); + PageResponse pageResponse = fireCheckListItemRepository.listPage(params); + List examCenterCOS = fireCheckListItemCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java new file mode 100644 index 0000000..d9b8303 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java @@ -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 execute(FireCheckListPageQry fireCheckListPageQry) { + Map params = PageQueryHelper.toHashMap(fireCheckListPageQry); + PageResponse pageResponse = fireCheckListRepository.listPage(params); + List 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 fireCheckListItemDOList = fireCheckListItemRepository.listByFireCheckId(fireCheckListDO.getFireCheckId()); + if (CollUtil.isEmpty(fireCheckListItemDOList)) { + return fireCheckListCO; + } + //获取所有id + List fireCheckListItemIdList = fireCheckListItemDOList.stream().map(FireCheckListItemDO::getFireDeviceId).collect(Collectors.toList()); + //获取所有的消防器材信息 + Map params = new HashMap<>(); + params.put("fireDeviceIdList", fireCheckListItemIdList); + List fireDeviceDOList = fireDeviceRepository.getAllList(params); + List examCenterCOS = fireDeviceCoConvertor.converDOsToCOs(fireDeviceDOList); + fireCheckListCO.setFireDeviceCOList(examCenterCOS); + return fireCheckListCO; + } + + public PageResponse appCheckList(FireCheckListPageQry qry) { + + Map params = PageQueryHelper.toHashMap(qry); + PageResponse pageResponse = fireCheckListRepository.appCheckList(params); + List examCenterCOS = fireCheckListCoConvertor.converDOsToCOs(pageResponse.getData()); + if (CollUtil.isEmpty(examCenterCOS)) { + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + List fireCheckIdList = examCenterCOS.stream().map(FireCheckListCO::getFireCheckId).collect(Collectors.toList()); + //补充完整的用户负责人 + List fireCheckListUserDOList = fireCheckListUserRepository.getListUserNameByFireCheckIdList(fireCheckIdList); + //fireCheckListUserDOList转换为key value map + Map fireCheckListUserDONameMap = fireCheckListUserDOList.stream() + .collect(Collectors.groupingBy( + FireCheckListUserDO::getFireCheckId, + Collectors.mapping(FireCheckListUserDO::getUserName, Collectors.joining(",")))); + //获取所有的检查项目信息 + List fireCheckListItemStatisticDOList = fireCheckListItemRepository.statisticListByFireCheckIdList(fireCheckIdList); + //fireCheckListItemStatisticDOList转换为key value map + + Map 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 riskDistribution(RiskDistributionPageQry qry) { + Map params = PageQueryHelper.toHashMap(qry); + PageResponse pageResponse = fireCheckListRepository.riskDistribution(params); + List 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 pointDistributionStatistic(PointDistributionPageQry qry) { + Map params = PageQueryHelper.toHashMap(qry); + PageResponse pageResponse = fireCheckListRepository.pointDistribution(params); + List examCenterCOS = fireCheckListCoConvertor.converPointDistributionDOsToCOs(pageResponse.getData()); + //增加检查标准 + if (CollUtil.isEmpty(examCenterCOS)) { + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + //获取所有的检查类型 + List fireCheckTypeList = examCenterCOS.stream().map(PointDistributionCO::getFireDeviceType).distinct().collect(Collectors.toList()); + + + List fireCheckStandardDOList = fireCheckStandardRepository.getCheckStandardList(fireCheckTypeList); + + Map> fireCheckListItemStatisticDOMap = fireCheckStandardDOList.stream() + .collect(Collectors.groupingBy( + FireCheckStandardDO::getFireDeviceType, + Collectors.mapping(FireCheckStandardDO::getFireCheckStandardItem, Collectors.toList()) + )); + + //补充检查标准 + for (PointDistributionCO pointDistributionCO : examCenterCOS) { + List fireCheckTypeItemList = fireCheckListItemStatisticDOMap.get(pointDistributionCO.getFireDeviceType()); + if (fireCheckTypeItemList != null) { + pointDistributionCO.setFireCheckTypeItemList(fireCheckTypeItemList); + } + } + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + + public List getCheckPointList(CheckPointListQry qry) { + + Map params = PageQueryHelper.toHashMap(qry); + List fireCheckPointListDOList = fireCheckListRepository.getCheckPointList(params); + if (CollUtil.isEmpty(fireCheckPointListDOList)) { + return Collections.emptyList(); + } + //过滤标准数量为0的 + List missingTypes = fireCheckPointListDOList.stream().filter(item -> item.getStandardCount() == 0).collect(Collectors.toList()); + if (CollUtil.isNotEmpty(missingTypes)) { + //获取类型名称，逗号分隔 + List fireDeviceTypeNameList = missingTypes.stream().map(FireCheckPointListDO::getFireDeviceTypeName).distinct().collect(Collectors.toList()); + throw new BizException("检查设备没有检查标准：" + fireDeviceTypeNameList); + } + // 获取检查标准数据 + List fireDeviceTypeList = fireCheckPointListDOList.stream().map(FireCheckPointListDO::getFireDeviceType).collect(Collectors.toList()); + + List fireCheckStandardDOList = fireCheckStandardRepository.getCheckStandardList(fireDeviceTypeList); + // 如果没有找到任何检查标准，抛出异常 + if (CollUtil.isEmpty(fireCheckStandardDOList)) { + throw new BizException("所有检查设备没有检查标准"); + } + // 构建检查标准映射 + List fireCheckStandardCOList = fireCheckStandardCoConvertor.converDOsToCOs(fireCheckStandardDOList); + Map> fireCheckStandardMap = fireCheckStandardCOList.stream() + .collect(Collectors.groupingBy(FireCheckStandardCO::getFireDeviceType)); + + + //fireCheckPointListDOList按照pointid进行分组 + Map> fireCheckPointListDOMap = fireCheckPointListDOList.stream().collect(Collectors.groupingBy(FireCheckPointListDO::getFirePointId)); + + //获取隐患相关信息 + List fireCheckRecordHiddenDOList = fireCheckRecordHiddenRepository.getHiddenListByFireCheckId(qry.getFireCheckId(), HiddenCheckTypeEnum.CHECK_ITEM_HIDDEN.getCode()); + List hiddenIdList = fireCheckRecordHiddenDOList.stream().map(FireCheckRecordHiddenDO::getHiddenId).collect(Collectors.toList()); + MultiResponse 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> fireCheckRecordHiddenDOMap = fireCheckRecordHiddenDOList.stream().collect(Collectors.groupingBy(FireCheckRecordHiddenDO::getFireDeviceId)); + + + // 处理设备类型名和设备编码的聚合显示 + List result = new ArrayList<>(); + for (Map.Entry> entry : fireCheckPointListDOMap.entrySet()) { + List 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 fireCheckPointDeviceListCOList = new ArrayList<>(); + //处理设备信息 ,并且判断设备下是否存在隐患信息 + MultiResponse 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 hiddenIds = finalHiddenListCOMultiResponse.getData().stream().map(HiddenListCO::getHiddenId).collect(Collectors.toList()); + List hiddenList = fireCheckRecordHiddenDOMap.get(childNode.getFireDeviceId()); + if (CollUtil.isNotEmpty(hiddenList)) { + List 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 fireCheckRecordPointDOList = fireCheckRecordPointRepository.getInfoByFireCheckRecordId(fireCheckRecordDO.getFireRecordId()); + List checkRecordDeviceList = fireCheckRecordDeviceRepository.getCheckRecordDeviceList(fireCheckRecordDO.getFireRecordId()); + Map> checkRecordDeviceMap = checkRecordDeviceList.stream().collect(Collectors.groupingBy(FireCheckRecordDeviceDO::getFireRecordPointId)); + if (CollUtil.isNotEmpty(fireCheckRecordPointDOList)) { + Map 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 fireCheckRecordDeviceDOS = checkRecordDeviceMap.get(recordPointDO.getFireRecordPointId()); + //转换 + List fireCheckPointDeviceListCOList =fireCheckRecordDeviceCoConvertor.converDOsToDeviceCOs(fireCheckRecordDeviceDOS); + fireCheckPointListCO.setFireCheckRecordDeviceStatusList(fireCheckPointDeviceListCOList); + } + }); + } + } + return result; + } + + private void checkFireDeviceStandard(List fireCheckPointListDOList) { + // 获取检查标准数据 + Map fireDeviceTypeNameMap = fireCheckPointListDOList.stream() + .collect(Collectors.toMap( + FireCheckPointListDO::getFireDeviceType, + FireCheckPointListDO::getFireDeviceTypeName, + (existing, replacement) -> existing)); // 处理重复key的情况 + if (CollUtil.isEmpty(fireDeviceTypeNameMap)) { + throw new BizException("检查设备没有检查标准"); + } + + List fireDeviceTypeList = new ArrayList<>(fireDeviceTypeNameMap.keySet()); + List fireCheckStandardDOList = fireCheckStandardRepository.getCheckStandardList(fireDeviceTypeList); + + // 如果没有找到任何检查标准，抛出异常 + if (CollUtil.isEmpty(fireCheckStandardDOList)) { + throw new BizException("所有检查设备没有检查标准"); + } + // 构建检查标准映射 + List fireCheckStandardCOList = fireCheckStandardCoConvertor.converDOsToCOs(fireCheckStandardDOList); + Map> fireCheckStandardMap = fireCheckStandardCOList.stream() + .collect(Collectors.groupingBy(FireCheckStandardCO::getFireDeviceType)); + + // 检查是否存在没有检查标准的设备类型 + Set availableTypes = fireCheckStandardMap.keySet(); + List missingTypes = fireDeviceTypeList.stream() + .filter(type -> !availableTypes.contains(type)) + .map(fireDeviceTypeNameMap::get) + .collect(Collectors.toList()); + + if (CollUtil.isNotEmpty(missingTypes)) { + throw new BizException("检查设备没有检查标准：" + missingTypes); + } + } + + + public PageResponse getBackChecKList(FireBackCheckListPageQry qry) { + if (qry.getUserId() == null) { + qry.setUserId(AuthContext.getUserId()); + } + Map params = PageQueryHelper.toHashMap(qry); + + PageResponse pageResponse = fireCheckListRepository.getBackChecKList(params); + List fireBackCheckListCOList = fireCheckListCoConvertor.converDOsToBackCOs(pageResponse.getData()); + + if (CollUtil.isEmpty(fireBackCheckListCOList)) { + return PageResponse.of(fireBackCheckListCOList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + + } + //补充检查数和完整检查人 + + List fireCheckIdList = fireBackCheckListCOList.stream().map(FireBackCheckListCO::getFireCheckId).collect(Collectors.toList()); + //补充完整的用户负责人 + List fireCheckListStatisticDOList = fireCheckListUserRepository.getListUserStatisticByFireCheckIdList(fireCheckIdList); + //fireCheckListUserDOList转换为key value map + Map 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 checkListRecordList(FireCheckListRecordPageQry qry) { + Map params = PageQueryHelper.toHashMap(qry); + PageResponse pageResponse = fireCheckListRepository.checkListRecordList(params); + List examCenterCOS = fireCheckListCoConvertor.converDOsToCOs(pageResponse.getData()); + if (CollUtil.isEmpty(examCenterCOS)) { + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + List fireCheckIdList = examCenterCOS.stream().map(FireCheckListCO::getFireCheckId).collect(Collectors.toList()); + //补充完整的用户负责人 + List fireCheckListUserDOList = fireCheckListUserRepository.getListUserNameByFireCheckIdList(fireCheckIdList); + //fireCheckListUserDOList转换为key value map + Map fireCheckListUserDONameMap = fireCheckListUserDOList.stream() + .collect(Collectors.groupingBy( + FireCheckListUserDO::getFireCheckId, + Collectors.mapping(FireCheckListUserDO::getUserName, Collectors.joining(",")))); + //获取检查次数 + List fireCheckRecordStatisticDOList = fireCheckRecordRepository.statisticListByFireCheckIdList(fireCheckIdList); + //fireCheckListItemStatisticDOList转换为key value map + + Map 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 getCheckListRecord(CheckListRecordPageQry qry) { + + Map params = PageQueryHelper.toHashMap(qry); + PageResponse pageResponse = fireCheckListRepository.getCheckListRecord(params); + List examCenterCOS = fireCheckListCoConvertor.converDOsToCOs(pageResponse.getData()); + if(CollUtil.isEmpty(examCenterCOS)){ + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + List fireCheckIdList = examCenterCOS.stream().map(FireCheckListCO::getFireCheckId).collect(Collectors.toList()); + //补充完整的用户负责人 + List fireCheckListUserDOList = fireCheckListUserRepository.getListUserNameByFireCheckIdList(fireCheckIdList); + //fireCheckListUserDOList转换为key value map + Map fireCheckListUserDONameMap = fireCheckListUserDOList.stream() + .collect(Collectors.groupingBy( + FireCheckListUserDO::getFireCheckId, + Collectors.mapping(FireCheckListUserDO::getUserName, Collectors.joining(",")))); + examCenterCOS.forEach(info -> { + info.setUserName(fireCheckListUserDONameMap.getOrDefault(info.getFireCheckId(), "")); + }); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListUserQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListUserQueryExe.java new file mode 100644 index 0000000..f20745b --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListUserQueryExe.java @@ -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 execute(FireCheckListUserPageQry fireCheckListUserPageQry) { + Map params = PageQueryHelper.toHashMap(fireCheckListUserPageQry); + PageResponse pageResponse = fireCheckListUserRepository.listPage(params); + List examCenterCOS = fireCheckListUserCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordDeviceQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordDeviceQueryExe.java new file mode 100644 index 0000000..20d0379 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordDeviceQueryExe.java @@ -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 execute(FireCheckRecordDevicePageQry fireCheckRecordDevicePageQry) { + Map params = PageQueryHelper.toHashMap(fireCheckRecordDevicePageQry); + PageResponse pageResponse = fireCheckRecordDeviceRepository.listPage(params); + List examCenterCOS = fireCheckRecordDeviceCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordHiddenQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordHiddenQueryExe.java new file mode 100644 index 0000000..45baced --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordHiddenQueryExe.java @@ -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 execute(FireCheckRecordHiddenPageQry fireCheckRecordHiddenPageQry) { + Map params = PageQueryHelper.toHashMap(fireCheckRecordHiddenPageQry); + PageResponse pageResponse = fireCheckRecordHiddenRepository.listPage(params); + List examCenterCOS = fireCheckRecordHiddenCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordPointQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordPointQueryExe.java new file mode 100644 index 0000000..dcf383b --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordPointQueryExe.java @@ -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 execute(FireCheckRecordPointPageQry fireCheckRecordPointPageQry) { + Map params = PageQueryHelper.toHashMap(fireCheckRecordPointPageQry); + PageResponse pageResponse = fireCheckRecordPointRepository.listPage(params); + List examCenterCOS = fireCheckRecordPointCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + + public PageResponse getCheckRecordPointList(CheckRecordPointListQry qry) { + Map params = PageQueryHelper.toHashMap(qry); + PageResponse pageResponse = fireCheckRecordPointRepository.getCheckRecordPointList(params); + List fireCheckPointListCOList = fireCheckRecordPointCoConvertor.converDOsToPointCOs(pageResponse.getData()); + if(CollUtil.isEmpty(fireCheckPointListCOList)){ + return PageResponse.of(fireCheckPointListCOList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + //组装设备信息,fireCheckPointListCOList idlist集合 + + + + List idList = fireCheckPointListCOList.stream().map(FireCheckPointListCO::getFireRecordPointId).collect(Collectors.toList()); + //idList 获取打回的设备检查项信息 + List fireCheckRecordDeviceDOList = fireCheckRecordDeviceRepository.getBackChecKRecordPoiList(idList); + if(CollUtil.isEmpty(fireCheckRecordDeviceDOList)){ + return PageResponse.of(fireCheckPointListCOList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + + List fireRecordDeviceIdList = fireCheckRecordDeviceDOList.stream().map(FireCheckRecordDeviceDO::getFireRecordDeviceId).collect(Collectors.toList()); + //获取隐患信息 + List fireCheckRecordHiddenDOList = fireCheckRecordHiddenRepository.getChecKRecordDeviceList(fireRecordDeviceIdList); + //fireCheckRecordHiddenDOList 按照设备id key value对象 + + Map fireCheckRecordHiddenDOMap = fireCheckRecordHiddenDOList.stream() + .collect(Collectors.toMap(FireCheckRecordHiddenDO::getFireRecordDeviceId, Function.identity())); + + //fireCheckRecordDeviceDOList 分组 + Map> collect = fireCheckRecordDeviceDOList.stream().collect(Collectors.groupingBy(FireCheckRecordDeviceDO::getFireRecordPointId)); + //fireCheckPointListCOList 遍历 合并设备信息 + fireCheckPointListCOList.forEach(item -> { + List deviceDOList = collect.get(item.getFireRecordPointId()); + if(CollUtil.isNotEmpty(deviceDOList)){ + List 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()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordQueryExe.java new file mode 100644 index 0000000..62d1ec0 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordQueryExe.java @@ -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 execute(FireCheckRecordPageQry fireCheckRecordPageQry) { + Map params = PageQueryHelper.toHashMap(fireCheckRecordPageQry); + PageResponse pageResponse = fireCheckRecordRepository.getCheckRecordList(params); + List examCenterCOS = fireCheckRecordCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + + public PageResponse getCheckRecordList(FireBackCheckRecordPageQry qry) { + Map params = PageQueryHelper.toHashMap(qry); + + PageResponse pageResponse = fireCheckRecordRepository.getCheckRecordList(params); + List fireBackCheckRecordCOList = fireCheckRecordCoConvertor.converDOsToBackRecordCOs(pageResponse.getData()); + if(CollUtil.isEmpty(fireBackCheckRecordCOList)){ + return PageResponse.of(fireBackCheckRecordCOList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + //涉及点位数和负责人补全 + List fireCheckIdList =fireBackCheckRecordCOList.stream().map(FireBackCheckRecordCO::getFireCheckId).collect(Collectors.toList()); + //补充完整的用户负责人 + List fireCheckListStatisticDOList = fireCheckListUserRepository.getListUserByFireCheckIdList(fireCheckIdList); + //fireCheckListUserDOList转换为key value username + Map 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 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 fireCheckRecordDeviceCOList = fireCheckRecordDeviceRepository.getCheckRecordDeviceList(fireCheckRecordDO.getFireRecordId()); + + if(CollUtil.isNotEmpty(fireCheckRecordDeviceCOList)){ + List fireCheckRecordDeviceCOS = fireCheckRecordDeviceCoConvertor.converDOsToCOs(fireCheckRecordDeviceCOList); + //补充隐患信息 + //fireCheckRecordDeviceCOS获取List id + List idList = fireCheckRecordDeviceCOS.stream().map(FireCheckRecordDeviceCO::getFireRecordDeviceId).collect(Collectors.toList()); + List checKRecordDeviceHiddenList = fireCheckRecordHiddenRepository.getChecKRecordDeviceList(idList); + Map 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 corpCheckRecordList(CorpStatisticsPageQry qry) { + Map params = PageQueryHelper.toHashMap(qry); + //企业端 + params.put("inType", CorpTypeEnum.getCodesByEnterpriseType(UserTypeEnum.QY.getCode())); + params.put("eqUseFlag", CommonFlagEnum.YES.getCode()); + + PageResponse pageResponse = corpInfoRepository.listPage(params); + if(CollUtil.isEmpty(pageResponse.getData())){ + return PageResponse.of(null, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + + List examCenterCOS = corpInfoCoConvertor.converCorpDOsToCorpCheckStatisticsCO(pageResponse.getData()); + //获取企业id + List corpinfoIds = examCenterCOS.stream().map(CorpCheckStatisticsCO::getId).collect(Collectors.toList()); + //获取消防区域数量 + List 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 getCheckRecordPageH5(FireCheckRecordPagePointQry qry) { + Map params = PageQueryHelper.toHashMap(qry); + PageResponse pageResponse = fireCheckRecordRepository.getCheckRecordPageH5(params); + List examCenterCOS = fireCheckRecordCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordUserQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordUserQueryExe.java new file mode 100644 index 0000000..f5d517d --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordUserQueryExe.java @@ -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 execute(FireCheckRecordUserPageQry fireCheckRecordUserPageQry) { + Map params = PageQueryHelper.toHashMap(fireCheckRecordUserPageQry); + PageResponse pageResponse = fireCheckRecordUserRepository.listPage(params); + List examCenterCOS = fireCheckRecordUserCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckStandardQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckStandardQueryExe.java index 3242778..e5e272d 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckStandardQueryExe.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckStandardQueryExe.java @@ -64,8 +64,8 @@ public class FireCheckStandardQueryExe { } - public void importFireCheckStandardList(MultipartFile file, FireCheckStandardImportCmd fireCheckStandardImportCmd) { - List fireCheckStandardEs = FireCheckStandardE.importFireCheckStandardList(file, fireCheckStandardImportCmd.getFireDeviceType(), fireCheckStandardImportCmd.getFireDeviceTypeName()); + public void importFireCheckStandardList(FireCheckStandardImportCmd fireCheckStandardImportCmd) { + List fireCheckStandardEs = FireCheckStandardE.importFireCheckStandardList(fireCheckStandardImportCmd.getFile(), fireCheckStandardImportCmd.getFireDeviceType(), fireCheckStandardImportCmd.getFireDeviceTypeName()); // 批量插入 boolean res = false; try { diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireDeviceQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireDeviceQueryExe.java index 017f9e4..c3df8e4 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireDeviceQueryExe.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireDeviceQueryExe.java @@ -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 execute(FireDevicePageQry fireDevicePageQry) { Map params = PageQueryHelper.toHashMap(fireDevicePageQry); PageResponse pageResponse = fireDeviceRepository.listPage(params); + if (CollUtil.isEmpty(pageResponse.getData())) { + return PageResponse.of(null, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } List examCenterCOS = fireDeviceCoConvertor.converDOsToCOs(pageResponse.getData()); + //拼接消防器材检查标准，获取list + List fireDeviceTypeList = examCenterCOS.stream().map(FireDeviceCO::getFireDeviceType).collect(Collectors.toList()); + //根据list查询消防器材检查标准 + List fireCheckStandardDOList = fireCheckStandardRepository.getCheckStandardList(fireDeviceTypeList); + if (CollUtil.isNotEmpty(fireCheckStandardDOList)) { + List fireCheckStandardCOList = fireCheckStandardCoConvertor.converDOsToCOs(fireCheckStandardDOList); + Map> fireCheckStandardMap = fireCheckStandardCOList.stream() + .collect(Collectors.groupingBy(FireCheckStandardCO::getFireDeviceType)); + examCenterCOS.forEach(info -> { + info.setFireCheckStandardList(fireCheckStandardMap.get(info.getFireDeviceType())); + }); + } + + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } 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 examCenterCOS = fireDeviceCoConvertor.converDOsToCOs(pageResponse); return examCenterCOS; } + + public PageResponse corpStatisticslist(CorpStatisticsPageQry qry) { + Map params = PageQueryHelper.toHashMap(qry); + //企业端 + params.put("inType", CorpTypeEnum.getCodesByEnterpriseType(UserTypeEnum.QY.getCode())); + params.put("eqUseFlag", CommonFlagEnum.YES.getCode()); + + PageResponse pageResponse = corpInfoRepository.listPage(params); + if (CollUtil.isEmpty(pageResponse.getData())) { + return PageResponse.of(null, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + + List examCenterCOS = fireDeviceCoConvertor.converCorpDOsToCorpCO(pageResponse.getData()); + //获取企业id + List corpinfoIds = examCenterCOS.stream().map(CorpStatisticsCO::getId).collect(Collectors.toList()); + //获取消防区域数量 + List fireRegionCountMap = fireRegionRepository.countByCorpinfoIds(corpinfoIds); + //按照企业id进行分组 + Map fireRegionCountMapGroup = fireRegionCountMap.stream().collect(Collectors.toMap(DataStatisticDO::getCorpinfoId, Function.identity())); + //获取消防点位数量 + List firePointCountMap = firePointRepository.countByCorpinfoIds(corpinfoIds); + Map firePointCountMapGroup = firePointCountMap.stream().collect(Collectors.toMap(DataStatisticDO::getCorpinfoId, Function.identity())); + List fireDeviceCountMap = fireDeviceRepository.countByCorpinfoIds(corpinfoIds); + Map 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()); + + } + + } diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FirePointQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FirePointQueryExe.java index 29e5a73..3feac14 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/query/FirePointQueryExe.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FirePointQueryExe.java @@ -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; } diff --git a/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckListItemServiceImpl.java b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckListItemServiceImpl.java new file mode 100644 index 0000000..66b8b96 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckListItemServiceImpl.java @@ -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 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); + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckListServiceImpl.java b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckListServiceImpl.java new file mode 100644 index 0000000..dae899c --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckListServiceImpl.java @@ -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 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 appCheckList(FireCheckListPageQry qry) { + return fireCheckListQueryExe.appCheckList(qry); + + } + + @Override + public PageResponse riskDistribution(RiskDistributionPageQry qry) { + return fireCheckListQueryExe.riskDistribution(qry); + } + + @Override + public RiskDistributionStasticCO riskDistributionStatistic() { + return fireCheckListQueryExe.riskDistributionStatistic(); + } + + @Override + public PageResponse pointDistributionStatistic(PointDistributionPageQry qry) { + return fireCheckListQueryExe.pointDistributionStatistic(qry); + } + + @Override + public List getCheckPointList(CheckPointListQry qry) { + return fireCheckListQueryExe.getCheckPointList(qry); + } + + @Override + public PageResponse getBackChecKList(FireBackCheckListPageQry qry) { + return fireCheckListQueryExe.getBackChecKList(qry); + } + + + + @Override + public PageResponse checkListRecordList(FireCheckListRecordPageQry qry) { + return fireCheckListQueryExe.checkListRecordList(qry); + + } + + @Override + public PageResponse getCheckListRecord(CheckListRecordPageQry qry) { + return fireCheckListQueryExe.getCheckListRecord(qry); + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckListUserServiceImpl.java b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckListUserServiceImpl.java new file mode 100644 index 0000000..aac3699 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckListUserServiceImpl.java @@ -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 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); + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckRecordDeviceServiceImpl.java b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckRecordDeviceServiceImpl.java new file mode 100644 index 0000000..aa60629 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckRecordDeviceServiceImpl.java @@ -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 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); + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckRecordHiddenServiceImpl.java b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckRecordHiddenServiceImpl.java new file mode 100644 index 0000000..779f3c7 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckRecordHiddenServiceImpl.java @@ -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 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); + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckRecordPointServiceImpl.java b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckRecordPointServiceImpl.java new file mode 100644 index 0000000..27c992c --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckRecordPointServiceImpl.java @@ -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 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 getCheckRecordPointList(CheckRecordPointListQry qry) { + return fireCheckRecordPointQueryExe.getCheckRecordPointList(qry); + } + + @Override + public FireCheckRecordPointCO saveCheckRecordPoint(AppCheckRecordPointAddCmd appCheckRecordPointAddCmd) { + return fireCheckRecordPointAddExe.saveCheckRecordPoint(appCheckRecordPointAddCmd); + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckRecordServiceImpl.java b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckRecordServiceImpl.java new file mode 100644 index 0000000..b9644da --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckRecordServiceImpl.java @@ -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 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 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 corpCheckRecordList(CorpStatisticsPageQry qry) { + return fireCheckRecordQueryExe.corpCheckRecordList(qry); + } + + @Override + public PageResponse getCheckRecordPageH5(FireCheckRecordPagePointQry qry) { + return fireCheckRecordQueryExe.getCheckRecordPageH5(qry); + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckRecordUserServiceImpl.java b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckRecordUserServiceImpl.java new file mode 100644 index 0000000..0cf911b --- /dev/null +++ b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckRecordUserServiceImpl.java @@ -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 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); + } +} + diff --git a/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckStandardServiceImpl.java b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckStandardServiceImpl.java index 795b1f2..d02f3b4 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckStandardServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckStandardServiceImpl.java @@ -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); } } diff --git a/web-app/src/main/java/com/zcloud/fire/check/service/FireDeviceServiceImpl.java b/web-app/src/main/java/com/zcloud/fire/check/service/FireDeviceServiceImpl.java index 17d697b..25c4b1e 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/service/FireDeviceServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/fire/check/service/FireDeviceServiceImpl.java @@ -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 getAllList(FireDeviceListQry qry) { return fireDeviceQueryExe.getAllList(qry); } + + @Override + public PageResponse corpStatisticslist(CorpStatisticsPageQry qry) { + return fireDeviceQueryExe.corpStatisticslist(qry); + } + + } diff --git a/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckListItemServiceI.java b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckListItemServiceI.java new file mode 100644 index 0000000..825e17c --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckListItemServiceI.java @@ -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 listPage(FireCheckListItemPageQry qry); + + SingleResponse add(FireCheckListItemAddCmd cmd); + + void edit(FireCheckListItemUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckListServiceI.java b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckListServiceI.java new file mode 100644 index 0000000..523c37a --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckListServiceI.java @@ -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 listPage(FireCheckListPageQry qry); + + SingleResponse add(FireCheckListAddCmd cmd); + + void edit(FireCheckListUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); + + FireCheckListCO getInfoById(Long id); + + void editState(FireCheckListUpdateStateCmd fireCheckListUpdateStateCmd); + + PageResponse appCheckList(FireCheckListPageQry qry); + + PageResponse riskDistribution(RiskDistributionPageQry qry); + + RiskDistributionStasticCO riskDistributionStatistic(); + + PageResponse pointDistributionStatistic(PointDistributionPageQry qry); + + List getCheckPointList(CheckPointListQry qry); + + PageResponse getBackChecKList(FireBackCheckListPageQry qry); + + + PageResponse checkListRecordList(FireCheckListRecordPageQry qry); + + PageResponse getCheckListRecord(CheckListRecordPageQry qry); +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckListUserServiceI.java b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckListUserServiceI.java new file mode 100644 index 0000000..83f593d --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckListUserServiceI.java @@ -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 listPage(FireCheckListUserPageQry qry); + + SingleResponse add(FireCheckListUserAddCmd cmd); + + void edit(FireCheckListUserUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckRecordDeviceServiceI.java b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckRecordDeviceServiceI.java new file mode 100644 index 0000000..8ccd2fd --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckRecordDeviceServiceI.java @@ -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 listPage(FireCheckRecordDevicePageQry qry); + + SingleResponse add(FireCheckRecordDeviceAddCmd cmd); + + void edit(FireCheckRecordDeviceUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckRecordHiddenServiceI.java b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckRecordHiddenServiceI.java new file mode 100644 index 0000000..534a5ad --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckRecordHiddenServiceI.java @@ -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 listPage(FireCheckRecordHiddenPageQry qry); + + SingleResponse add(FireCheckRecordHiddenAddCmd cmd); + + void edit(FireCheckRecordHiddenUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckRecordPointServiceI.java b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckRecordPointServiceI.java new file mode 100644 index 0000000..d04c559 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckRecordPointServiceI.java @@ -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 listPage(FireCheckRecordPointPageQry qry); + + SingleResponse add(FireCheckRecordPointAddCmd cmd); + + void edit(FireCheckRecordPointUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); + + PageResponse getCheckRecordPointList(CheckRecordPointListQry qry); + + FireCheckRecordPointCO saveCheckRecordPoint(AppCheckRecordPointAddCmd appCheckRecordPointAddCmd); +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckRecordServiceI.java b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckRecordServiceI.java new file mode 100644 index 0000000..3c09863 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckRecordServiceI.java @@ -0,0 +1,38 @@ +package com.zcloud.fire.check.api; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.fire.check.dto.*; +import com.zcloud.fire.check.dto.clientobject.*; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-12-12 11:10:59 + */ +public interface FireCheckRecordServiceI { + PageResponse listPage(FireCheckRecordPageQry qry); + + SingleResponse add(FireCheckRecordAddCmd cmd); + + void edit(FireCheckRecordUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); + + PageResponse getCheckRecordList(FireBackCheckRecordPageQry qry); + + FireCheckRecordCO getChecKRecordInfo(String fireRecordId); + + FireCheckRecordCO getInfoById(Long id); + + FireCheckRecordCO saveCheckRecord(AppCheckRecordAddCmd appCheckRecordAddCmd); + + PageResponse corpCheckRecordList(CorpStatisticsPageQry qry); + + PageResponse getCheckRecordPageH5(FireCheckRecordPagePointQry qry); + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckRecordUserServiceI.java b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckRecordUserServiceI.java new file mode 100644 index 0000000..5a4b555 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckRecordUserServiceI.java @@ -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 listPage(FireCheckRecordUserPageQry qry); + + SingleResponse add(FireCheckRecordUserAddCmd cmd); + + void edit(FireCheckRecordUserUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckStandardServiceI.java b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckStandardServiceI.java index 538a991..bbf90d2 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckStandardServiceI.java +++ b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckStandardServiceI.java @@ -33,6 +33,6 @@ public interface FireCheckStandardServiceI { Collection listAll(FireCheckStandardPageQry qry); - void importFireCheckStandardList(MultipartFile file, FireCheckStandardImportCmd fireCheckStandardImportCmd); + void importFireCheckStandardList( FireCheckStandardImportCmd fireCheckStandardImportCmd); } diff --git a/web-client/src/main/java/com/zcloud/fire/check/api/FireDeviceServiceI.java b/web-client/src/main/java/com/zcloud/fire/check/api/FireDeviceServiceI.java index e3cb4bf..a6d41b4 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/api/FireDeviceServiceI.java +++ b/web-client/src/main/java/com/zcloud/fire/check/api/FireDeviceServiceI.java @@ -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 getAllList(FireDeviceListQry qry); + + PageResponse corpStatisticslist(CorpStatisticsPageQry qry); + } diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/AppCheckRecordAddCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/AppCheckRecordAddCmd.java new file mode 100644 index 0000000..00ac4de --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/AppCheckRecordAddCmd.java @@ -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 fireCheckRecordUserAddCmdList; + + //隐患信息 + @ApiModelProperty(value = "隐患信息", name = "hiddenAddCmdList") + private List hiddenAddCmdList; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/AppCheckRecordPointAddCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/AppCheckRecordPointAddCmd.java new file mode 100644 index 0000000..cacf151 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/AppCheckRecordPointAddCmd.java @@ -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 fireCheckRecordDeviceAddCmdList; + + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/AppFireCheckRecordPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/AppFireCheckRecordPageQry.java new file mode 100644 index 0000000..46e1a40 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/AppFireCheckRecordPageQry.java @@ -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; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/CheckListRecordPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/CheckListRecordPageQry.java new file mode 100644 index 0000000..115051b --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/CheckListRecordPageQry.java @@ -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; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/CheckPointListQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/CheckPointListQry.java new file mode 100644 index 0000000..5ce8361 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/CheckPointListQry.java @@ -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; + + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/CheckRecordPointListQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/CheckRecordPointListQry.java new file mode 100644 index 0000000..feb5709 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/CheckRecordPointListQry.java @@ -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; + + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/CorpStatisticsPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/CorpStatisticsPageQry.java new file mode 100644 index 0000000..56baf26 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/CorpStatisticsPageQry.java @@ -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; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireBackCheckListPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireBackCheckListPageQry.java new file mode 100644 index 0000000..ac07252 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireBackCheckListPageQry.java @@ -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; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireBackCheckRecordPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireBackCheckRecordPageQry.java new file mode 100644 index 0000000..0dd24ce --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireBackCheckRecordPageQry.java @@ -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; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListAddCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListAddCmd.java new file mode 100644 index 0000000..9b1d05b --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListAddCmd.java @@ -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 userIdList; + @ApiModelProperty(value = "检查照片上传方式（1相机照相，2相册获取）", name = "photoUploadMethod", required = true) + @NotNull(message = "检查照片上传方式不能为空") + private Integer photoUploadMethod; + + @ApiModelProperty(value = "检查器材集合", name = "fireCheckListItemAddCmdList", required = true) + private List fireCheckListItemAddCmdList; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListItemAddCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListItemAddCmd.java new file mode 100644 index 0000000..4ab0d29 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListItemAddCmd.java @@ -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; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListItemPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListItemPageQry.java new file mode 100644 index 0000000..81b2c5d --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListItemPageQry.java @@ -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; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListItemUpdateCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListItemUpdateCmd.java new file mode 100644 index 0000000..4f3fac8 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListItemUpdateCmd.java @@ -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; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListPageQry.java new file mode 100644 index 0000000..9b16e4e --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListPageQry.java @@ -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; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListRecordPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListRecordPageQry.java new file mode 100644 index 0000000..eddd489 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListRecordPageQry.java @@ -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; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListRemoveCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListRemoveCmd.java new file mode 100644 index 0000000..34246bc --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListRemoveCmd.java @@ -0,0 +1,29 @@ +package com.zcloud.fire.check.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-28 10:32:09 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FireCheckListRemoveCmd implements Serializable { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long[] ids; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListUpdateCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListUpdateCmd.java new file mode 100644 index 0000000..c30eb19 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListUpdateCmd.java @@ -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 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 fireCheckListItemAddCmdList; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListUpdateStateCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListUpdateStateCmd.java new file mode 100644 index 0000000..47baac8 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListUpdateStateCmd.java @@ -0,0 +1,34 @@ +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 javax.validation.constraints.Pattern; +import java.io.Serializable; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-28 10:32:09 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FireCheckListUpdateStateCmd implements Serializable { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + + @ApiModelProperty(value = "禁用1启用0", name = "state", required = true) + @NotNull(message = "状态不能为空") +// @Pattern(regexp = "^[01]$", message = "状态错误") + private Integer state; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListUserAddCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListUserAddCmd.java new file mode 100644 index 0000000..84372e9 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListUserAddCmd.java @@ -0,0 +1,41 @@ +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-12-11 15:32:49 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FireCheckListUserAddCmd extends Command { + @ApiModelProperty(value = "点检表id", name = "fireCheckId", required = true) + @NotEmpty(message = "点检表id不能为空") + private String fireCheckId; + + @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) + @NotNull(message = "企业id不能为空") + private Long corpinfoId; + + @ApiModelProperty(value = "负责部门", name = "departmentId", required = true) + @NotNull(message = "负责部门不能为空") + private Long departmentId; + + @ApiModelProperty(value = "负责人", name = "userId", required = true) + @NotNull(message = "负责人不能为空") + private Long userId; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListUserPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListUserPageQry.java new file mode 100644 index 0000000..a2ab849 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListUserPageQry.java @@ -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-12-11 15:32:50 + */ +@Data +public class FireCheckListUserPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private String likeFireCheckListUserId; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListUserUpdateCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListUserUpdateCmd.java new file mode 100644 index 0000000..65b165a --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListUserUpdateCmd.java @@ -0,0 +1,43 @@ +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-12-11 15:32:50 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FireCheckListUserUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "业务主键id", name = "fireCheckListUserId", required = true) + @NotEmpty(message = "业务主键id不能为空") + private String fireCheckListUserId; + @ApiModelProperty(value = "点检表id", name = "fireCheckId", required = true) + @NotEmpty(message = "点检表id不能为空") + private String fireCheckId; + @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) + @NotNull(message = "企业id不能为空") + private Long corpinfoId; + @ApiModelProperty(value = "负责部门", name = "departmentId", required = true) + @NotNull(message = "负责部门不能为空") + private Long departmentId; + @ApiModelProperty(value = "负责人", name = "userId", required = true) + @NotNull(message = "负责人不能为空") + private Long userId; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordAddCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordAddCmd.java new file mode 100644 index 0000000..b25e071 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordAddCmd.java @@ -0,0 +1,58 @@ +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.time.LocalDateTime; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-12-12 13:44:24 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FireCheckRecordAddCmd extends Command { + @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 = "检查表名字", name = "fireCheckName", required = true) + @NotEmpty(message = "检查表名字不能为空") + private String fireCheckName; + + @ApiModelProperty(value = "检查时间", name = "checkTime", required = true) + @NotEmpty(message = "检查时间不能为空") + private LocalDateTime checkTime; + + @ApiModelProperty(value = "是否完成,0否1是", name = "finishedFlag", required = true) + @NotNull(message = "是否完成,0否1是不能为空") + private Integer finishedFlag; + + @ApiModelProperty(value = "检查周期开始时间", name = "periodStart", required = true) + @NotEmpty(message = "检查周期开始时间不能为空") + private LocalDateTime periodStart; + + @ApiModelProperty(value = "检查周期结束时间", name = "periodEnd", required = true) + @NotEmpty(message = "检查周期结束时间不能为空") + private LocalDateTime periodEnd; + + @ApiModelProperty(value = "签字url", name = "signUrl", required = true) + @NotEmpty(message = "签字url不能为空") + private String signUrl; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordDeviceAddCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordDeviceAddCmd.java new file mode 100644 index 0000000..5cb6ac1 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordDeviceAddCmd.java @@ -0,0 +1,52 @@ +package com.zcloud.fire.check.dto; + +import com.alibaba.cola.dto.Command; +import com.zcloud.gbscommon.zcloudhidden.request.HiddenAddCmd; +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-12-12 13:44:34 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FireCheckRecordDeviceAddCmd extends Command { + @ApiModelProperty(value = "主键", name = "id") + private Long id; + + //业务主键id + @ApiModelProperty(value = "消防设备id") + @NotEmpty(message = "消防设备不能为空") + private String fireDeviceId; + + @ApiModelProperty(value = "是否检查过0已经检查1未检查，2已打回", name = "checkedFlag") + private Integer checkedFlag; + + @ApiModelProperty(value = "0合格1不合格2不涉及", name = "normalFlag", required = true) + @NotNull(message = "0合格1不合格2不涉及不能为空") + private Integer normalFlag; + + @ApiModelProperty(value = "经度", name = "longitude", required = true) + @NotEmpty(message = "经度不能为空") + private String longitude; + + @ApiModelProperty(value = "纬度", name = "latitude", required = true) + @NotEmpty(message = "纬度不能为空") + private String latitude; + + //隐患信息 + @ApiModelProperty(value = "检查项隐患信息", name = "checkRecordHiddenAddCmd") + private HiddenAddCmd hiddenAddCmd; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordDevicePageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordDevicePageQry.java new file mode 100644 index 0000000..bac7bc7 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordDevicePageQry.java @@ -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-12-12 13:44:34 + */ +@Data +public class FireCheckRecordDevicePageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private String likeFireRecordDeviceId; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordDeviceUpdateCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordDeviceUpdateCmd.java new file mode 100644 index 0000000..aa42702 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordDeviceUpdateCmd.java @@ -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; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-12-12 13:44:35 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FireCheckRecordDeviceUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + + @ApiModelProperty(value = "是否检查过0已经检查1未检查，2已打回", name = "checkedFlag", required = true) + @NotNull(message = "是否检查过0已经检查1未检查，2已打回不能为空") + private Integer checkedFlag; + + @ApiModelProperty(value = "打回原因", name = "hitBackTheReason", required = true) + @NotEmpty(message = "打回原因不能为空") + private String hitBackTheReason; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordHiddenAddCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordHiddenAddCmd.java new file mode 100644 index 0000000..eaecd71 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordHiddenAddCmd.java @@ -0,0 +1,60 @@ +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-12-12 13:44:43 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FireCheckRecordHiddenAddCmd extends Command { + @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 = "fireCheckListItemId", required = true) + @NotEmpty(message = "检查详情id不能为空") + private String fireCheckListItemId; + + @ApiModelProperty(value = "检查记录表id", name = "fireRecordId", required = true) + @NotEmpty(message = "检查记录表id不能为空") + private String fireRecordId; + + //检查记录点位表id + @ApiModelProperty(value = "检查记录点位表id") + private String fireRecordPointId; + //检查记录设备表id + @ApiModelProperty(value = "检查记录设备表id") + private String fireRecordDeviceId; + + @ApiModelProperty(value = "隐患id", name = "hiddenId", required = true) + @NotEmpty(message = "隐患id不能为空") + private String hiddenId; + + @ApiModelProperty(value = "隐患类型,检查项隐患1,还是其他隐患2", name = "hiddenCheckType", required = true) + @NotNull(message = "隐患类型,检查项隐患1,还是其他隐患2不能为空") + private Integer hiddenCheckType; + + @ApiModelProperty(value = "隐患描述", name = "hiddenDesc", required = true) + @NotEmpty(message = "隐患描述不能为空") + private String hiddenDesc; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordHiddenPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordHiddenPageQry.java new file mode 100644 index 0000000..78ffea9 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordHiddenPageQry.java @@ -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-12-12 13:44:43 + */ +@Data +public class FireCheckRecordHiddenPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private String likeFireRecordHidedenId; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordHiddenUpdateCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordHiddenUpdateCmd.java new file mode 100644 index 0000000..8ac9bc6 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordHiddenUpdateCmd.java @@ -0,0 +1,58 @@ +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-12-12 13:44:44 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FireCheckRecordHiddenUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "业务主键id", name = "fireRecordHidedenId", required = true) + @NotEmpty(message = "业务主键id不能为空") + private String fireRecordHidedenId; + @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 = "fireCheckListItemId", required = true) + @NotEmpty(message = "检查详情id不能为空") + private String fireCheckListItemId; + @ApiModelProperty(value = "检查记录表id", name = "fireRecordId", required = true) + @NotEmpty(message = "检查记录表id不能为空") + private String fireRecordId; + //检查记录点位表id + @ApiModelProperty(value = "检查记录点位表id") + private String fireRecordPointId; + //检查记录设备表id + @ApiModelProperty(value = "检查记录设备表id") + private String fireRecordDeviceId; + @ApiModelProperty(value = "隐患id", name = "hiddenId", required = true) + @NotEmpty(message = "隐患id不能为空") + private String hiddenId; + @ApiModelProperty(value = "隐患类型,检查项隐患1,还是其他隐患2", name = "hiddenCheckType", required = true) + @NotNull(message = "隐患类型,检查项隐患1,还是其他隐患2不能为空") + private Integer hiddenCheckType; + @ApiModelProperty(value = "隐患描述", name = "hiddenDesc", required = true) + @NotEmpty(message = "隐患描述不能为空") + private String hiddenDesc; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordPagePointQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordPagePointQry.java new file mode 100644 index 0000000..8fbf701 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordPagePointQry.java @@ -0,0 +1,24 @@ +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 javax.validation.constraints.NotNull; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-12-12 13:44:25 + */ +@Data +public class FireCheckRecordPagePointQry extends PageQuery { + + @ApiModelProperty(value = "点位id") + @NotEmpty(message = "点位不能为空") + private String firePointId; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordPageQry.java new file mode 100644 index 0000000..7010c0f --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordPageQry.java @@ -0,0 +1,40 @@ +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 org.codehaus.jackson.annotate.JsonProperty; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-12-12 13:44:25 + */ +@Data +public class FireCheckRecordPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + @ApiModelProperty(value = "消防点位检查id") + private String fireCheckId; + + //开始时间 + @ApiModelProperty(value = "开始时间") + private String startTime; + //结束时间 + @ApiModelProperty(value = "结束时间") + private String endTime; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordPointAddCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordPointAddCmd.java new file mode 100644 index 0000000..8279f9b --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordPointAddCmd.java @@ -0,0 +1,73 @@ +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-12-12 13:44:51 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FireCheckRecordPointAddCmd extends Command { + @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 = "fireRecordId", required = true) + @NotEmpty(message = "检查记录表id不能为空") + private String fireRecordId; + + @ApiModelProperty(value = "是否检查过0已经检查1未检查，2已打回", name = "checkedFlag", required = true) + @NotNull(message = "是否检查过0已经检查1未检查，2已打回不能为空") + private Integer checkedFlag; + + @ApiModelProperty(value = "消防区域主键id", name = "fireRegionId", required = true) + @NotEmpty(message = "消防区域主键id不能为空") + private String fireRegionId; + + @ApiModelProperty(value = "消防区域名称", name = "fireRegionName", required = true) + @NotEmpty(message = "消防区域名称不能为空") + private String fireRegionName; + + @ApiModelProperty(value = "消防区域编码", name = "fireRegionCode", required = true) + @NotEmpty(message = "消防区域编码不能为空") + private String fireRegionCode; + + @ApiModelProperty(value = "消防点位id", name = "firePointId", required = true) + @NotEmpty(message = "消防点位id不能为空") + private String firePointId; + + @ApiModelProperty(value = "消防点位名称", name = "firePointName", required = true) + @NotEmpty(message = "消防点位名称不能为空") + private String firePointName; + + @ApiModelProperty(value = "消防点位编码", name = "firePointCode", required = true) + @NotEmpty(message = "消防点位编码不能为空") + private String firePointCode; + + @ApiModelProperty(value = "经度", name = "longitude", required = true) + @NotEmpty(message = "经度不能为空") + private String longitude; + + @ApiModelProperty(value = "纬度", name = "latitude", required = true) + @NotEmpty(message = "纬度不能为空") + private String latitude; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordPointPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordPointPageQry.java new file mode 100644 index 0000000..920b130 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordPointPageQry.java @@ -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-12-12 13:44:51 + */ +@Data +public class FireCheckRecordPointPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private String likeFireRecordPointId; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordPointUpdateCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordPointUpdateCmd.java new file mode 100644 index 0000000..70702e3 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordPointUpdateCmd.java @@ -0,0 +1,67 @@ +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-12-12 13:44:52 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FireCheckRecordPointUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "业务主键id", name = "fireRecordPointId", required = true) + @NotEmpty(message = "业务主键id不能为空") + private String fireRecordPointId; + @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 = "fireRecordId", required = true) + @NotEmpty(message = "检查记录表id不能为空") + private String fireRecordId; + @ApiModelProperty(value = "是否检查过0已经检查1未检查，2已打回", name = "checkedFlag", required = true) + @NotNull(message = "是否检查过0已经检查1未检查，2已打回不能为空") + private Integer checkedFlag; + @ApiModelProperty(value = "消防区域主键id", name = "fireRegionId", required = true) + @NotEmpty(message = "消防区域主键id不能为空") + private String fireRegionId; + @ApiModelProperty(value = "消防区域名称", name = "fireRegionName", required = true) + @NotEmpty(message = "消防区域名称不能为空") + private String fireRegionName; + @ApiModelProperty(value = "消防区域编码", name = "fireRegionCode", required = true) + @NotEmpty(message = "消防区域编码不能为空") + private String fireRegionCode; + @ApiModelProperty(value = "消防点位id", name = "firePointId", required = true) + @NotEmpty(message = "消防点位id不能为空") + private String firePointId; + @ApiModelProperty(value = "消防点位名称", name = "firePointName", required = true) + @NotEmpty(message = "消防点位名称不能为空") + private String firePointName; + @ApiModelProperty(value = "消防点位编码", name = "firePointCode", required = true) + @NotEmpty(message = "消防点位编码不能为空") + private String firePointCode; + @ApiModelProperty(value = "经度", name = "longitude", required = true) + @NotEmpty(message = "经度不能为空") + private String longitude; + @ApiModelProperty(value = "纬度", name = "latitude", required = true) + @NotEmpty(message = "纬度不能为空") + private String latitude; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordUpdateCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordUpdateCmd.java new file mode 100644 index 0000000..0405f1b --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordUpdateCmd.java @@ -0,0 +1,58 @@ +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.time.LocalDateTime; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-12-12 13:44:25 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FireCheckRecordUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "业务主键id", name = "fireRecordId", required = true) + @NotEmpty(message = "业务主键id不能为空") + private String fireRecordId; + @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 = "检查表名字", name = "fireCheckName", required = true) + @NotEmpty(message = "检查表名字不能为空") + private String fireCheckName; + + @ApiModelProperty(value = "检查时间", name = "checkTime", required = true) + @NotEmpty(message = "检查时间不能为空") + private LocalDateTime checkTime; + @ApiModelProperty(value = "是否完成,0否1是", name = "finishedFlag", required = true) + @NotNull(message = "是否完成,0否1是不能为空") + private Integer finishedFlag; + @ApiModelProperty(value = "检查周期开始时间", name = "periodStart", required = true) + @NotEmpty(message = "检查周期开始时间不能为空") + private LocalDateTime periodStart; + @ApiModelProperty(value = "检查周期结束时间", name = "periodEnd", required = true) + @NotEmpty(message = "检查周期结束时间不能为空") + private LocalDateTime periodEnd; + @ApiModelProperty(value = "签字url", name = "signUrl", required = true) + @NotEmpty(message = "签字url不能为空") + private String signUrl; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordUserAddCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordUserAddCmd.java new file mode 100644 index 0000000..f947728 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordUserAddCmd.java @@ -0,0 +1,43 @@ +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-12-12 13:44:59 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FireCheckRecordUserAddCmd implements Serializable { + + + @ApiModelProperty(value = "部门id", name = "departmentId", required = true) + @NotNull(message = "部门id不能为空") + private Long departmentId; + + @ApiModelProperty(value = "部门名称", name = "departmentName", required = true) + @NotEmpty(message = "部门名称不能为空") + private String departmentName; + + @ApiModelProperty(value = "人员id", name = "userId", required = true) + @NotNull(message = "人员id不能为空") + private Long userId; + + @ApiModelProperty(value = "人员名称", name = "userName", required = true) + @NotEmpty(message = "人员名称不能为空") + private String userName; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordUserPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordUserPageQry.java new file mode 100644 index 0000000..6c4dba9 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordUserPageQry.java @@ -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-12-12 13:45:00 + */ +@Data +public class FireCheckRecordUserPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private String likeFireRecordUserId; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordUserUpdateCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordUserUpdateCmd.java new file mode 100644 index 0000000..1af7ead --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckRecordUserUpdateCmd.java @@ -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; + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-12-12 13:45:00 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FireCheckRecordUserUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "业务主键id", name = "fireRecordUserId", required = true) + @NotEmpty(message = "业务主键id不能为空") + private String fireRecordUserId; + @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 = "fireRecordId", required = true) + @NotEmpty(message = "检查记录表id不能为空") + private String fireRecordId; + @ApiModelProperty(value = "部门id", name = "departmentId", required = true) + @NotNull(message = "部门id不能为空") + private Long departmentId; + @ApiModelProperty(value = "部门名称", name = "departmentName", required = true) + @NotEmpty(message = "部门名称不能为空") + private String departmentName; + @ApiModelProperty(value = "人员id", name = "userId", required = true) + @NotNull(message = "人员id不能为空") + private Long userId; + @ApiModelProperty(value = "人员名称", name = "userName", required = true) + @NotEmpty(message = "人员名称不能为空") + private String userName; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckStandardImportCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckStandardImportCmd.java index 43a640d..3387f0d 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckStandardImportCmd.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckStandardImportCmd.java @@ -6,6 +6,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.springframework.web.multipart.MultipartFile; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -29,5 +30,9 @@ public class FireCheckStandardImportCmd implements Serializable { @NotEmpty(message = "消防器材类型名称不能为空") private String fireDeviceTypeName; + @ApiModelProperty(value = "文件", name = "file", required = true) + @NotNull(message = "文件不能为空") + private MultipartFile file; + } diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceListQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceListQry.java index d254a96..4175ddb 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceListQry.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireDeviceListQry.java @@ -29,6 +29,8 @@ public class FireDeviceListQry implements Serializable { */ @ApiModelProperty(value = "消防器材主键ID", name = "ids",hidden = true) private List ids; + @ApiModelProperty(value = "消防器材业务ID", name = "fireDeviceIdList",hidden = true) + private List fireDeviceIdList; @ApiModelProperty(value = "消防器材类型", name = "fireDeviceType") private String fireDeviceType; diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointAddCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointAddCmd.java index 6dd61b2..8a14aa7 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointAddCmd.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointAddCmd.java @@ -36,10 +36,6 @@ public class FirePointAddCmd extends Command { @NotEmpty(message = "消防点位编码不能为空") private String firePointCode; - @ApiModelProperty(value = "部门id", name = "departmentId", required = true) - @NotNull(message = "负责部门不能为空") - private Long departmentId; - @ApiModelProperty(value = "负责人", name = "userId", required = true) @NotNull(message = "负责人不能为空") private Long userId; @@ -49,6 +45,8 @@ public class FirePointAddCmd extends Command { @ApiModelProperty(value = "纬度", name = "latitude") private String latitude; + @ApiModelProperty(value = "是否开启nfc,0否，1是", name = "nfcFlag") + private Integer nfcFlag; } diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointPageQry.java index 8b64934..118ed0b 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointPageQry.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointPageQry.java @@ -38,6 +38,8 @@ public class FirePointPageQry extends PageQuery { @ApiModelProperty(value = "是否标点,1:是,0:否", name = "punctuationFlag") private Integer punctuationFlag; + @ApiModelProperty(value = "是否NFC,1:是,0:否", name = "nfcFlag") + private Integer nfcFlag; diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointUpdateCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointUpdateCmd.java index 61f4dd0..2976a33 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointUpdateCmd.java @@ -44,5 +44,7 @@ public class FirePointUpdateCmd extends Command { private String longitude; @ApiModelProperty(value = "纬度", name = "latitude") private String latitude; + @ApiModelProperty(value = "是否开启nfc,0否，1是", name = "nfcFlag") + private Integer nfcFlag; } diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionAddCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionAddCmd.java index b22de23..f90e692 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionAddCmd.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionAddCmd.java @@ -42,9 +42,6 @@ public class FireRegionAddCmd extends Command { @ApiModelProperty(value = "备注", name = "remarks") private String remarks; - @ApiModelProperty(value = "检查照片上传方式（1相机照相，2相册获取）", name = "photoUploadMethod", required = true) - @NotNull(message = "检查照片上传方式不能为空") - private Integer photoUploadMethod; } diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionPageQry.java index 9faeba4..2b3ac94 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionPageQry.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionPageQry.java @@ -33,6 +33,8 @@ public class FireRegionPageQry extends PageQuery { private String fireRegionCode; @ApiModelProperty(value = "部门", name = "departmentId") private String departmentId; + @ApiModelProperty(value = "状态", name = "state") + private Integer state; } diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionUpdateCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionUpdateCmd.java index 8df92f9..2e98b5e 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireRegionUpdateCmd.java @@ -40,8 +40,6 @@ public class FireRegionUpdateCmd extends Command { @ApiModelProperty(value = "0启用,1禁用", name = "state") private Integer state; - @ApiModelProperty(value = "检查照片上传方式（1相机照相，2相册获取）", name = "photoUploadMethod", required = true) - @NotNull(message = "检查照片上传方式不能为空") - private Integer photoUploadMethod; + } diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/PointDistributionPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/PointDistributionPageQry.java new file mode 100644 index 0000000..47fa3bc --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/PointDistributionPageQry.java @@ -0,0 +1,34 @@ +package com.zcloud.fire.check.dto; + +import com.alibaba.cola.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-28 10:32:09 + */ +@Data +public class PointDistributionPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + //企业ID + @ApiModelProperty(value = "企业ID") + @NotNull(message = "企业ID不能为空") + private String corpinfoId; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/RiskDistributionPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/RiskDistributionPageQry.java new file mode 100644 index 0000000..5f3c2e4 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/RiskDistributionPageQry.java @@ -0,0 +1,31 @@ +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 RiskDistributionPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + //企业名称 + @ApiModelProperty(value = "企业名称") + private String corpinfoName; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/UserDepartmentInfoCmd.java b/web-client/src/main/java/com/zcloud/fire/check/dto/UserDepartmentInfoCmd.java new file mode 100644 index 0000000..8368d08 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/UserDepartmentInfoCmd.java @@ -0,0 +1,35 @@ +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:08 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class UserDepartmentInfoCmd implements Serializable { + + + + + @ApiModelProperty(value = "负责人", name = "userId", required = true) + @NotNull(message = "负责人不能为空") + private Long userId; + + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/CorpCheckStatisticsCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/CorpCheckStatisticsCO.java new file mode 100644 index 0000000..4aecda6 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/CorpCheckStatisticsCO.java @@ -0,0 +1,29 @@ +package com.zcloud.fire.check.dto.clientobject; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:12:34 + */ +@Data +public class CorpCheckStatisticsCO implements Serializable { + //企业id + @ApiModelProperty(value = "企业id") + private Long id; + //公司名称 + @ApiModelProperty(value = "公司名称") + private String corpName; + + //检查次数 + @ApiModelProperty(value = "检查次数") + private Integer checkCount; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/CorpStatisticsCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/CorpStatisticsCO.java new file mode 100644 index 0000000..ad12f9b --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/CorpStatisticsCO.java @@ -0,0 +1,39 @@ +package com.zcloud.fire.check.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-26 10:12:34 + */ +@Data +public class CorpStatisticsCO implements Serializable { + //企业id + @ApiModelProperty(value = "企业id") + private Long id; + //公司名称 + @ApiModelProperty(value = "公司名称") + private String corpName; + + //消防区域数量 + @ApiModelProperty(value = "消防区域数量") + private Integer fireRegionCount; + //消防点位数量 + @ApiModelProperty(value = "消防点位数量") + private Integer firePointCount; + + //消防器材数量 + @ApiModelProperty(value = "消防器材数量") + private Integer fireDeviceCount; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireBackCheckListCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireBackCheckListCO.java new file mode 100644 index 0000000..05ba50c --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireBackCheckListCO.java @@ -0,0 +1,62 @@ +package com.zcloud.fire.check.dto.clientobject; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-28 10:32:08 + */ +@Data +public class FireBackCheckListCO implements Serializable { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireCheckId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //检查表名字 + @ApiModelProperty(value = "检查表名字") + private String fireCheckName; + //检查表类型 + @ApiModelProperty(value = "检查表类型") + private String fireCheckType; + //检查表类型名称 + @ApiModelProperty(value = "检查表类型名称") + private String fireCheckTypeName; + //负责部门 + @ApiModelProperty(value = "负责部门") + private Long departmentId; + + //禁用1启用0 + @ApiModelProperty(value = "禁用1启用0") + private Integer state; + + + //岗位 + @ApiModelProperty(value = "岗位名称") + private String postName; + //部门名称 + @ApiModelProperty(value = "部门名称") + private String departmentName; + //用户名称 + @ApiModelProperty(value = "负责人列表") + private String userNameList; + //检查次数 + @ApiModelProperty(value = "检查次数") + private Integer checkCount; + + + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireBackCheckRecordCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireBackCheckRecordCO.java new file mode 100644 index 0000000..ba4da18 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireBackCheckRecordCO.java @@ -0,0 +1,76 @@ +package com.zcloud.fire.check.dto.clientobject; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-28 10:32:08 + */ +@Data +public class FireBackCheckRecordCO implements Serializable { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireRecordId; + + //检查表id + @ApiModelProperty(value = "检查表id") + private String fireCheckId; + //检查表名字 + @ApiModelProperty(value = "检查表名字") + private String fireCheckName; + @ApiModelProperty(value = "检查表类型") + private String fireCheckType; + //检查表类型名称 + @ApiModelProperty(value = "检查表类型名称") + private String fireCheckTypeName; + + //部门id + @ApiModelProperty(value = "部门id") + private Long departmentId; + //部门名称 + @ApiModelProperty(value = "部门名称") + private String departmentName; + + //检查人 + @ApiModelProperty(value = "检查人") + private String userName; + //检查时间 + @ApiModelProperty(value = "检查时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime checkTime; + //是否完成,0否1是 + @ApiModelProperty(value = "是否完成,0否1是") + private Integer finishedFlag; + //检查周期开始时间 + @ApiModelProperty(value = "检查周期开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime periodStart; + //检查周期结束时间 + @ApiModelProperty(value = "检查周期结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime periodEnd; + //涉及点位数 + @ApiModelProperty(value = "涉及点位数") + private Integer checkRecordPointCount; + + @ApiModelProperty(value = "签字url") + private String signUrl; + @ApiModelProperty(value = "备注") + private String remarks; + + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckListCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckListCO.java new file mode 100644 index 0000000..40e357d --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckListCO.java @@ -0,0 +1,85 @@ +package com.zcloud.fire.check.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-28 10:32:08 + */ +@Data +public class FireCheckListCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireCheckId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //检查表名字 + @ApiModelProperty(value = "检查表名字") + private String fireCheckName; + //检查表类型 + @ApiModelProperty(value = "检查表类型") + private String fireCheckType; + //检查表类型名称 + @ApiModelProperty(value = "检查表类型名称") + private String fireCheckTypeName; + //负责部门 + @ApiModelProperty(value = "负责部门") + private Long departmentId; + + + //禁用1启用0 + @ApiModelProperty(value = "禁用1启用0") + private Integer state; + @ApiModelProperty(value = "检查照片上传方式（1相机照相，2相册获取）", name = "photoUploadMethod", required = true) + private Integer photoUploadMethod; + + + //描述 + @ApiModelProperty(value = "描述") + private String remarks; + + //岗位 + @ApiModelProperty(value = "岗位名称") + private String postName; + //部门名称 + @ApiModelProperty(value = "部门名称") + private String departmentName; + //用户名称 + @ApiModelProperty(value = "负责人逗号分隔") + private String userName; + //检查设备列表 + @ApiModelProperty(value = "检查设备列表") + private List fireDeviceCOList; + + //点位数 + @ApiModelProperty(value = "点位数") + private Long fireCheckItemCount; + //开始排查周期 + @ApiModelProperty(value = "开始排查周期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime checkStartTime; + //结束排查周期 + @ApiModelProperty(value = "结束排查周期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime checkEndTime; + //检查次数 + @ApiModelProperty(value = "检查次数") + private Long checkCount; + //周期检查次数 + @ApiModelProperty(value = "周期检查次数") + private Long checkCycleCount; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckListItemCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckListItemCO.java new file mode 100644 index 0000000..e69f332 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckListItemCO.java @@ -0,0 +1,77 @@ +package com.zcloud.fire.check.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-28 10:32:28 + */ +@Data +public class FireCheckListItemCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireCheckListItemId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //消防点位检查表主键id + @ApiModelProperty(value = "消防点位检查表主键id") + private String fireCheckId; + //消防区域id + @ApiModelProperty(value = "消防区域id", name = "fireRegionId", required = true) + private String fireRegionId; + //消防点位id + @ApiModelProperty(value = "消防点位id", name = "firePointId", required = true) + private String firePointId; + + //消防器材id + @ApiModelProperty(value = "消防器材id") + private String fireDeviceId; + //乐观锁 + @ApiModelProperty(value = "乐观锁") + private Integer version; + //创建人 + @ApiModelProperty(value = "创建人") + private Long createId; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //创建时间 + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + //更新人 + @ApiModelProperty(value = "更新人") + private Long updateId; + //修改人名称 + @ApiModelProperty(value = "修改人名称") + private String updateName; + //更新时间 + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + //描述 + @ApiModelProperty(value = "描述") + private String remarks; + //是否删除 + @ApiModelProperty(value = "是否删除") + private String deleteEnum; + //租户ID + @ApiModelProperty(value = "租户ID") + private Long tenantId; + //机构ID + @ApiModelProperty(value = "机构ID") + private Long orgId; + //环境 + @ApiModelProperty(value = "环境") + private String env; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckListUserCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckListUserCO.java new file mode 100644 index 0000000..eefe352 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckListUserCO.java @@ -0,0 +1,73 @@ +package com.zcloud.fire.check.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-12-11 15:32:49 + */ +@Data +public class FireCheckListUserCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireCheckListUserId; + //点检表id + @ApiModelProperty(value = "点检表id") + private String fireCheckId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //负责部门 + @ApiModelProperty(value = "负责部门") + private Long departmentId; + //负责人 + @ApiModelProperty(value = "负责人") + private Long userId; + //乐观锁 + @ApiModelProperty(value = "乐观锁") + private Integer version; + //创建人 + @ApiModelProperty(value = "创建人") + private Long createId; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //创建时间 + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + //更新人 + @ApiModelProperty(value = "更新人") + private Long updateId; + //修改人名称 + @ApiModelProperty(value = "修改人名称") + private String updateName; + //更新时间 + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + //描述 + @ApiModelProperty(value = "描述") + private String remarks; + //是否删除 + @ApiModelProperty(value = "是否删除") + private String deleteEnum; + //租户ID + @ApiModelProperty(value = "租户ID") + private Long tenantId; + //机构ID + @ApiModelProperty(value = "机构ID") + private Long orgId; + //环境 + @ApiModelProperty(value = "环境") + private String env; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckPointDeviceListCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckPointDeviceListCO.java new file mode 100644 index 0000000..0ea6862 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckPointDeviceListCO.java @@ -0,0 +1,96 @@ +package com.zcloud.fire.check.dto.clientobject; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-28 10:32:08 + */ +@Data +public class FireCheckPointDeviceListCO implements Serializable { + + @ApiModelProperty(value = "检查记录设备ID") + private String fireRecordDeviceId; + /** + * 消防区域名称 + */ + @ApiModelProperty(value = "消防区域名称") + private String fireRegionName; + + /** + * 消防区域编码 + */ + @ApiModelProperty(value = "消防区域编码") + private String fireRegionCode; + + /** + * 消防区域ID + */ + @ApiModelProperty(value = "消防区域ID") + private String fireRegionId; + + @ApiModelProperty(value = "消防点位名称") + private String firePointName; + + /** + * 消防点位编码 + */ + @ApiModelProperty(value = "消防点位编码") + private String firePointCode; + + /** + * 消防点位ID + */ + @ApiModelProperty(value = "消防点位ID") + private String firePointId; + + /** + * 消防设备ID + */ + @ApiModelProperty(value = "消防设备ID") + private String fireDeviceId; + + /** + * 消防设备编码 + */ + @ApiModelProperty(value = "消防设备编码") + private String fireDeviceCode; + /** + * 消防设备类型名称 + */ + @ApiModelProperty(value = "消防设备类型名称") + private String fireDeviceTypeName; + + @ApiModelProperty(value = "消防设备类型编码") + private String fireDeviceType; + @ApiModelProperty(value = "是否检查过0已经检查1未检查，2已打回") + private Integer checkedFlag; + //0合格1不合格2不涉及 + @ApiModelProperty(value = "0合格1不合格2不涉及") + private Integer normalFlag; + //打回原因 + @ApiModelProperty(value = "打回原因") + private String hitBackTheReason; + + @ApiModelProperty(value = "是否有隐患") + private Boolean hasHidden; + + //检查项 + @ApiModelProperty(value = "没检查的，用这个字段，对应的检查标准信息") + private List fireCheckStandardCOList; + @ApiModelProperty(value = "对于已经检查过的用这个字段，对应的检查标准信息") + private String fireCheckStandardInfo; + + //隐患信息 + @ApiModelProperty(value = "检查隐患信息") + private FireCheckRecordHiddenCO fireCheckRecordHiddenCO; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckPointListCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckPointListCO.java new file mode 100644 index 0000000..397bd5a --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckPointListCO.java @@ -0,0 +1,89 @@ +package com.zcloud.fire.check.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-28 10:32:08 + */ +@Data +public class FireCheckPointListCO implements Serializable { + /** + * 消防区域名称 + */ + @ApiModelProperty(value = "消防区域名称") + private String fireRegionName; + + /** + * 消防区域编码 + */ + @ApiModelProperty(value = "消防区域编码") + private String fireRegionCode; + + /** + * 消防区域ID + */ + @ApiModelProperty(value = "消防区域ID") + private String fireRegionId; + /** + * 消防设备ID + */ + @ApiModelProperty(value = "消防设备ID") + private String fireDeviceId; + + + + @ApiModelProperty(value = "消防点位名称") + private String firePointName; + + /** + * 消防点位编码 + */ + @ApiModelProperty(value = "消防点位编码") + private String firePointCode; + + /** + * 消防点位ID + */ + @ApiModelProperty(value = "消防点位ID") + private String firePointId; + + /** + * 消防设备编码 + */ + @ApiModelProperty(value = "消防设备编码，多个") + private String fireDeviceCode; + /** + * 消防设备类型名称 + */ + @ApiModelProperty(value = "消防设备类型名称,多个") + private String fireDeviceTypeName; + + @ApiModelProperty(value = "消防设备类型编码") + private String fireDeviceType; + + @ApiModelProperty(value = "排查项,设备信息") + private List fireCheckPointDeviceListCOList; + @ApiModelProperty(value = "已经检查的排查项,设备信息") + private List fireCheckRecordDeviceStatusList; + + + @ApiModelProperty(value = "消防检查ID") + private String fireRecordId; + @ApiModelProperty(value = "消防检查点位ID") + private String fireRecordPointId; + + @ApiModelProperty(value = "是否检查过0已经检查1未检查，2已打回") + private Integer checkedFlag; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordCO.java new file mode 100644 index 0000000..b580397 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordCO.java @@ -0,0 +1,95 @@ +package com.zcloud.fire.check.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-12-12 13:44:24 + */ +@Data +public class FireCheckRecordCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireRecordId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //检查表id + @ApiModelProperty(value = "检查表id") + private String fireCheckId; + //检查表名字 + @ApiModelProperty(value = "检查表名字") + private String fireCheckName; + //检查表类型 + @ApiModelProperty(value = "检查表类型") + private String fireCheckType; + //检查表类型名称 + @ApiModelProperty(value = "检查表类型名称") + private String fireCheckTypeName; + //检查时间 + @ApiModelProperty(value = "检查时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime checkTime; + //是否完成,0否1是 + @ApiModelProperty(value = "是否完成,0否1是") + private Integer finishedFlag; + //检查周期开始时间 + @ApiModelProperty(value = "检查周期开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime periodStart; + //检查周期结束时间 + @ApiModelProperty(value = "检查周期结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime periodEnd; + //签字url + @ApiModelProperty(value = "签字url") + private String signUrl; + + //创建人 + @ApiModelProperty(value = "创建人") + private Long createId; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //创建时间 + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + //更新人 + @ApiModelProperty(value = "更新人") + private Long updateId; + //修改人名称 + @ApiModelProperty(value = "修改人名称") + private String updateName; + //更新时间 + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + //描述 + @ApiModelProperty(value = "描述") + private String remarks; + @ApiModelProperty(value = "消防点检检查用户名称逗号分隔") + private String userNameList; + @ApiModelProperty(value = "部门") + private String departmentName; + //消防点检记录用户列表 + @ApiModelProperty(value = "消防点检检查用户列表") + private List fireCheckRecordUserList; + + //消防点检记录隐患列表 + @ApiModelProperty(value = "消防点检记录隐患列表") + private List fireCheckRecordHiddenList; + //检查内容 + private List fireCheckRecordDeviceList; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordDeviceCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordDeviceCO.java new file mode 100644 index 0000000..392e0e4 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordDeviceCO.java @@ -0,0 +1,109 @@ +package com.zcloud.fire.check.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-12-12 13:44:34 + */ +@Data +public class FireCheckRecordDeviceCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireRecordDeviceId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //检查表id + @ApiModelProperty(value = "检查表id") + private String fireCheckId; + //检查记录表id + @ApiModelProperty(value = "检查记录表id") + private String fireRecordId; + @ApiModelProperty(value = "检查记录点位表id") + private String fireRecordPointId; + //是否检查过0已经检查1未检查，2已打回 + @ApiModelProperty(value = "是否检查过0已经检查1未检查，2已打回") + private Integer checkedFlag; + //0合格1不合格2不涉及 + @ApiModelProperty(value = "0合格1不合格2不涉及") + private Integer normalFlag; + //打回原因 + @ApiModelProperty(value = "打回原因") + private String hitBackTheReason; + //消防区域主键id + @ApiModelProperty(value = "消防区域主键id") + private String fireRegionId; + //消防区域名称 + @ApiModelProperty(value = "消防区域名称") + private String fireRegionName; + //消防区域编码 + @ApiModelProperty(value = "消防区域编码") + private String fireRegionCode; + //消防点位id + @ApiModelProperty(value = "消防点位id") + private String firePointId; + //消防点位名称 + @ApiModelProperty(value = "消防点位名称") + private String firePointName; + //消防点位编码 + @ApiModelProperty(value = "消防点位编码") + private String firePointCode; + //消防器材id + @ApiModelProperty(value = "消防器材id") + private String fireDeviceId; + //消防器材类型 + @ApiModelProperty(value = "消防器材类型") + private String fireDeviceType; + //消防器材类型名称 + @ApiModelProperty(value = "消防器材类型名称") + private String fireDeviceTypeName; + //器材编号 + @ApiModelProperty(value = "器材编号") + private String fireDeviceCode; + //对应的检查标准信息 + @ApiModelProperty(value = "对应的检查标准信息") + private String fireCheckStandardInfo; + //经度 + @ApiModelProperty(value = "经度") + private String longitude; + //纬度 + @ApiModelProperty(value = "纬度") + private String latitude; + + //创建人 + @ApiModelProperty(value = "创建人") + private Long createId; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //创建时间 + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + //更新人 + @ApiModelProperty(value = "更新人") + private Long updateId; + //修改人名称 + @ApiModelProperty(value = "修改人名称") + private String updateName; + //更新时间 + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + //描述 + @ApiModelProperty(value = "描述") + private String remarks; + + + private FireCheckRecordHiddenCO fireCheckRecordHiddenCO; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordHiddenCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordHiddenCO.java new file mode 100644 index 0000000..9403d43 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordHiddenCO.java @@ -0,0 +1,88 @@ +package com.zcloud.fire.check.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-12-12 13:44:43 + */ +@Data +public class FireCheckRecordHiddenCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireRecordHidedenId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //检查表id + @ApiModelProperty(value = "检查表id") + private String fireCheckId; + //检查详情id + @ApiModelProperty(value = "检查详情id") + private String fireCheckListItemId; + //检查记录表id + @ApiModelProperty(value = "检查记录表id") + private String fireRecordId; + //检查记录点位表id + @ApiModelProperty(value = "检查记录点位表id") + private String fireRecordPointId; + //检查记录设备表id + @ApiModelProperty(value = "检查记录设备表id") + private String fireRecordDeviceId; + //隐患id + @ApiModelProperty(value = "隐患id") + private String hiddenId; + //隐患类型,检查项隐患1,还是其他隐患2 + @ApiModelProperty(value = "隐患类型,检查项隐患1,还是其他隐患2") + private Integer hiddenCheckType; + //隐患描述 + @ApiModelProperty(value = "隐患描述") + private String hiddenDesc; + //乐观锁 + @ApiModelProperty(value = "乐观锁") + private Integer version; + //创建人 + @ApiModelProperty(value = "创建人") + private Long createId; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //创建时间 + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + //更新人 + @ApiModelProperty(value = "更新人") + private Long updateId; + //修改人名称 + @ApiModelProperty(value = "修改人名称") + private String updateName; + //更新时间 + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + //描述 + @ApiModelProperty(value = "描述") + private String remarks; + //是否删除 + @ApiModelProperty(value = "是否删除") + private String deleteEnum; + //租户ID + @ApiModelProperty(value = "租户ID") + private Long tenantId; + //机构ID + @ApiModelProperty(value = "机构ID") + private Long orgId; + //环境 + @ApiModelProperty(value = "环境") + private String env; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordPointCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordPointCO.java new file mode 100644 index 0000000..b01b950 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordPointCO.java @@ -0,0 +1,97 @@ +package com.zcloud.fire.check.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-12-12 13:44:51 + */ +@Data +public class FireCheckRecordPointCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireRecordPointId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //检查表id + @ApiModelProperty(value = "检查表id") + private String fireCheckId; + //检查记录表id + @ApiModelProperty(value = "检查记录表id") + private String fireRecordId; + //是否检查过0已经检查1未检查，2已打回 + @ApiModelProperty(value = "是否检查过0已经检查1未检查，2已打回") + private Integer checkedFlag; + //消防区域主键id + @ApiModelProperty(value = "消防区域主键id") + private String fireRegionId; + //消防区域名称 + @ApiModelProperty(value = "消防区域名称") + private String fireRegionName; + //消防区域编码 + @ApiModelProperty(value = "消防区域编码") + private String fireRegionCode; + //消防点位id + @ApiModelProperty(value = "消防点位id") + private String firePointId; + //消防点位名称 + @ApiModelProperty(value = "消防点位名称") + private String firePointName; + //消防点位编码 + @ApiModelProperty(value = "消防点位编码") + private String firePointCode; + //经度 + @ApiModelProperty(value = "经度") + private String longitude; + //纬度 + @ApiModelProperty(value = "纬度") + private String latitude; + //乐观锁 + @ApiModelProperty(value = "乐观锁") + private Integer version; + //创建人 + @ApiModelProperty(value = "创建人") + private Long createId; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //创建时间 + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + //更新人 + @ApiModelProperty(value = "更新人") + private Long updateId; + //修改人名称 + @ApiModelProperty(value = "修改人名称") + private String updateName; + //更新时间 + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + //描述 + @ApiModelProperty(value = "描述") + private String remarks; + //是否删除 + @ApiModelProperty(value = "是否删除") + private String deleteEnum; + //租户ID + @ApiModelProperty(value = "租户ID") + private Long tenantId; + //机构ID + @ApiModelProperty(value = "机构ID") + private Long orgId; + //环境 + @ApiModelProperty(value = "环境") + private String env; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordUserCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordUserCO.java new file mode 100644 index 0000000..338fbef --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckRecordUserCO.java @@ -0,0 +1,82 @@ +package com.zcloud.fire.check.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-12-12 13:44:59 + */ +@Data +public class FireCheckRecordUserCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireRecordUserId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //检查表id + @ApiModelProperty(value = "检查表id") + private String fireCheckId; + //检查记录表id + @ApiModelProperty(value = "检查记录表id") + private String fireRecordId; + //部门id + @ApiModelProperty(value = "部门id") + private Long departmentId; + //部门名称 + @ApiModelProperty(value = "部门名称") + private String departmentName; + //人员id + @ApiModelProperty(value = "人员id") + private Long userId; + //人员名称 + @ApiModelProperty(value = "人员名称") + private String userName; + //乐观锁 + @ApiModelProperty(value = "乐观锁") + private Integer version; + //创建人 + @ApiModelProperty(value = "创建人") + private Long createId; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //创建时间 + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + //更新人 + @ApiModelProperty(value = "更新人") + private Long updateId; + //修改人名称 + @ApiModelProperty(value = "修改人名称") + private String updateName; + //更新时间 + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + //描述 + @ApiModelProperty(value = "描述") + private String remarks; + //是否删除 + @ApiModelProperty(value = "是否删除") + private String deleteEnum; + //租户ID + @ApiModelProperty(value = "租户ID") + private Long tenantId; + //机构ID + @ApiModelProperty(value = "机构ID") + private Long orgId; + //环境 + @ApiModelProperty(value = "环境") + private String env; +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckStandardCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckStandardCO.java index fd94529..d19b06e 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckStandardCO.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckStandardCO.java @@ -4,6 +4,7 @@ import com.alibaba.cola.dto.ClientObject; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.time.LocalDateTime; @@ -14,7 +15,7 @@ import java.time.LocalDateTime; * @Date 2025-11-26 10:12:14 */ @Data -public class FireCheckStandardCO extends ClientObject { +public class FireCheckStandardCO implements Serializable { //主键 @ApiModelProperty(value = "主键") private Long id; @@ -39,41 +40,6 @@ public class FireCheckStandardCO extends ClientObject { //检查项 @ApiModelProperty(value = "检查项") private String fireCheckStandardItem; - //乐观锁 - @ApiModelProperty(value = "乐观锁") - private Integer version; - //创建人 - @ApiModelProperty(value = "创建人") - private Long createId; - //创建人姓名 - @ApiModelProperty(value = "创建人姓名") - private String createName; - //创建时间 - @ApiModelProperty(value = "创建时间") - private LocalDateTime createTime; - //更新人 - @ApiModelProperty(value = "更新人") - private Long updateId; - //修改人名称 - @ApiModelProperty(value = "修改人名称") - private String updateName; - //更新时间 - @ApiModelProperty(value = "更新时间") - private LocalDateTime updateTime; - //描述 - @ApiModelProperty(value = "描述") - private String remarks; - //是否删除 - @ApiModelProperty(value = "是否删除") - private String deleteEnum; - //租户ID - @ApiModelProperty(value = "租户ID") - private Long tenantId; - //机构ID - @ApiModelProperty(value = "机构ID") - private Long orgId; - //环境 - @ApiModelProperty(value = "环境") - private String env; + } diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireDeviceCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireDeviceCO.java index 1f79f1b..8eb1516 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireDeviceCO.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireDeviceCO.java @@ -1,11 +1,13 @@ package com.zcloud.fire.check.dto.clientobject; import com.alibaba.cola.dto.ClientObject; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.time.LocalDateTime; +import java.util.List; /** @@ -55,17 +57,15 @@ public class FireDeviceCO extends ClientObject { @ApiModelProperty(value = "存放地点") private String storageLocation; - //消防点位名称 - @ApiModelProperty(value = "消防点位名称") - private String firePointName; - - // //消防区域名称 @ApiModelProperty(value = "消防区域名称") private String fireRegionName; //消防区域编码 @ApiModelProperty(value = "消防区域编码") private String fireRegionCode; + //消防点位名称 + @ApiModelProperty(value = "消防点位名称") + private String firePointName; //消防点位编码 @ApiModelProperty(value = "消防点位编码") private String firePointCode; @@ -75,13 +75,16 @@ public class FireDeviceCO extends ClientObject { //负责人 @ApiModelProperty(value = "负责人") private String userName; - + @ApiModelProperty(value = "负责人岗位") + @TableField(exist = false) + private String userPostName; //创建人姓名 @ApiModelProperty(value = "创建人姓名") private String createName; //创建时间 @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; //修改人名称 @@ -89,10 +92,14 @@ public class FireDeviceCO extends ClientObject { private String updateName; //更新时间 @ApiModelProperty(value = "更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; //描述 @ApiModelProperty(value = "描述") private String remarks; + //消防器材检查标准列表 + @ApiModelProperty(value = "消防器材检查标准列表") + private List fireCheckStandardList; } diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FirePointCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FirePointCO.java index 2244cd6..9c454d0 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FirePointCO.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FirePointCO.java @@ -46,7 +46,8 @@ public class FirePointCO extends ClientObject { //纬度 @ApiModelProperty(value = "纬度") private String latitude; - + @ApiModelProperty(value = "是否开启nfc,0否，1是", name = "nfcFlag") + private Integer nfcFlag; //部门名称 @ApiModelProperty(value = "部门名称") private String departmentName; diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireRegionCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireRegionCO.java index 69322e0..8b79bf5 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireRegionCO.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireRegionCO.java @@ -38,9 +38,6 @@ public class FireRegionCO extends ClientObject { @ApiModelProperty(value = "0启用,1禁用") private Integer state; - //检查照片上传方式（1相机照相，2相册获取） - @ApiModelProperty(value = "检查照片上传方式（1相机照相，2相册获取）") - private Integer photoUploadMethod; //部门名称 @ApiModelProperty(value = "部门名称") private String departmentName; diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/PointDistributionCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/PointDistributionCO.java new file mode 100644 index 0000000..c9a9596 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/PointDistributionCO.java @@ -0,0 +1,37 @@ +package com.zcloud.fire.check.dto.clientobject; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-28 10:32:08 + */ +@Data +public class PointDistributionCO implements Serializable { + + @ApiModelProperty(value = "企业名称") + private String corpinfoName; + @ApiModelProperty(value = "消防区域名称") + private String fireRegionName; + @ApiModelProperty(value = "部门名称") + private String departmentName; + @ApiModelProperty(value = "消防点位名称") + private String firePointName; + @ApiModelProperty(value = "消防器材类型") + private String fireDeviceType; + @ApiModelProperty(value = "消防器材类型名称") + private String fireDeviceTypeName; + @ApiModelProperty(value = "消防器材编码") + private String fireDeviceCode; + @ApiModelProperty(value = "检查标准列表") + private List fireCheckTypeItemList; + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/RiskDistributionCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/RiskDistributionCO.java new file mode 100644 index 0000000..e533264 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/RiskDistributionCO.java @@ -0,0 +1,39 @@ +package com.zcloud.fire.check.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-28 10:32:08 + */ +@Data +public class RiskDistributionCO implements Serializable { + + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //企业名称 + @ApiModelProperty(value = "企业名称") + private String corpinfoName; + //消防区域数量 + @ApiModelProperty(value = "消防区域数量") + private Long fireRegionCount; + //点位数 + @ApiModelProperty(value = "点位数") + private Long firePointCount; + //消防器材数量 + @ApiModelProperty(value = "消防器材数量") + private Long fireDeviceCount; + + +} + diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/RiskDistributionStasticCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/RiskDistributionStasticCO.java new file mode 100644 index 0000000..ff720a8 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/RiskDistributionStasticCO.java @@ -0,0 +1,31 @@ +package com.zcloud.fire.check.dto.clientobject; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-11-28 10:32:08 + */ +@Data +public class RiskDistributionStasticCO implements Serializable { + + + //消防区域数量 + @ApiModelProperty(value = "消防区域数量") + private Long fireRegionCount; + //点位数 + @ApiModelProperty(value = "点位数") + private Long firePointCount; + //消防器材数量 + @ApiModelProperty(value = "消防器材数量") + private Long fireDeviceCount; + + +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/CheckFlagEnum.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/CheckFlagEnum.java new file mode 100644 index 0000000..c956951 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/CheckFlagEnum.java @@ -0,0 +1,31 @@ +package com.zcloud.fire.check.domain.enums; + +import lombok.Getter; + +/** + * 是否检查过 0已经检查 1未检查，2已打回 + */ +@Getter +public enum CheckFlagEnum { + /** + * 已经检查 + */ + CHECK_FLAG_CHECKED (0,"已经检查"), + /** + * 未检查 + */ + CHECK_FLAG_NOT_CHECKED (1,"未检查"), + /** + * 已打回 + */ + CHECK_FLAG_BACK (2,"已打回"), + ; + + private final Integer code; + private final String name; + + CheckFlagEnum(Integer code, String name) { + this.code = code; + this.name = name; + } +} diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/CheckRecordNormalFlagEnum.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/CheckRecordNormalFlagEnum.java new file mode 100644 index 0000000..d05b39a --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/CheckRecordNormalFlagEnum.java @@ -0,0 +1,30 @@ +package com.zcloud.fire.check.domain.enums; + +import lombok.Getter; + +/** + * 排查结果,正常0，不正常1，不涉及2 + */ +@Getter +public enum CheckRecordNormalFlagEnum { + /** + * 正常 + */ + NORMAL_FLAG_NORMAL (0,"正常"), + /** + * 不正常 + */ + NORMAL_FLAG_NOT_NORMAL (1,"不正常"), + /** + * 不涉及 + */ + NORMAL_FLAG_NOT_INVOLVED (2,"不涉及"), + ; + private final Integer code; + private final String name; + + CheckRecordNormalFlagEnum(Integer code, String name) { + this.code = code; + this.name = name; + } +} diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/CorpTypeEnum.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/CorpTypeEnum.java new file mode 100644 index 0000000..507d481 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/CorpTypeEnum.java @@ -0,0 +1,66 @@ +package com.zcloud.fire.check.domain.enums; + +import lombok.Getter; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * corp_info 中的type字段枚举(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位) + * 与传入enterpriseType中的关联关系 + * .企业类型1：监管 2：企业 3：相关方 + */ +@Getter +public enum CorpTypeEnum { + OrdinaryEnterprises(0,"普通企业",UserTypeEnum.QY.getCode()), + groupUnits(1, "集团单位",UserTypeEnum.QY.getCode()), + share(2,"股份单位",UserTypeEnum.JG.getCode()), + serviceProvider(3, "相关方企业",UserTypeEnum.XGF.getCode()), + cargoOwner(4, "货主单位",UserTypeEnum.XGF.getCode()), + portUnit(5, "驻港单位",UserTypeEnum.XGF.getCode()), + materialCenter(6, "物资中心",UserTypeEnum.QY.getCode()); + + private static final Map> ENTERPRISE_TYPE_CODE_MAP = new HashMap<>(); + + private final Integer code; + private final String name; + //传入的企业类型企业类型 1：监管 2：企业 3：相关方 + private final Integer userType; + + CorpTypeEnum(Integer code, String name, Integer userType) { + this.code = code; + this.name = name; + this.userType = userType; + } + static { + Arrays.stream(CorpTypeEnum.values()) + .collect(Collectors.groupingBy(CorpTypeEnum::getUserType)) + .forEach((userType, corpTypes) -> + ENTERPRISE_TYPE_CODE_MAP.put( + userType, + corpTypes.stream().map(CorpTypeEnum::getCode).collect(Collectors.toList()) + ) + ); + } + + public static List getCodesByEnterpriseType(Integer enterpriseType) { + return ENTERPRISE_TYPE_CODE_MAP.getOrDefault(enterpriseType, Collections.emptyList()); + } + public static Integer getUserTypeByCode(Integer code) { + for (CorpTypeEnum corpType : values()) { + if (corpType.code.equals(code)) { + return corpType.userType; + } + } + return null; + } + + public static String getNameByCode(Integer code) { + for (CorpTypeEnum corpType : values()) { + if (corpType.code.equals(code)) { + return corpType.name; + } + } + return null; + } +} diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/FireCheckListStateEnum.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/FireCheckListStateEnum.java new file mode 100644 index 0000000..c6ded8b --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/FireCheckListStateEnum.java @@ -0,0 +1,30 @@ +package com.zcloud.fire.check.domain.enums; + +import lombok.Getter; + +/** + * 禁用1启用0, 已删除2 + */ +@Getter +public enum FireCheckListStateEnum { + ENABLE(0,"启用"), + DISABLE(1,"禁用"), + DELETED(2,"已删除"), + ; + private final Integer code; + private final String name; + + FireCheckListStateEnum(Integer code, String name) { + this.code = code; + this.name = name; + } + //判断code是否存在 + public static boolean contains(Integer code) { + for (FireCheckListStateEnum fireRegionStateEnum : FireCheckListStateEnum.values()) { + if (fireRegionStateEnum.getCode().equals(code)) { + return true; + } + } + return false; + } +} diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/FireCheckRecordPointCheckedFlagEnum.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/FireCheckRecordPointCheckedFlagEnum.java new file mode 100644 index 0000000..a59524a --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/FireCheckRecordPointCheckedFlagEnum.java @@ -0,0 +1,30 @@ +package com.zcloud.fire.check.domain.enums; + +import lombok.Getter; + +/** + * 是否检查过0已经检查1未检查，2已打回 + */ +@Getter +public enum FireCheckRecordPointCheckedFlagEnum { + CHECKED(0,"已检查"), + UNCHECKED(1,"未检查"), + REJECTED(2,"已打回"), + ; + private final Integer code; + private final String name; + + FireCheckRecordPointCheckedFlagEnum(Integer code, String name) { + this.code = code; + this.name = name; + } + //判断code是否存在 + public static boolean contains(Integer code) { + for (FireCheckRecordPointCheckedFlagEnum fireRegionStateEnum : FireCheckRecordPointCheckedFlagEnum.values()) { + if (fireRegionStateEnum.getCode().equals(code)) { + return true; + } + } + return false; + } +} diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/HiddenCheckTypeEnum.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/HiddenCheckTypeEnum.java new file mode 100644 index 0000000..3a0e12e --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/HiddenCheckTypeEnum.java @@ -0,0 +1,20 @@ +package com.zcloud.fire.check.domain.enums; + +import lombok.Getter; + +/** + * 隐患类型,检查项隐患1,还是其他隐患2', + */ +@Getter +public enum HiddenCheckTypeEnum { + CHECK_ITEM_HIDDEN (1,"检查项隐患"), + OTHER_HIDDEN (2,"其他隐患"), + ; + private final Integer code; + private final String name; + + HiddenCheckTypeEnum(Integer code, String name) { + this.code = code; + this.name = name; + } +} diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/ListManagerCheckPeriodEnum.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/ListManagerCheckPeriodEnum.java new file mode 100644 index 0000000..b879b70 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/ListManagerCheckPeriodEnum.java @@ -0,0 +1,53 @@ +package com.zcloud.fire.check.domain.enums; + +import lombok.Getter; + +/** + * 记录类型（1-正常检查记录 2-超期未检查记录） + */ +@Getter +public enum ListManagerCheckPeriodEnum { + /** 每日 */ + DAILY("每日", "checkPeriod0001"), + + /** 每周 */ + WEEKLY("每周", "checkPeriod0002"), + + /** 每旬 */ + TEN_DAYS("每旬", "checkPeriod0003"), + + /** 每月 */ + MONTHLY("每月", "checkPeriod0004"), + + /** 每季 */ + QUARTERLY("每季", "checkPeriod0005"), + + /** 每年 */ + YEARLY("每年", "checkPeriod0006"), + + /** 半年 */ + HALF_YEAR("半年", "checkPeriod0007"), + + /** 半月 */ + HALF_MONTH("半月", "checkPeriod0008"), + + /** 每周完成N次 */ + WEEKLY_N_TIMES("每周完成N次", "checkPeriod0009"); + ; + private final String value; + private final String code; + + ListManagerCheckPeriodEnum(String value, String code) { + this.value = value; + this.code = code; + } + public static ListManagerCheckPeriodEnum getByCode(String code) { + for (ListManagerCheckPeriodEnum period : values()) { + if (period.getCode().equals(code)) { + return period; + } + } + return null; + } + +} diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/UserTypeEnum.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/UserTypeEnum.java new file mode 100644 index 0000000..579be4a --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/UserTypeEnum.java @@ -0,0 +1,30 @@ +package com.zcloud.fire.check.domain.enums; + +import lombok.Getter; + +@Getter +public enum UserTypeEnum { + JG(1,"监管"), + QY(2,"企业"), + XGF(3,"相关方") + ; + private final Integer code; + private final String name; + + UserTypeEnum(Integer code, String name) { + this.code = code; + this.name = name; + } + + public static Integer getUserType(Integer corpType){ + if (corpType.equals(CorpTypeEnum.OrdinaryEnterprises.getCode()) || + corpType.equals(CorpTypeEnum.groupUnits.getCode())){ + return UserTypeEnum.QY.getCode(); + }else if (corpType.equals(CorpTypeEnum.share.getCode())){ + return UserTypeEnum.JG.getCode(); + }else { + return UserTypeEnum.XGF.getCode(); + } + } + +} diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckListGateway.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckListGateway.java new file mode 100644 index 0000000..7c38634 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckListGateway.java @@ -0,0 +1,30 @@ +package com.zcloud.fire.check.domain.gateway; + +import com.zcloud.fire.check.domain.model.FireCheckListE; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-11-28 10:32:09 + */ +public interface FireCheckListGateway { + + /** + * 新增 + */ + Boolean add(FireCheckListE fireCheckListE); + + /** + * 修改 + */ + Boolean update(FireCheckListE fireCheckListE); + + /** + * 删除 + */ + Boolean deletedFireCheckListById(Long id); + + Boolean deletedFireCheckListByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckListItemGateway.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckListItemGateway.java new file mode 100644 index 0000000..a81474b --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckListItemGateway.java @@ -0,0 +1,30 @@ +package com.zcloud.fire.check.domain.gateway; + +import com.zcloud.fire.check.domain.model.FireCheckListItemE; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-11-28 10:32:28 + */ +public interface FireCheckListItemGateway { + + /** + * 新增 + */ + Boolean add(FireCheckListItemE fireCheckListItemE); + + /** + * 修改 + */ + Boolean update(FireCheckListItemE fireCheckListItemE); + + /** + * 删除 + */ + Boolean deletedFireCheckListItemById(Long id); + + Boolean deletedFireCheckListItemByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckListUserGateway.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckListUserGateway.java new file mode 100644 index 0000000..39d8c21 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckListUserGateway.java @@ -0,0 +1,34 @@ +package com.zcloud.fire.check.domain.gateway; + +import com.zcloud.fire.check.domain.model.FireCheckListUserE; + +import java.util.List; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-12-11 15:32:49 + */ +public interface FireCheckListUserGateway { + + /** + * 新增 + */ + Boolean add(FireCheckListUserE fireCheckListUserE); + + /** + * 修改 + */ + Boolean update(FireCheckListUserE fireCheckListUserE); + + /** + * 删除 + */ + Boolean deletedFireCheckListUserById(Long id); + + Boolean deletedFireCheckListUserByIds(Long[] id); + + void addBath(List fireCheckListUserEList); +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckRecordDeviceGateway.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckRecordDeviceGateway.java new file mode 100644 index 0000000..1641fcd --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckRecordDeviceGateway.java @@ -0,0 +1,31 @@ +package com.zcloud.fire.check.domain.gateway; + +import com.zcloud.fire.check.domain.model.FireCheckRecordDeviceE; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-12-12 11:10:03 + */ +public interface FireCheckRecordDeviceGateway { + + /** + * 新增 + */ + Boolean add(FireCheckRecordDeviceE fireCheckRecordDeviceE); + + /** + * 修改 + */ + Boolean update(FireCheckRecordDeviceE fireCheckRecordDeviceE); + + /** + * 删除 + */ + Boolean deletedFireCheckRecordDeviceById(Long id); + + Boolean deletedFireCheckRecordDeviceByIds(Long[] id); + +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckRecordGateway.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckRecordGateway.java new file mode 100644 index 0000000..9b1e40f --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckRecordGateway.java @@ -0,0 +1,34 @@ +package com.zcloud.fire.check.domain.gateway; + +import com.zcloud.fire.check.domain.model.FireCheckRecordE; + +import javax.validation.constraints.NotEmpty; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-12-12 11:10:58 + */ +public interface FireCheckRecordGateway { + + /** + * 新增 + */ + Boolean add(FireCheckRecordE fireCheckRecordE); + + /** + * 修改 + */ + Boolean update(FireCheckRecordE fireCheckRecordE); + + /** + * 删除 + */ + Boolean deletedFireCheckRecordById(Long id); + + Boolean deletedFireCheckRecordByIds(Long[] id); + + FireCheckRecordE initCheckRecord(@NotEmpty(message = "检查表id不能为空") String fireCheckId, String fireRecordId); +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckRecordHiddenGateway.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckRecordHiddenGateway.java new file mode 100644 index 0000000..f8b4877 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckRecordHiddenGateway.java @@ -0,0 +1,38 @@ +package com.zcloud.fire.check.domain.gateway; + +import com.zcloud.fire.check.domain.model.FireCheckRecordDeviceE; +import com.zcloud.fire.check.domain.model.FireCheckRecordHiddenE; +import com.zcloud.gbscommon.zcloudhidden.request.HiddenAddCmd; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-12-12 11:11:15 + */ +public interface FireCheckRecordHiddenGateway { + + /** + * 新增 + */ + Boolean add(FireCheckRecordHiddenE fireCheckRecordHiddenE); + + /** + * 修改 + */ + Boolean update(FireCheckRecordHiddenE fireCheckRecordHiddenE); + + /** + * 删除 + */ + Boolean deletedFireCheckRecordHiddenById(Long id); + + Boolean deletedFireCheckRecordHiddenByIds(Long[] id); + + void addHidden(FireCheckRecordDeviceE fireCheckRecordDeviceE, HiddenAddCmd hiddenAddCmd); + + void updateHidden(FireCheckRecordHiddenE fireCheckRecordHiddenE, HiddenAddCmd hiddenAddCmd); + + void addOtherHidden(FireCheckRecordHiddenE fireCheckRecordHiddenE, HiddenAddCmd hiddenAddCmd); +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckRecordPointGateway.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckRecordPointGateway.java new file mode 100644 index 0000000..1c85ea6 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckRecordPointGateway.java @@ -0,0 +1,30 @@ +package com.zcloud.fire.check.domain.gateway; + +import com.zcloud.fire.check.domain.model.FireCheckRecordPointE; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-12-12 11:10:20 + */ +public interface FireCheckRecordPointGateway { + + /** + * 新增 + */ + Boolean add(FireCheckRecordPointE fireCheckRecordPointE); + + /** + * 修改 + */ + Boolean update(FireCheckRecordPointE fireCheckRecordPointE); + + /** + * 删除 + */ + Boolean deletedFireCheckRecordPointById(Long id); + + Boolean deletedFireCheckRecordPointByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckRecordUserGateway.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckRecordUserGateway.java new file mode 100644 index 0000000..f85195e --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/gateway/FireCheckRecordUserGateway.java @@ -0,0 +1,34 @@ +package com.zcloud.fire.check.domain.gateway; + +import com.zcloud.fire.check.domain.model.FireCheckRecordUserE; + +import javax.validation.constraints.NotEmpty; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-12-12 11:12:04 + */ +public interface FireCheckRecordUserGateway { + + /** + * 新增 + */ + Boolean add(FireCheckRecordUserE fireCheckRecordUserE); + + /** + * 修改 + */ + Boolean update(FireCheckRecordUserE fireCheckRecordUserE); + + /** + * 删除 + */ + Boolean deletedFireCheckRecordUserById(Long id); + + Boolean deletedFireCheckRecordUserByIds(Long[] id); + + void deletedByCheckRecordId(@NotEmpty(message = "检查记录信息不能为空") String fireRecordId); +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/DateTimeE.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/DateTimeE.java new file mode 100644 index 0000000..a197951 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/DateTimeE.java @@ -0,0 +1,44 @@ +package com.zcloud.fire.check.domain.model; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DateTimeE { + //当前日期 + private LocalDate toDay; + //每日开始时间和结束时间 + + private LocalDateTime dayStartTime; + private LocalDateTime dayEndTime; + ///每周 + /// 每周开始时间和结束时间 + private LocalDateTime weeklyStartTime; + private LocalDateTime weeklyEndTime; + /// 每旬开始时间和结束时间 + private LocalDateTime tenDaysStartTime; + private LocalDateTime tenDaysEndTime; + //monthly开始时间和结束时间 + private LocalDateTime monthlyStartTime; + private LocalDateTime monthlyEndTime; + /// 每季开始时间和结束时间 + private LocalDateTime quarterlyStartTime; + private LocalDateTime quarterlyEndTime; + /// 每年开始时间和结束时间 + private LocalDateTime yearlyStartTime; + private LocalDateTime yearlyEndTime; + /// 半年开始时间和结束时间 + private LocalDateTime halfYearStartTime; + private LocalDateTime halfYearEndTime; + /// 半月开始时间和结束时间 + private LocalDateTime halfMonthStartTime; + private LocalDateTime halfMonthEndTime; + + +} diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckListE.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckListE.java new file mode 100644 index 0000000..fbec89b --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckListE.java @@ -0,0 +1,228 @@ +package com.zcloud.fire.check.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import com.zcloud.fire.check.domain.enums.ListManagerCheckPeriodEnum; +import lombok.Data; + +import java.time.DayOfWeek; +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-11-28 10:32:08 + */ +@Data +public class FireCheckListE extends BaseE { + //主键 + private Long id; + //业务主键id + private String fireCheckId; + //企业id + private Long corpinfoId; + //检查表名字 + private String fireCheckName; + //检查表类型 + private String fireCheckType; + //检查表类型名称 + private String fireCheckTypeName; +// //负责部门 +// private Long departmentId; +// //负责人 +// private Long userId; + //禁用1启用0 + private Integer state; + //检查照片上传方式（1相机照相，2相册获取） + private Integer photoUploadMethod; + //乐观锁 + private Integer version; + //创建人 + private Long createId; + //创建人姓名 + private String createName; + //创建时间 + private LocalDateTime createTime; + //更新人 + private Long updateId; + //修改人名称 + private String updateName; + //更新时间 + private LocalDateTime updateTime; + //描述 + private String remarks; + //是否删除 + private String deleteEnum; + //租户ID + private Long tenantId; + //机构ID + private Long orgId; + //环境 + private String env; + //周期开始时间 + private LocalDateTime periodStart; + //周期结束时间 + private LocalDateTime periodEnd; + + //获取当前日期的所有区间日期 + public DateTimeE getCheckRecordInterval(LocalDateTime today) { + DateTimeE dateTimeE = new DateTimeE(); + if(today == null){ + today = LocalDateTime.now(); + } + LocalDate todayDate = today.toLocalDate(); + dateTimeE.setToDay(todayDate); + //每日 + dateTimeE.setDayStartTime(todayDate.atStartOfDay()); + dateTimeE.setDayEndTime(todayDate.atTime(23, 59, 59)); + //每周 + LocalDate monday = todayDate.with(java.time.temporal.TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)); + LocalDate sunday = todayDate.with(java.time.temporal.TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY)); + dateTimeE.setWeeklyStartTime(monday.atStartOfDay()); + dateTimeE.setWeeklyEndTime(sunday.atTime(23, 59, 59)); + //每旬 + // 每旬：每月1-10日、11-20日、21-月末为一个周期 + int dayOfMonth = todayDate.getDayOfMonth(); + if (dayOfMonth <= 10) { + LocalDateTime tenDayStart = todayDate.withDayOfMonth(1).atStartOfDay(); + LocalDateTime tenDayEnd = todayDate.withDayOfMonth(10).atTime(23, 59, 59); + dateTimeE.setTenDaysStartTime(tenDayStart); + dateTimeE.setTenDaysEndTime(tenDayEnd); + } else if (dayOfMonth <= 20) { + LocalDateTime tenDayStart = todayDate.withDayOfMonth(11).atStartOfDay(); + LocalDateTime tenDayEnd = todayDate.withDayOfMonth(20).atTime(23, 59, 59); + dateTimeE.setTenDaysStartTime(tenDayStart); + dateTimeE.setTenDaysEndTime(tenDayEnd); + } else { + LocalDateTime tenDayStart = todayDate.withDayOfMonth(21).atStartOfDay(); + LocalDateTime tenDayEnd = todayDate.withDayOfMonth(todayDate.lengthOfMonth()).atTime(23, 59, 59); + dateTimeE.setTenDaysStartTime(tenDayStart); + dateTimeE.setTenDaysEndTime(tenDayEnd); + } + // 每月：月初到月末 + LocalDateTime monthStart = todayDate.withDayOfMonth(1).atStartOfDay(); + LocalDateTime monthEnd = todayDate.withDayOfMonth(todayDate.lengthOfMonth()).atTime(23, 59, 59); + dateTimeE.setMonthlyStartTime(monthStart); + dateTimeE.setMonthlyEndTime(monthEnd); + + // 每季：每季度初到季度末 + int month = ((todayDate.getMonthValue() - 1) / 3) * 3 + 1; + LocalDateTime quarterStart = todayDate.withMonth(month).withDayOfMonth(1).atStartOfDay(); + LocalDate quarterEndDate = todayDate.withMonth(Math.min(month + 2, 12)).withDayOfMonth(1).plusMonths(1).minusDays(1); + LocalDateTime quarterEnd = quarterEndDate.atTime(23, 59, 59); + dateTimeE.setQuarterlyStartTime(quarterStart); + dateTimeE.setQuarterlyEndTime(quarterEnd); + + // 半年：1-6月或7-12月 + if (todayDate.getMonthValue() <= 6) { + LocalDateTime halfYearStart = todayDate.withMonth(1).withDayOfMonth(1).atStartOfDay(); + LocalDateTime halfYearEnd = todayDate.withMonth(6).withDayOfMonth(30).atTime(23, 59, 59); + + dateTimeE.setHalfYearStartTime(halfYearStart); + dateTimeE.setHalfYearEndTime(halfYearEnd); + } else { + LocalDateTime halfYearStart = todayDate.withMonth(7).withDayOfMonth(1).atStartOfDay(); + LocalDateTime halfYearEnd = todayDate.withMonth(12).withDayOfMonth(31).atTime(23, 59, 59); + dateTimeE.setHalfYearStartTime(halfYearStart); + dateTimeE.setHalfYearEndTime(halfYearEnd); + } + // 每年：年初到年末 + // 每年：年初到年末 + LocalDateTime yearStart = todayDate.withMonth(1).withDayOfMonth(1).atStartOfDay(); + LocalDateTime yearEnd = todayDate.withMonth(12).withDayOfMonth(31).atTime(23, 59, 59); +// checkRecordInterval.put("checkPeriod0006", new DateTimeE(yearStart, yearEnd)); + dateTimeE.setYearlyStartTime(yearStart); + dateTimeE.setYearlyEndTime(yearEnd); + // 半月：1-15日或16-月末 + if (todayDate.getDayOfMonth() <= 15) { + LocalDateTime halfMonthStart = todayDate.withDayOfMonth(1).atStartOfDay(); + LocalDateTime halfMonthEnd = todayDate.withDayOfMonth(15).atTime(23, 59, 59); + dateTimeE.setHalfMonthStartTime(halfMonthStart); + dateTimeE.setHalfMonthEndTime(halfMonthEnd); + } else { + LocalDateTime halfMonthStart = todayDate.withDayOfMonth(16).atStartOfDay(); + LocalDateTime halfMonthEnd = todayDate.withDayOfMonth(todayDate.lengthOfMonth()).atTime(23, 59, 59); + dateTimeE.setHalfMonthStartTime(halfMonthStart); + dateTimeE.setHalfMonthEndTime(halfMonthEnd); + } + + return dateTimeE; + } + + public void getCheckRecordPeriod(String checkPeriod, LocalDateTime checkTimen) { + ListManagerCheckPeriodEnum byCode = ListManagerCheckPeriodEnum.getByCode(checkPeriod); + //时间为传入检查时间来计算周期时间 + + LocalDateTime today = checkTimen; + LocalDate todayDate = today.toLocalDate(); + + switch (byCode) { + case DAILY: + // 每日：当天00:00:00到23:59:59 + this.periodStart = todayDate.atStartOfDay(); + this.periodEnd = todayDate.atTime(23, 59, 59); + break; + case WEEKLY: + // 每周：本周一00:00:00到周日23:59:59 + LocalDate monday = todayDate.with(java.time.temporal.TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)); + LocalDate sunday = todayDate.with(java.time.temporal.TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY)); + this.periodStart = monday.atStartOfDay(); + this.periodEnd = sunday.atTime(23, 59, 59); + break; + case TEN_DAYS: + // 每旬：每月1-10日、11-20日、21-月末为一个周期 + int dayOfMonth = todayDate.getDayOfMonth(); + if (dayOfMonth <= 10) { + this.periodStart = todayDate.withDayOfMonth(1).atStartOfDay(); + this.periodEnd = todayDate.withDayOfMonth(10).atTime(23, 59, 59); + } else if (dayOfMonth <= 20) { + this.periodStart = todayDate.withDayOfMonth(11).atStartOfDay(); + this.periodEnd = todayDate.withDayOfMonth(20).atTime(23, 59, 59); + } else { + this.periodStart = todayDate.withDayOfMonth(21).atStartOfDay(); + this.periodEnd = todayDate.withDayOfMonth(todayDate.lengthOfMonth()).atTime(23, 59, 59); + } + break; + case MONTHLY: + // 每月：月初到月末 + this.periodStart = todayDate.withDayOfMonth(1).atStartOfDay(); + this.periodEnd = todayDate.withDayOfMonth(todayDate.lengthOfMonth()).atTime(23, 59, 59); + break; + case QUARTERLY: + // 每季：每季度初到季度末 + int month = ((todayDate.getMonthValue() - 1) / 3) * 3 + 1; + this.periodStart = todayDate.withMonth(month).withDayOfMonth(1).atStartOfDay(); + LocalDate quarterEndDate = todayDate.withMonth(Math.min(month + 2, 12)).withDayOfMonth(1).plusMonths(1).minusDays(1); + this.periodEnd = quarterEndDate.atTime(23, 59, 59); + break; + case HALF_YEAR: + // 半年：1-6月或7-12月 + if (todayDate.getMonthValue() <= 6) { + this.periodStart = todayDate.withMonth(1).withDayOfMonth(1).atStartOfDay(); + this.periodEnd = todayDate.withMonth(6).withDayOfMonth(30).atTime(23, 59, 59); + } else { + this.periodStart = todayDate.withMonth(7).withDayOfMonth(1).atStartOfDay(); + this.periodEnd = todayDate.withMonth(12).withDayOfMonth(31).atTime(23, 59, 59); + } + break; + case YEARLY: + // 每年：年初到年末 + this.periodStart = todayDate.withMonth(1).withDayOfMonth(1).atStartOfDay(); + this.periodEnd = todayDate.withMonth(12).withDayOfMonth(31).atTime(23, 59, 59); + break; + case HALF_MONTH: + // 半月：1-15日或16-月末 + if (todayDate.getDayOfMonth() <= 15) { + this.periodStart = todayDate.withDayOfMonth(1).atStartOfDay(); + this.periodEnd = todayDate.withDayOfMonth(15).atTime(23, 59, 59); + } else { + this.periodStart = todayDate.withDayOfMonth(16).atStartOfDay(); + this.periodEnd = todayDate.withDayOfMonth(todayDate.lengthOfMonth()).atTime(23, 59, 59); + } + break; + + } + } +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckListItemE.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckListItemE.java new file mode 100644 index 0000000..0fb3c63 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckListItemE.java @@ -0,0 +1,59 @@ +package com.zcloud.fire.check.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import java.time.LocalDateTime; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-11-28 10:32:28 + */ +@Data +public class FireCheckListItemE extends BaseE { + //主键 + private Long id; + //业务主键id + private String fireCheckListItemId; + //企业id + private Long corpinfoId; + //消防点位检查表主键id + private String fireCheckId; + //消防区域id + + private String fireRegionId; + //消防点位id + + private String firePointId; + //消防器材id + private String fireDeviceId; + //乐观锁 + private Integer version; + //创建人 + private Long createId; + //创建人姓名 + private String createName; + //创建时间 + private LocalDateTime createTime; + //更新人 + private Long updateId; + //修改人名称 + private String updateName; + //更新时间 + private LocalDateTime updateTime; + //描述 + private String remarks; + //是否删除 + private String deleteEnum; + //租户ID + private Long tenantId; + //机构ID + private Long orgId; + //环境 + private String env; +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckListUserE.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckListUserE.java new file mode 100644 index 0000000..6170f50 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckListUserE.java @@ -0,0 +1,66 @@ +package com.zcloud.fire.check.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.stream.Collectors; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-12-11 15:32:49 + */ +@Data +public class FireCheckListUserE extends BaseE { + //主键 + private Long id; + //业务主键id + private String fireCheckListUserId; + //点检表id + private String fireCheckId; + //企业id + private Long corpinfoId; + //负责部门 + private Long departmentId; + //负责人 + private Long userId; + //乐观锁 + private Integer version; + //创建人 + private Long createId; + //创建人姓名 + private String createName; + //创建时间 + private LocalDateTime createTime; + //更新人 + private Long updateId; + //修改人名称 + private String updateName; + //更新时间 + private LocalDateTime updateTime; + //描述 + private String remarks; + //是否删除 + private String deleteEnum; + //租户ID + private Long tenantId; + //机构ID + private Long orgId; + //环境 + private String env; + + public List initUser(List userIdList, Long departmentId, FireCheckListE fireCheckListE) { + List fireCheckListUserEList = userIdList.stream().map(userId -> { + FireCheckListUserE fireCheckListUserE = new FireCheckListUserE(); + fireCheckListUserE.setFireCheckId(fireCheckListE.getFireCheckId()); + fireCheckListUserE.setDepartmentId(departmentId); + fireCheckListUserE.setUserId(userId); + return fireCheckListUserE; + }).collect(Collectors.toList()); + return fireCheckListUserEList; + } +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckRecordDeviceE.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckRecordDeviceE.java new file mode 100644 index 0000000..74989e6 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckRecordDeviceE.java @@ -0,0 +1,102 @@ +package com.zcloud.fire.check.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-12-12 11:10:02 + */ +@Data +public class FireCheckRecordDeviceE extends BaseE { + //主键 + private Long id; + //业务主键id + private String fireRecordDeviceId; + //企业id + private Long corpinfoId; + //检查表id + private String fireCheckId; + //检查记录表id + private String fireRecordId; + + private String fireRecordPointId; + //是否检查过0已经检查1未检查，2已打回 + private Integer checkedFlag; + //0合格1不合格2不涉及 + private Integer normalFlag; + //打回原因 + private String hitBackTheReason; + //消防区域主键id + private String fireRegionId; + //消防区域名称 + private String fireRegionName; + //消防区域编码 + private String fireRegionCode; + //消防点位id + private String firePointId; + //消防点位名称 + private String firePointName; + //消防点位编码 + private String firePointCode; + //消防器材id + private String fireDeviceId; + //消防器材类型 + private String fireDeviceType; + //消防器材类型名称 + private String fireDeviceTypeName; + //器材编号 + private String fireDeviceCode; + //对应的检查标准信息 + private String fireCheckStandardInfo; + //经度 + private String longitude; + //纬度 + private String latitude; + //乐观锁 + private Integer version; + //创建人 + private Long createId; + //创建人姓名 + private String createName; + //创建时间 + private LocalDateTime createTime; + //更新人 + private Long updateId; + //修改人名称 + private String updateName; + //更新时间 + private LocalDateTime updateTime; + //描述 + private String remarks; + //是否删除 + private String deleteEnum; + //租户ID + private Long tenantId; + //机构ID + private Long orgId; + //环境 + private String env; + + public void initFireCheckRecordDevice(FireCheckRecordPointE fireCheckRecordPointE, FireDeviceE fireDeviceE) { + this.fireRecordPointId = fireCheckRecordPointE.getFireRecordPointId(); + this.fireCheckId = fireCheckRecordPointE.getFireCheckId(); + this.fireRecordId = fireCheckRecordPointE.getFireRecordId(); + this.fireRegionId = fireCheckRecordPointE.getFireRegionId(); + this.fireRegionName = fireCheckRecordPointE.getFireRegionName(); + this.fireRegionCode = fireCheckRecordPointE.getFireRegionCode(); + this.firePointId = fireCheckRecordPointE.getFirePointId(); + this.firePointName = fireCheckRecordPointE.getFirePointName(); + this.firePointCode = fireCheckRecordPointE.getFirePointCode(); + this.fireDeviceId = fireDeviceE.getFireDeviceId(); + this.fireDeviceType = fireDeviceE.getFireDeviceType(); + this.fireDeviceTypeName = fireDeviceE.getFireDeviceTypeName(); + this.fireDeviceCode = fireDeviceE.getFireDeviceCode(); + } +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckRecordE.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckRecordE.java new file mode 100644 index 0000000..93ec387 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckRecordE.java @@ -0,0 +1,79 @@ +package com.zcloud.fire.check.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-12-12 11:10:58 + */ +@Data +public class FireCheckRecordE extends BaseE { + //主键 + private Long id; + //业务主键id + private String fireRecordId; + //企业id + private Long corpinfoId; + //检查表id + private String fireCheckId; + //检查表名字 + private String fireCheckName; + //检查表类型 + private String fireCheckType; + //检查表类型名称 + private String fireCheckTypeName; + //检查时间 + private LocalDateTime checkTime; + //是否完成,0否1是 + private Integer finishedFlag; + //检查周期开始时间 + private LocalDateTime periodStart; + //检查周期结束时间 + private LocalDateTime periodEnd; + //签字url + private String signUrl; + + //乐观锁 + private Integer version; + //创建人 + private Long createId; + //创建人姓名 + private String createName; + //创建时间 + private LocalDateTime createTime; + //更新人 + private Long updateId; + //修改人名称 + private String updateName; + //更新时间 + private LocalDateTime updateTime; + //描述 + private String remarks; + //是否删除 + private String deleteEnum; + //租户ID + private Long tenantId; + //机构ID + private Long orgId; + //环境 + private String env; + + public void initCheckRecord(FireCheckListE fireCheckListE) { + this.fireCheckId = fireCheckListE.getFireCheckId(); + this.fireCheckName = fireCheckListE.getFireCheckName(); + fireCheckListE.getCheckRecordPeriod(fireCheckListE.getFireCheckType(), LocalDateTime.now()); + this.periodStart = fireCheckListE.getPeriodStart(); + this.periodEnd = fireCheckListE.getPeriodEnd(); + this.fireCheckType = fireCheckListE.getFireCheckType(); + this.fireCheckTypeName = fireCheckListE.getFireCheckTypeName(); + + + } +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckRecordHiddenE.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckRecordHiddenE.java new file mode 100644 index 0000000..0da36b6 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckRecordHiddenE.java @@ -0,0 +1,95 @@ +package com.zcloud.fire.check.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import com.zcloud.fire.check.domain.enums.HiddenCheckTypeEnum; +import com.zcloud.gbscommon.zcloudhidden.request.HiddenAddCmd; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-12-12 11:11:15 + */ +@Data +public class FireCheckRecordHiddenE extends BaseE { + //主键 + private Long id; + //业务主键id + private String fireRecordHidedenId; + //企业id + private Long corpinfoId; + //检查表id + private String fireCheckId; + //检查详情id + private String fireCheckListItemId; + //消防区域主键id + private String fireRegionId; + //消防点位id + private String firePointId; + //消防器材id + private String fireDeviceId; + + //检查记录表id + private String fireRecordId; + //检查记录点位表id + private String fireRecordPointId; + //检查记录设备表id + private String fireRecordDeviceId; + //隐患id + private String hiddenId; + //隐患类型,检查项隐患1,还是其他隐患2 + private Integer hiddenCheckType; + //隐患描述 + private String hiddenDesc; + //乐观锁 + private Integer version; + //创建人 + private Long createId; + //创建人姓名 + private String createName; + //创建时间 + private LocalDateTime createTime; + //更新人 + private Long updateId; + //修改人名称 + private String updateName; + //更新时间 + private LocalDateTime updateTime; + //描述 + private String remarks; + //是否删除 + private String deleteEnum; + //租户ID + private Long tenantId; + //机构ID + private Long orgId; + //环境 + private String env; + + public void initFireCheckRecordHidden(FireCheckRecordDeviceE fireCheckRecordDeviceE, String hiddenId, String hiddenDesc) { + this.fireCheckId = fireCheckRecordDeviceE.getFireCheckId(); + this.fireRecordId = fireCheckRecordDeviceE.getFireRecordId(); + this.fireRecordPointId = fireCheckRecordDeviceE.getFireRecordPointId(); + this.fireRecordDeviceId = fireCheckRecordDeviceE.getFireRecordDeviceId(); + this.hiddenId = hiddenId; + this.hiddenDesc = hiddenDesc; + this.hiddenCheckType = HiddenCheckTypeEnum.CHECK_ITEM_HIDDEN.getCode(); + this.fireRegionId = fireCheckRecordDeviceE.getFireRegionId(); + this.firePointId = fireCheckRecordDeviceE.getFirePointId(); + this.fireDeviceId = fireCheckRecordDeviceE.getFireDeviceId(); + } + + public void initOtherFireCheckRecordHidden(FireCheckRecordE fireCheckRecordE, HiddenAddCmd hiddenAddCmd) { + this.fireCheckId = fireCheckRecordE.getFireCheckId(); + this.fireRecordId = fireCheckRecordE.getFireRecordId(); + this.hiddenId = hiddenAddCmd.getHiddenId(); + this.hiddenDesc = hiddenAddCmd.getHiddenDesc(); + this.hiddenCheckType = HiddenCheckTypeEnum.OTHER_HIDDEN.getCode(); + } +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckRecordPointE.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckRecordPointE.java new file mode 100644 index 0000000..2e34666 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckRecordPointE.java @@ -0,0 +1,81 @@ +package com.zcloud.fire.check.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-12-12 11:10:20 + */ +@Data +public class FireCheckRecordPointE extends BaseE { + //主键 + private Long id; + //业务主键id + private String fireRecordPointId; + //企业id + private Long corpinfoId; + //检查表id + private String fireCheckId; + //检查记录表id + private String fireRecordId; + //是否检查过0已经检查1未检查，2已打回 + private Integer checkedFlag; + //消防区域主键id + private String fireRegionId; + //消防区域名称 + private String fireRegionName; + //消防区域编码 + private String fireRegionCode; + //消防点位id + private String firePointId; + //消防点位名称 + private String firePointName; + //消防点位编码 + private String firePointCode; + //经度 + private String longitude; + //纬度 + private String latitude; + //乐观锁 + private Integer version; + //创建人 + private Long createId; + //创建人姓名 + private String createName; + //创建时间 + private LocalDateTime createTime; + //更新人 + private Long updateId; + //修改人名称 + private String updateName; + //更新时间 + private LocalDateTime updateTime; + //描述 + private String remarks; + //是否删除 + private String deleteEnum; + //租户ID + private Long tenantId; + //机构ID + private Long orgId; + //环境 + private String env; + + public void initFireCheckRecordPoint(FireCheckRecordE fireCheckRecordE, FirePointE firePointE) { + this.fireCheckId = fireCheckRecordE.getFireCheckId(); + this.fireRecordId = fireCheckRecordE.getFireRecordId(); + this.fireRegionId = firePointE.getFireRegionId(); + this.fireRegionName = firePointE.getFireRegionName(); + this.fireRegionCode = firePointE.getFireRegionCode(); + this.firePointId = firePointE.getFirePointId(); + this.firePointName = firePointE.getFirePointName(); + this.firePointCode = firePointE.getFirePointCode(); + + } +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckRecordUserE.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckRecordUserE.java new file mode 100644 index 0000000..9179b25 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireCheckRecordUserE.java @@ -0,0 +1,64 @@ +package com.zcloud.fire.check.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2025-12-12 11:12:04 + */ +@Data +public class FireCheckRecordUserE extends BaseE { + //主键 + private Long id; + //业务主键id + private String fireRecordUserId; + //企业id + private Long corpinfoId; + //检查表id + private String fireCheckId; + //检查记录表id + private String fireRecordId; + //部门id + private Long departmentId; + //部门名称 + private String departmentName; + //人员id + private Long userId; + //人员名称 + private String userName; + //乐观锁 + private Integer version; + //创建人 + private Long createId; + //创建人姓名 + private String createName; + //创建时间 + private LocalDateTime createTime; + //更新人 + private Long updateId; + //修改人名称 + private String updateName; + //更新时间 + private LocalDateTime updateTime; + //描述 + private String remarks; + //是否删除 + private String deleteEnum; + //租户ID + private Long tenantId; + //机构ID + private Long orgId; + //环境 + private String env; + + public void init(FireCheckRecordE fireCheckRecordE) { + this.fireCheckId = fireCheckRecordE.getFireCheckId(); + this.fireRecordId = fireCheckRecordE.getFireRecordId(); + } +} + diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FirePointE.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FirePointE.java index 5419a3a..377d784 100644 --- a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FirePointE.java +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FirePointE.java @@ -1,10 +1,12 @@ package com.zcloud.fire.check.domain.model; import com.alibaba.cola.exception.BizException; +import com.baomidou.mybatisplus.annotation.TableField; import com.jjb.saas.framework.domain.model.BaseE; import com.zcloud.gbscommon.excelEntity.FirePointExcelExportEntity; import com.zcloud.gbscommon.excelEntity.ListManagerStatisticExcelExportEntity; import com.zcloud.gbscommon.utils.ExcelUtils; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.servlet.http.HttpServletResponse; @@ -41,6 +43,7 @@ public class FirePointE extends BaseE { private String longitude; //纬度 private String latitude; + private Integer nfcFlag; //乐观锁 private Integer version; //创建人 @@ -65,6 +68,10 @@ public class FirePointE extends BaseE { private Long orgId; //环境 private String env; + //消防区域名称 + private String fireRegionName; + //消防区域编码 + private String fireRegionCode; public static void checkFirePoint(String firePointName, long count) { if (count > 0) { diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireRegionE.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireRegionE.java index e3d8860..a8f78e9 100644 --- a/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireRegionE.java +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/model/FireRegionE.java @@ -29,8 +29,6 @@ public class FireRegionE extends BaseE { //0启用,1禁用 private Integer state; - //检查照片上传方式（1相机照相，2相册获取） - private Integer photoUploadMethod; //乐观锁 private Integer version; //创建人 diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckListGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckListGatewayImpl.java new file mode 100644 index 0000000..1c4103b --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckListGatewayImpl.java @@ -0,0 +1,63 @@ +package com.zcloud.fire.check.gatewayimpl; + +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.fire.check.domain.gateway.FireCheckListGateway; +import com.zcloud.fire.check.domain.model.FireCheckListE; +import com.zcloud.fire.check.persistence.dataobject.FireCheckListDO; +import com.zcloud.fire.check.persistence.repository.FireCheckListRepository; +import com.zcloud.gbscommon.utils.Tools; +import lombok.AllArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-28 10:32:09 + */ +@Service +@AllArgsConstructor +public class FireCheckListGatewayImpl implements FireCheckListGateway { + private final FireCheckListRepository fireCheckListRepository; + + @Override + public Boolean add(FireCheckListE fireCheckListE) { + if(StringUtils.isEmpty(fireCheckListE.getFireCheckId())){ + fireCheckListE.setFireCheckId(Tools.get32UUID()); + } + if(fireCheckListE.getCorpinfoId() == null){ + fireCheckListE.setCorpinfoId(AuthContext.getTenantId()); + } + FireCheckListDO d = new FireCheckListDO(); + BeanUtils.copyProperties(fireCheckListE, d); + fireCheckListRepository.save(d); + return true; + } + + @Override + public Boolean update(FireCheckListE fireCheckListE) { + FireCheckListDO d = new FireCheckListDO(); + BeanUtils.copyProperties(fireCheckListE, d); + fireCheckListRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedFireCheckListById(Long id) { + return fireCheckListRepository.removeById(id); + } + + @Override + public Boolean deletedFireCheckListByIds(Long[] ids) { + List idList = Arrays.stream(ids).collect(Collectors.toList()); + return fireCheckListRepository.removeByIds(idList); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckListItemGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckListItemGatewayImpl.java new file mode 100644 index 0000000..ff071a5 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckListItemGatewayImpl.java @@ -0,0 +1,62 @@ +package com.zcloud.fire.check.gatewayimpl; + +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.fire.check.domain.gateway.FireCheckListItemGateway; +import com.zcloud.fire.check.domain.model.FireCheckListItemE; +import com.zcloud.fire.check.persistence.dataobject.FireCheckListItemDO; +import com.zcloud.fire.check.persistence.repository.FireCheckListItemRepository; +import com.zcloud.gbscommon.utils.Tools; +import lombok.AllArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-22 13:58:46 + */ +@Service +@AllArgsConstructor +public class FireCheckListItemGatewayImpl implements FireCheckListItemGateway { + private final FireCheckListItemRepository fireCheckListItemRepository; + + @Override + public Boolean add(FireCheckListItemE fireCheckListItemE) { + if(StringUtils.isEmpty(fireCheckListItemE.getFireCheckListItemId())){ + fireCheckListItemE.setFireCheckListItemId(Tools.get32UUID()); + } + if(fireCheckListItemE.getCorpinfoId() == null){ + fireCheckListItemE.setCorpinfoId(AuthContext.getTenantId()); + } + FireCheckListItemDO d = new FireCheckListItemDO(); + BeanUtils.copyProperties(fireCheckListItemE, d); + fireCheckListItemRepository.save(d); + return true; + } + + @Override + public Boolean update(FireCheckListItemE fireCheckListItemE) { + FireCheckListItemDO d = new FireCheckListItemDO(); + BeanUtils.copyProperties(fireCheckListItemE, d); + fireCheckListItemRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedFireCheckListItemById(Long id) { + return fireCheckListItemRepository.removeById(id); + } + + @Override + public Boolean deletedFireCheckListItemByIds(Long[] ids) { + List idList = Arrays.stream(ids).collect(Collectors.toList()); + return fireCheckListItemRepository.removeByIds(idList); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckListUserGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckListUserGatewayImpl.java new file mode 100644 index 0000000..9604d7e --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckListUserGatewayImpl.java @@ -0,0 +1,77 @@ +package com.zcloud.fire.check.gatewayimpl; + +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.fire.check.domain.gateway.FireCheckListUserGateway; +import com.zcloud.fire.check.domain.model.FireCheckListUserE; +import com.zcloud.fire.check.persistence.dataobject.FireCheckListUserDO; +import com.zcloud.fire.check.persistence.repository.FireCheckListUserRepository; +import com.zcloud.gbscommon.utils.Tools; +import lombok.AllArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-11 15:32:49 + */ +@Service +@AllArgsConstructor +public class FireCheckListUserGatewayImpl implements FireCheckListUserGateway { + private final FireCheckListUserRepository fireCheckListUserRepository; + + @Override + public Boolean add(FireCheckListUserE fireCheckListUserE) { + if(StringUtils.isEmpty(fireCheckListUserE.getFireCheckListUserId())){ + fireCheckListUserE.setFireCheckListUserId(Tools.get32UUID()); + } + if(fireCheckListUserE.getCorpinfoId() == null){ + fireCheckListUserE.setCorpinfoId(AuthContext.getTenantId()); + } + FireCheckListUserDO d = new FireCheckListUserDO(); + BeanUtils.copyProperties(fireCheckListUserE, d); + fireCheckListUserRepository.save(d); + return true; + } + + @Override + public Boolean update(FireCheckListUserE fireCheckListUserE) { + FireCheckListUserDO d = new FireCheckListUserDO(); + BeanUtils.copyProperties(fireCheckListUserE, d); + fireCheckListUserRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedFireCheckListUserById(Long id) { + return fireCheckListUserRepository.removeById(id); + } + + @Override + public Boolean deletedFireCheckListUserByIds(Long[] ids) { + return fireCheckListUserRepository.removeByIds(Collections.singletonList(ids)); + } + + @Override + public void addBath(List fireCheckListUserEList) { + List dList = fireCheckListUserEList.stream().map(info -> { + if(StringUtils.isEmpty(info.getFireCheckListUserId())){ + info.setFireCheckListUserId(Tools.get32UUID()); + } + if(info.getCorpinfoId() == null){ + info.setCorpinfoId(AuthContext.getTenantId()); + } + FireCheckListUserDO d = new FireCheckListUserDO(); + BeanUtils.copyProperties(info, d); + return d; + }).collect(Collectors.toList()); + fireCheckListUserRepository.saveBatch(dList); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckRecordDeviceGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckRecordDeviceGatewayImpl.java new file mode 100644 index 0000000..89fbd4d --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckRecordDeviceGatewayImpl.java @@ -0,0 +1,61 @@ +package com.zcloud.fire.check.gatewayimpl; + +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.fire.check.domain.gateway.FireCheckRecordDeviceGateway; +import com.zcloud.fire.check.domain.model.FireCheckRecordDeviceE; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordDeviceDO; +import com.zcloud.fire.check.persistence.repository.FireCheckRecordDeviceRepository; +import com.zcloud.gbscommon.utils.Tools; +import lombok.AllArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-12 11:10:03 + */ +@Service +@AllArgsConstructor +public class FireCheckRecordDeviceGatewayImpl implements FireCheckRecordDeviceGateway { + private final FireCheckRecordDeviceRepository fireCheckRecordDeviceRepository; + + @Override + public Boolean add(FireCheckRecordDeviceE fireCheckRecordDeviceE) { + if(StringUtils.isEmpty(fireCheckRecordDeviceE.getFireRecordDeviceId())){ + fireCheckRecordDeviceE.setFireRecordDeviceId(Tools.get32UUID()); + } + if(fireCheckRecordDeviceE.getCorpinfoId() == null){ + fireCheckRecordDeviceE.setCorpinfoId(AuthContext.getTenantId()); + } + FireCheckRecordDeviceDO d = new FireCheckRecordDeviceDO(); + BeanUtils.copyProperties(fireCheckRecordDeviceE, d); + fireCheckRecordDeviceRepository.save(d); + return true; + } + + @Override + public Boolean update(FireCheckRecordDeviceE fireCheckRecordDeviceE) { + FireCheckRecordDeviceDO d = new FireCheckRecordDeviceDO(); + BeanUtils.copyProperties(fireCheckRecordDeviceE, d); + fireCheckRecordDeviceRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedFireCheckRecordDeviceById(Long id) { + return fireCheckRecordDeviceRepository.removeById(id); + } + + @Override + public Boolean deletedFireCheckRecordDeviceByIds(Long[] ids) { + return fireCheckRecordDeviceRepository.removeByIds(Collections.singletonList(ids)); + } + + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckRecordGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckRecordGatewayImpl.java new file mode 100644 index 0000000..6bee396 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckRecordGatewayImpl.java @@ -0,0 +1,85 @@ +package com.zcloud.fire.check.gatewayimpl; + +import com.alibaba.cola.exception.BizException; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.fire.check.domain.enums.FireCheckListStateEnum; +import com.zcloud.fire.check.domain.gateway.FireCheckRecordGateway; +import com.zcloud.fire.check.domain.model.FireCheckListE; +import com.zcloud.fire.check.domain.model.FireCheckRecordE; +import com.zcloud.fire.check.persistence.dataobject.FireCheckListDO; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordDO; +import com.zcloud.fire.check.persistence.repository.FireCheckListRepository; +import com.zcloud.fire.check.persistence.repository.FireCheckRecordRepository; +import com.zcloud.gbscommon.utils.Tools; +import lombok.AllArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-12 11:10:58 + */ +@Service +@AllArgsConstructor +public class FireCheckRecordGatewayImpl implements FireCheckRecordGateway { + private final FireCheckRecordRepository fireCheckRecordRepository; + private final FireCheckListRepository fireCheckListRepository; + + @Override + public Boolean add(FireCheckRecordE fireCheckRecordE) { + if(StringUtils.isEmpty(fireCheckRecordE.getFireRecordId())){ + fireCheckRecordE.setFireRecordId(Tools.get32UUID()); + } + if(fireCheckRecordE.getCorpinfoId() == null){ + fireCheckRecordE.setCorpinfoId(AuthContext.getTenantId()); + } + FireCheckRecordDO d = new FireCheckRecordDO(); + BeanUtils.copyProperties(fireCheckRecordE, d); + fireCheckRecordRepository.save(d); + return true; + } + + @Override + public Boolean update(FireCheckRecordE fireCheckRecordE) { + FireCheckRecordDO d = new FireCheckRecordDO(); + BeanUtils.copyProperties(fireCheckRecordE, d); + fireCheckRecordRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedFireCheckRecordById(Long id) { + return fireCheckRecordRepository.removeById(id); + } + + @Override + public Boolean deletedFireCheckRecordByIds(Long[] ids) { + return fireCheckRecordRepository.removeByIds(Collections.singletonList(ids)); + } + + @Override + public FireCheckRecordE initCheckRecord(String fireCheckId, String fireRecordId) { + + FireCheckRecordDO fireCheckRecordDO = fireCheckRecordRepository.getChecKRecordInfo(fireRecordId); + FireCheckRecordE fireCheckRecordE = new FireCheckRecordE(); + if(fireCheckRecordDO == null){ + FireCheckListDO fireCheckListDO = fireCheckListRepository.getInfoByUUIdState(fireCheckId, FireCheckListStateEnum.ENABLE.getCode()); + if(fireCheckListDO == null){ + throw new BizException("检查表不存在"); + } + FireCheckListE fireCheckListE = new FireCheckListE(); + BeanUtils.copyProperties(fireCheckListDO, fireCheckListE); + fireCheckRecordE.initCheckRecord(fireCheckListE); + add(fireCheckRecordE); + return fireCheckRecordE; + } + BeanUtils.copyProperties(fireCheckRecordDO, fireCheckRecordE); + return fireCheckRecordE; + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckRecordHiddenGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckRecordHiddenGatewayImpl.java new file mode 100644 index 0000000..68910a8 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckRecordHiddenGatewayImpl.java @@ -0,0 +1,98 @@ +package com.zcloud.fire.check.gatewayimpl; + +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.fire.check.domain.gateway.FireCheckRecordHiddenGateway; +import com.zcloud.fire.check.domain.model.FireCheckRecordDeviceE; +import com.zcloud.fire.check.domain.model.FireCheckRecordHiddenE; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordHiddenDO; +import com.zcloud.fire.check.persistence.repository.FireCheckRecordHiddenRepository; +import com.zcloud.gbscommon.utils.Tools; +import com.zcloud.gbscommon.zcloudhidden.request.HiddenAddCmd; +import lombok.AllArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-12 11:11:15 + */ +@Service +@AllArgsConstructor +public class FireCheckRecordHiddenGatewayImpl implements FireCheckRecordHiddenGateway { + private final FireCheckRecordHiddenRepository fireCheckRecordHiddenRepository; + + @Override + public Boolean add(FireCheckRecordHiddenE fireCheckRecordHiddenE) { + if(StringUtils.isEmpty(fireCheckRecordHiddenE.getFireRecordHidedenId())){ + fireCheckRecordHiddenE.setFireRecordHidedenId(Tools.get32UUID()); + } + if(fireCheckRecordHiddenE.getCorpinfoId() == null){ + fireCheckRecordHiddenE.setCorpinfoId(AuthContext.getTenantId()); + } + FireCheckRecordHiddenDO d = new FireCheckRecordHiddenDO(); + BeanUtils.copyProperties(fireCheckRecordHiddenE, d); + fireCheckRecordHiddenRepository.save(d); + return true; + } + + @Override + public Boolean update(FireCheckRecordHiddenE fireCheckRecordHiddenE) { + FireCheckRecordHiddenDO d = new FireCheckRecordHiddenDO(); + BeanUtils.copyProperties(fireCheckRecordHiddenE, d); + fireCheckRecordHiddenRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedFireCheckRecordHiddenById(Long id) { + return fireCheckRecordHiddenRepository.removeById(id); + } + + @Override + public Boolean deletedFireCheckRecordHiddenByIds(Long[] ids) { + return fireCheckRecordHiddenRepository.removeByIds(Collections.singletonList(ids)); + } + + + @Override + public void addHidden(FireCheckRecordDeviceE fireCheckRecordDeviceE, HiddenAddCmd hiddenAddCmd) { + FireCheckRecordHiddenE fireCheckRecordHiddenE = new FireCheckRecordHiddenE(); + fireCheckRecordHiddenE.initFireCheckRecordHidden(fireCheckRecordDeviceE,hiddenAddCmd.getHiddenId(), hiddenAddCmd.getHiddenDesc()); + if(StringUtils.isEmpty(fireCheckRecordHiddenE.getFireRecordHidedenId())){ + fireCheckRecordHiddenE.setFireRecordHidedenId(Tools.get32UUID()); + } + if(fireCheckRecordHiddenE.getCorpinfoId() == null){ + fireCheckRecordHiddenE.setCorpinfoId(AuthContext.getTenantId()); + } + FireCheckRecordHiddenDO d = new FireCheckRecordHiddenDO(); + BeanUtils.copyProperties(fireCheckRecordHiddenE, d); + fireCheckRecordHiddenRepository.add(d, hiddenAddCmd); + } + + @Override + public void updateHidden(FireCheckRecordHiddenE fireCheckRecordHiddenE, HiddenAddCmd hiddenAddCmd) { + FireCheckRecordHiddenDO d = new FireCheckRecordHiddenDO(); + BeanUtils.copyProperties(fireCheckRecordHiddenE, d); + fireCheckRecordHiddenRepository.updateHidden(d, hiddenAddCmd); + + } + + @Override + public void addOtherHidden(FireCheckRecordHiddenE fireCheckRecordHiddenE, HiddenAddCmd hiddenAddCmd) { + if(StringUtils.isEmpty(fireCheckRecordHiddenE.getFireRecordHidedenId())){ + fireCheckRecordHiddenE.setFireRecordHidedenId(Tools.get32UUID()); + } + if(fireCheckRecordHiddenE.getCorpinfoId() == null){ + fireCheckRecordHiddenE.setCorpinfoId(AuthContext.getTenantId()); + } + FireCheckRecordHiddenDO d = new FireCheckRecordHiddenDO(); + BeanUtils.copyProperties(fireCheckRecordHiddenE, d); + fireCheckRecordHiddenRepository.add(d, hiddenAddCmd); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckRecordPointGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckRecordPointGatewayImpl.java new file mode 100644 index 0000000..e18f65c --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckRecordPointGatewayImpl.java @@ -0,0 +1,60 @@ +package com.zcloud.fire.check.gatewayimpl; + +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.fire.check.domain.gateway.FireCheckRecordPointGateway; +import com.zcloud.fire.check.domain.model.FireCheckRecordPointE; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordPointDO; +import com.zcloud.fire.check.persistence.repository.FireCheckRecordPointRepository; +import com.zcloud.gbscommon.utils.Tools; +import lombok.AllArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-12 11:10:20 + */ +@Service +@AllArgsConstructor +public class FireCheckRecordPointGatewayImpl implements FireCheckRecordPointGateway { + private final FireCheckRecordPointRepository fireCheckRecordPointRepository; + + @Override + public Boolean add(FireCheckRecordPointE fireCheckRecordPointE) { + if(StringUtils.isEmpty(fireCheckRecordPointE.getFireRecordPointId())){ + fireCheckRecordPointE.setFireRecordPointId(Tools.get32UUID()); + } + if(fireCheckRecordPointE.getCorpinfoId() == null){ + fireCheckRecordPointE.setCorpinfoId(AuthContext.getTenantId()); + } + FireCheckRecordPointDO d = new FireCheckRecordPointDO(); + BeanUtils.copyProperties(fireCheckRecordPointE, d); + fireCheckRecordPointRepository.save(d); + fireCheckRecordPointE.setId(d.getId()); + return true; + } + + @Override + public Boolean update(FireCheckRecordPointE fireCheckRecordPointE) { + FireCheckRecordPointDO d = new FireCheckRecordPointDO(); + BeanUtils.copyProperties(fireCheckRecordPointE, d); + fireCheckRecordPointRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedFireCheckRecordPointById(Long id) { + return fireCheckRecordPointRepository.removeById(id); + } + + @Override + public Boolean deletedFireCheckRecordPointByIds(Long[] ids) { + return fireCheckRecordPointRepository.removeByIds(Collections.singletonList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckRecordUserGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckRecordUserGatewayImpl.java new file mode 100644 index 0000000..b502c28 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckRecordUserGatewayImpl.java @@ -0,0 +1,67 @@ +package com.zcloud.fire.check.gatewayimpl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.fire.check.domain.gateway.FireCheckRecordUserGateway; +import com.zcloud.fire.check.domain.model.FireCheckRecordUserE; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordUserDO; +import com.zcloud.fire.check.persistence.repository.FireCheckRecordUserRepository; +import com.zcloud.gbscommon.utils.Tools; +import lombok.AllArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-12 11:12:04 + */ +@Service +@AllArgsConstructor +public class FireCheckRecordUserGatewayImpl implements FireCheckRecordUserGateway { + private final FireCheckRecordUserRepository fireCheckRecordUserRepository; + + @Override + public Boolean add(FireCheckRecordUserE fireCheckRecordUserE) { + if(StringUtils.isEmpty(fireCheckRecordUserE.getFireRecordUserId())){ + fireCheckRecordUserE.setFireRecordUserId(Tools.get32UUID()); + } + if(fireCheckRecordUserE.getCorpinfoId() == null){ + fireCheckRecordUserE.setCorpinfoId(AuthContext.getTenantId()); + } + FireCheckRecordUserDO d = new FireCheckRecordUserDO(); + BeanUtils.copyProperties(fireCheckRecordUserE, d); + fireCheckRecordUserRepository.save(d); + return true; + } + + @Override + public Boolean update(FireCheckRecordUserE fireCheckRecordUserE) { + FireCheckRecordUserDO d = new FireCheckRecordUserDO(); + BeanUtils.copyProperties(fireCheckRecordUserE, d); + fireCheckRecordUserRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedFireCheckRecordUserById(Long id) { + return fireCheckRecordUserRepository.removeById(id); + } + + @Override + public Boolean deletedFireCheckRecordUserByIds(Long[] ids) { + return fireCheckRecordUserRepository.removeByIds(Collections.singletonList(ids)); + } + + @Override + public void deletedByCheckRecordId(String fireRecordId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_record_id", fireRecordId); + fireCheckRecordUserRepository.remove(queryWrapper); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckStandardGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckStandardGatewayImpl.java index 039510f..78bb0ef 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckStandardGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/gatewayimpl/FireCheckStandardGatewayImpl.java @@ -11,6 +11,7 @@ import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import java.util.Arrays; import java.util.Collections; /** @@ -53,7 +54,7 @@ public class FireCheckStandardGatewayImpl implements FireCheckStandardGateway { @Override public Boolean deletedFireCheckStandardByIds(Long[] ids) { - return fireCheckStandardRepository.removeByIds(Collections.singletonList(ids)); + return fireCheckStandardRepository.removeByIds(Arrays.asList(ids)); } } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/FireCheckPointListDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/FireCheckPointListDO.java new file mode 100644 index 0000000..91ccfc9 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/FireCheckPointListDO.java @@ -0,0 +1,66 @@ +package com.zcloud.fire.check.persistence; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-28 10:32:09 + */ +@Data +public class FireCheckPointListDO implements Serializable { + /** + * 消防设备ID + */ + private String fireDeviceId; + + /** + * 消防设备编码 + */ + private String fireDeviceCode; + + /** + * 消防设备类型名称 + */ + private String fireDeviceType; + private String fireDeviceTypeName; + + /** + * 消防点位名称 + */ + private String firePointName; + + /** + * 消防点位编码 + */ + private String firePointCode; + + /** + * 消防点位ID + */ + private String firePointId; + + /** + * 消防区域名称 + */ + private String fireRegionName; + + /** + * 消防区域编码 + */ + private String fireRegionCode; + + /** + * 消防区域ID + */ + private String fireRegionId; + /** + * 标准数量 + */ + private Long standardCount; +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/DataStatisticDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/DataStatisticDO.java new file mode 100644 index 0000000..8cde9bc --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/DataStatisticDO.java @@ -0,0 +1,32 @@ +package com.zcloud.fire.check.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDate; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-10-30 15:12:49 + */ +@Data +public class DataStatisticDO implements Serializable { + + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //企业名称 + @ApiModelProperty(value = "数量") + private Integer totalCount; + + + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListDO.java new file mode 100644 index 0000000..885ca1e --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListDO.java @@ -0,0 +1,73 @@ +package com.zcloud.fire.check.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotNull; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-28 10:32:09 + */ +@Data +@TableName("fire_check_list") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class FireCheckListDO extends BaseDO { + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireCheckId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //检查表名字 + @ApiModelProperty(value = "检查表名字") + private String fireCheckName; + //检查表类型 + @ApiModelProperty(value = "检查表类型") + private String fireCheckType; + //检查表类型名称 + @ApiModelProperty(value = "检查表类型名称") + private String fireCheckTypeName; + + //禁用1启用0 + @ApiModelProperty(value = "禁用1启用0") + private Integer state; + + @ApiModelProperty(value = "检查照片上传方式（1相机照相，2相册获取）", name = "photoUploadMethod", required = true) + @NotNull(message = "检查照片上传方式不能为空") + private Integer photoUploadMethod; + + //岗位 + @ApiModelProperty(value = "岗位名称") + @TableField(exist = false) + private String postName; + //部门名称 + @ApiModelProperty(value = "部门名称") + @TableField(exist = false) + private String departmentName; + @ApiModelProperty(value = "部门id") + @TableField(exist = false) + private Long departmentId; + //用户名称 + @ApiModelProperty(value = "用户名称") + @TableField(exist = false) + private String userName; + + @ApiModelProperty(value = "检查次数") + @TableField(exist = false) + private String checkCycleCount; + + public FireCheckListDO(String fireCheckId) { + this.fireCheckId = fireCheckId; + } + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListItemDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListItemDO.java new file mode 100644 index 0000000..d4cd0f5 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListItemDO.java @@ -0,0 +1,45 @@ +package com.zcloud.fire.check.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-22 13:58:46 + */ +@Data +@TableName("fire_check_list_item") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class FireCheckListItemDO extends BaseDO { + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireCheckListItemId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //消防点位检查表主键id + @ApiModelProperty(value = "消防点位检查表主键id") + private String fireCheckId; + //消防区域id + @ApiModelProperty(value = "消防区域id", name = "fireRegionId", required = true) + private String fireRegionId; + //消防点位id + @ApiModelProperty(value = "消防点位id", name = "firePointId", required = true) + private String firePointId; + //消防器材id + @ApiModelProperty(value = "消防器材id") + private String fireDeviceId; + + public FireCheckListItemDO(String fireCheckListItemId) { + this.fireCheckListItemId = fireCheckListItemId; + } + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListItemStatisticDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListItemStatisticDO.java new file mode 100644 index 0000000..46f67f3 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListItemStatisticDO.java @@ -0,0 +1,31 @@ +package com.zcloud.fire.check.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-28 10:32:28 + */ +@Data +@NoArgsConstructor +public class FireCheckListItemStatisticDO implements Serializable { + + //消防点位检查表主键id + @ApiModelProperty(value = "消防点位检查表主键id") + private String fireCheckId; + //消防点位检查项数量 + @ApiModelProperty(value = "消防点位检查项数量") + private Long fireCheckItemCount; + + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListStatisticDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListStatisticDO.java new file mode 100644 index 0000000..23f29b6 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListStatisticDO.java @@ -0,0 +1,38 @@ +package com.zcloud.fire.check.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-11 15:32:49 + */ +@Data +public class FireCheckListStatisticDO implements Serializable { + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireCheckListUserId; + //点检表id + @ApiModelProperty(value = "点检表id") + private String fireCheckId; + + + @ApiModelProperty(value = "负责人姓名") + private String userName; + + //检查次数 + @ApiModelProperty(value = "检查次数") + private Integer checkCount; + + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListUserDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListUserDO.java new file mode 100644 index 0000000..deb8d16 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListUserDO.java @@ -0,0 +1,46 @@ +package com.zcloud.fire.check.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-11 15:32:49 + */ +@Data +@TableName("fire_check_list_user") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class FireCheckListUserDO extends BaseDO { + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireCheckListUserId; + //点检表id + @ApiModelProperty(value = "点检表id") + private String fireCheckId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //负责部门 + @ApiModelProperty(value = "负责部门") + private Long departmentId; + //负责人 + @ApiModelProperty(value = "负责人") + private Long userId; + @ApiModelProperty(value = "负责人姓名") + @TableField(exist = false) + private String userName; + + public FireCheckListUserDO(String fireCheckListUserId) { + this.fireCheckListUserId = fireCheckListUserId; + } + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordDO.java new file mode 100644 index 0000000..357e26f --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordDO.java @@ -0,0 +1,82 @@ +package com.zcloud.fire.check.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-12 11:10:58 + */ +@Data +@TableName("fire_check_record") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class FireCheckRecordDO extends BaseDO { + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireRecordId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //检查表id + @ApiModelProperty(value = "检查表id") + private String fireCheckId; + //检查表名字 + @ApiModelProperty(value = "检查表名字") + private String fireCheckName; + //检查表类型 + @ApiModelProperty(value = "检查表类型") + private String fireCheckType; + //检查表类型名称 + @ApiModelProperty(value = "检查表类型名称") + private String fireCheckTypeName; + //检查时间 + @ApiModelProperty(value = "检查时间") + private LocalDateTime checkTime; + //是否完成,0否1是 + @ApiModelProperty(value = "是否完成,0否1是") + private Integer finishedFlag; + //检查周期开始时间 + @ApiModelProperty(value = "检查周期开始时间") + private LocalDateTime periodStart; + //检查周期结束时间 + @ApiModelProperty(value = "检查周期结束时间") + private LocalDateTime periodEnd; + //签字url + @ApiModelProperty(value = "签字url") + private String signUrl; + + @ApiModelProperty(value = "消防点位名称") + @TableField(exist = false) + private String firePointNameList; + + @ApiModelProperty(value = "消防区域名称") + @TableField(exist = false) + private String fireRegionNameList; + + + @ApiModelProperty(value = "涉及点位数") + @TableField(exist = false) + private Integer checkRecordPointCount; + @ApiModelProperty(value = "检查人list") + @TableField(exist = false) + private String userNameList; + @ApiModelProperty(value = "部门名字") + @TableField(exist = false) + private String departmentName; + + public FireCheckRecordDO(String fireRecordId) { + this.fireRecordId = fireRecordId; + } + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordDeviceDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordDeviceDO.java new file mode 100644 index 0000000..92d903f --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordDeviceDO.java @@ -0,0 +1,89 @@ +package com.zcloud.fire.check.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-12 11:10:02 + */ +@Data +@TableName("fire_check_record_device") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class FireCheckRecordDeviceDO extends BaseDO { + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireRecordDeviceId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //检查表id + @ApiModelProperty(value = "检查表id") + private String fireCheckId; + //检查记录表id + @ApiModelProperty(value = "检查记录表id") + private String fireRecordId; + @ApiModelProperty(value = "检查记录点位表id") + private String fireRecordPointId; + //是否检查过0已经检查1未检查，2已打回 + @ApiModelProperty(value = "是否检查过0已经检查1未检查，2已打回") + private Integer checkedFlag; + //0合格1不合格2不涉及 + @ApiModelProperty(value = "0合格1不合格2不涉及") + private Integer normalFlag; + //打回原因 + @ApiModelProperty(value = "打回原因") + private String hitBackTheReason; + //消防区域主键id + @ApiModelProperty(value = "消防区域主键id") + private String fireRegionId; + //消防区域名称 + @ApiModelProperty(value = "消防区域名称") + private String fireRegionName; + //消防区域编码 + @ApiModelProperty(value = "消防区域编码") + private String fireRegionCode; + //消防点位id + @ApiModelProperty(value = "消防点位id") + private String firePointId; + //消防点位名称 + @ApiModelProperty(value = "消防点位名称") + private String firePointName; + //消防点位编码 + @ApiModelProperty(value = "消防点位编码") + private String firePointCode; + //消防器材id + @ApiModelProperty(value = "消防器材id") + private String fireDeviceId; + //消防器材类型 + @ApiModelProperty(value = "消防器材类型") + private String fireDeviceType; + //消防器材类型名称 + @ApiModelProperty(value = "消防器材类型名称") + private String fireDeviceTypeName; + //器材编号 + @ApiModelProperty(value = "器材编号") + private String fireDeviceCode; + //对应的检查标准信息 + @ApiModelProperty(value = "对应的检查标准信息") + private String fireCheckStandardInfo; + //经度 + @ApiModelProperty(value = "经度") + private String longitude; + //纬度 + @ApiModelProperty(value = "纬度") + private String latitude; + + public FireCheckRecordDeviceDO(String fireRecordDeviceId) { + this.fireRecordDeviceId = fireRecordDeviceId; + } + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordHiddenDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordHiddenDO.java new file mode 100644 index 0000000..27278b3 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordHiddenDO.java @@ -0,0 +1,66 @@ +package com.zcloud.fire.check.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-12 11:11:15 + */ +@Data +@TableName("fire_check_record_hidden") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class FireCheckRecordHiddenDO extends BaseDO { + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireRecordHidedenId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //检查表id + @ApiModelProperty(value = "检查表id") + private String fireCheckId; + //检查详情id + @ApiModelProperty(value = "检查详情id") + private String fireCheckListItemId; + //消防区域id + @ApiModelProperty(value = "消防区域id", name = "fireRegionId", required = true) + private String fireRegionId; + //消防点位id + @ApiModelProperty(value = "消防点位id", name = "firePointId", required = true) + private String firePointId; + //消防器材id + @ApiModelProperty(value = "消防器材id") + private String fireDeviceId; + //检查记录表id + @ApiModelProperty(value = "检查记录表id") + private String fireRecordId; + //检查记录点位表id + @ApiModelProperty(value = "检查记录点位表id") + private String fireRecordPointId; + //检查记录设备表id + @ApiModelProperty(value = "检查记录设备表id") + private String fireRecordDeviceId; + //隐患id + @ApiModelProperty(value = "隐患id") + private String hiddenId; + //隐患类型,检查项隐患1,还是其他隐患2 + @ApiModelProperty(value = "隐患类型,检查项隐患1,还是其他隐患2") + private Integer hiddenCheckType; + //隐患描述 + @ApiModelProperty(value = "隐患描述") + private String hiddenDesc; + + public FireCheckRecordHiddenDO(String fireRecordHidedenId) { + this.fireRecordHidedenId = fireRecordHidedenId; + } + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordPointDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordPointDO.java new file mode 100644 index 0000000..30cce7c --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordPointDO.java @@ -0,0 +1,76 @@ +package com.zcloud.fire.check.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-12 11:10:20 + */ +@Data +@TableName("fire_check_record_point") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class FireCheckRecordPointDO extends BaseDO { + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireRecordPointId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //检查表id + @ApiModelProperty(value = "检查表id") + private String fireCheckId; + //检查记录表id + @ApiModelProperty(value = "检查记录表id") + private String fireRecordId; + //是否检查过0已经检查1未检查，2已打回 + @ApiModelProperty(value = "是否检查过0已经检查1未检查，2已打回") + private Integer checkedFlag; + //消防区域主键id + @ApiModelProperty(value = "消防区域主键id") + private String fireRegionId; + //消防区域名称 + @ApiModelProperty(value = "消防区域名称") + private String fireRegionName; + //消防区域编码 + @ApiModelProperty(value = "消防区域编码") + private String fireRegionCode; + //消防点位id + @ApiModelProperty(value = "消防点位id") + private String firePointId; + //消防点位名称 + @ApiModelProperty(value = "消防点位名称") + private String firePointName; + //消防点位编码 + @ApiModelProperty(value = "消防点位编码") + private String firePointCode; + //经度 + @ApiModelProperty(value = "经度") + private String longitude; + //纬度 + @ApiModelProperty(value = "纬度") + private String latitude; + + @ApiModelProperty(value = "消防设备编码，多个") + @TableField(exist = false) + private String fireDeviceCode; + @ApiModelProperty(value = "消防设备类型名称，多个") + @TableField(exist = false) + private String fireDeviceTypeName; + + + + public FireCheckRecordPointDO(String fireRecordPointId) { + this.fireRecordPointId = fireRecordPointId; + } + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordStatisticDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordStatisticDO.java new file mode 100644 index 0000000..1618eb3 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordStatisticDO.java @@ -0,0 +1,28 @@ +package com.zcloud.fire.check.persistence.dataobject; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-28 10:32:28 + */ +@Data +@NoArgsConstructor +public class FireCheckRecordStatisticDO implements Serializable { + + //消防点位检查表主键id + @ApiModelProperty(value = "消防点位检查表主键id") + private String fireCheckId; + //消防点位检查项数量 + @ApiModelProperty(value = "消防点位检查次数") + private Long fireCheckCount; + + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordUserDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordUserDO.java new file mode 100644 index 0000000..8441216 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckRecordUserDO.java @@ -0,0 +1,51 @@ +package com.zcloud.fire.check.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-12 11:12:04 + */ +@Data +@TableName("fire_check_record_user") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class FireCheckRecordUserDO extends BaseDO { + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String fireRecordUserId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //检查表id + @ApiModelProperty(value = "检查表id") + private String fireCheckId; + //检查记录表id + @ApiModelProperty(value = "检查记录表id") + private String fireRecordId; + //部门id + @ApiModelProperty(value = "部门id") + private Long departmentId; + //部门名称 + @ApiModelProperty(value = "部门名称") + private String departmentName; + //人员id + @ApiModelProperty(value = "人员id") + private Long userId; + //人员名称 + @ApiModelProperty(value = "人员名称") + private String userName; + + public FireCheckRecordUserDO(String fireRecordUserId) { + this.fireRecordUserId = fireRecordUserId; + } + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireDeviceDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireDeviceDO.java index bc61527..077eb8f 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireDeviceDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireDeviceDO.java @@ -35,6 +35,7 @@ public class FireDeviceDO extends BaseDO { private String firePointId; //部门id @ApiModelProperty(value = "部门id") + @TableField(exist = false) private Long departmentId; //消防器材类型 @ApiModelProperty(value = "消防器材类型") @@ -78,6 +79,9 @@ public class FireDeviceDO extends BaseDO { @ApiModelProperty(value = "负责人") @TableField(exist = false) private String userName; + @ApiModelProperty(value = "负责人岗位") + @TableField(exist = false) + private String userPostName; public FireDeviceDO(String fireDeviceId) { this.fireDeviceId = fireDeviceId; diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FirePointDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FirePointDO.java index ad0725c..ac47d0e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FirePointDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FirePointDO.java @@ -36,6 +36,7 @@ public class FirePointDO extends BaseDO { private String firePointCode; //部门id @ApiModelProperty(value = "部门id") + @TableField(exist = false) private Long departmentId; //负责人 @ApiModelProperty(value = "负责人") @@ -46,6 +47,8 @@ public class FirePointDO extends BaseDO { //纬度 @ApiModelProperty(value = "纬度") private String latitude; + @ApiModelProperty(value = "是否开启nfc,0否，1是", name = "nfcFlag") + private Integer nfcFlag; @TableField(exist = false) private String departmentName; @@ -53,7 +56,8 @@ public class FirePointDO extends BaseDO { private String userName; @TableField(exist = false) private String fireRegionName; - + @TableField(exist = false) + private String fireRegionCode; public FirePointDO(String firePointId) { this.firePointId = firePointId; } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireRegionDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireRegionDO.java index ae6a32f..e469217 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireRegionDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireRegionDO.java @@ -38,10 +38,6 @@ public class FireRegionDO extends BaseDO { @ApiModelProperty(value = "0启用,1禁用") private Integer state; - //检查照片上传方式（1相机照相，2相册获取） - @ApiModelProperty(value = "检查照片上传方式（1相机照相，2相册获取）") - private Integer photoUploadMethod; - @TableField(exist = false) private String departmentName; diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/PointDistributionDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/PointDistributionDO.java new file mode 100644 index 0000000..f48645d --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/PointDistributionDO.java @@ -0,0 +1,31 @@ +package com.zcloud.fire.check.persistence.dataobject; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-28 10:32:09 + */ +@Data +public class PointDistributionDO implements Serializable { + @ApiModelProperty(value = "企业名称") + private String corpinfoName; + @ApiModelProperty(value = "消防区域名称") + private String fireRegionName; + @ApiModelProperty(value = "部门名称") + private String departmentName; + @ApiModelProperty(value = "消防点位名称") + private String firePointName; + @ApiModelProperty(value = "消防器材类型") + private String fireDeviceType; + @ApiModelProperty(value = "消防器材类型名称") + private String fireDeviceTypeName; + @ApiModelProperty(value = "消防器材编码") + private String fireDeviceCode; +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/RiskDistributionDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/RiskDistributionDO.java new file mode 100644 index 0000000..291fb12 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/RiskDistributionDO.java @@ -0,0 +1,39 @@ +package com.zcloud.fire.check.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-28 10:32:09 + */ +@Data +public class RiskDistributionDO implements Serializable { + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //企业名称 + @ApiModelProperty(value = "企业名称") + private String corpinfoName; + //消防区域数量 + @ApiModelProperty(value = "消防区域数量") + private Long fireRegionCount; + //点位数 + @ApiModelProperty(value = "点位数") + private Long firePointCount; + //消防器材数量 + @ApiModelProperty(value = "消防器材数量") + private Long fireDeviceCount; + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListItemMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListItemMapper.java new file mode 100644 index 0000000..ed19b67 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListItemMapper.java @@ -0,0 +1,21 @@ +package com.zcloud.fire.check.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.fire.check.persistence.dataobject.FireCheckListItemDO; +import com.zcloud.fire.check.persistence.dataobject.FireCheckListItemStatisticDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-28 10:32:28 + */ +@Mapper +public interface FireCheckListItemMapper extends BaseMapper { + + List statisticListByFireCheckIdList(List fireCheckIdList); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListMapper.java new file mode 100644 index 0000000..6d4d9e9 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListMapper.java @@ -0,0 +1,43 @@ +package com.zcloud.fire.check.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zcloud.fire.check.domain.model.DateTimeE; +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.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-28 10:32:09 + */ +@Mapper +public interface FireCheckListMapper extends BaseMapper { + + FireCheckListDO getInfoById(Long id); + + IPage listPage(IPage iPage, Map params); + + IPage appCheckList(IPage iPage, Map params, DateTimeE dateTimeE); + + IPage riskDistribution(IPage iPage, Map params); + + IPage pointDistribution(IPage iPage, Map params); + + List getCheckPointList(Map params); + + IPage getBackChecKList(IPage iPage, Map params); + + + IPage checkListRecordList(IPage iPage, Map params, DateTimeE dateTimeE); + + IPage getCheckListRecord(IPage iPage, Map params, DateTimeE dateTimeE); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListUserMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListUserMapper.java new file mode 100644 index 0000000..33a3eca --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListUserMapper.java @@ -0,0 +1,27 @@ +package com.zcloud.fire.check.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.fire.check.persistence.dataobject.FireCheckListStatisticDO; +import com.zcloud.fire.check.persistence.dataobject.FireCheckListUserDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-11 15:32:49 + */ +@Mapper +public interface FireCheckListUserMapper extends BaseMapper { + + List getListUserNameByFireCheckIdList(List fireCheckIdList); + + List getListUserStatisticByFireCheckIdList(List fireCheckIdList); + + + List getListUserByFireCheckIdList(List fireCheckIdList); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckRecordDeviceMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckRecordDeviceMapper.java new file mode 100644 index 0000000..caa5376 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckRecordDeviceMapper.java @@ -0,0 +1,18 @@ +package com.zcloud.fire.check.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordDeviceDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-12 11:10:03 + */ +@Mapper +public interface FireCheckRecordDeviceMapper extends BaseMapper { + + void updateNormalNull(Long id); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckRecordHiddenMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckRecordHiddenMapper.java new file mode 100644 index 0000000..3fc5563 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckRecordHiddenMapper.java @@ -0,0 +1,17 @@ +package com.zcloud.fire.check.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordHiddenDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-12 11:11:15 + */ +@Mapper +public interface FireCheckRecordHiddenMapper extends BaseMapper { + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckRecordMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckRecordMapper.java new file mode 100644 index 0000000..1ccde24 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckRecordMapper.java @@ -0,0 +1,30 @@ +package com.zcloud.fire.check.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zcloud.fire.check.persistence.dataobject.DataStatisticDO; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordDO; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordStatisticDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-12 11:10:58 + */ +@Mapper +public interface FireCheckRecordMapper extends BaseMapper { + + IPage getCheckRecordList(IPage iPage, Map params); + + List statisticListByFireCheckIdList(List fireCheckIdList); + + List DataStatisticDO(List corpinfoIds); + + IPage getCheckRecordPageH5(IPage iPage, Map params); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckRecordPointMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckRecordPointMapper.java new file mode 100644 index 0000000..a28a202 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckRecordPointMapper.java @@ -0,0 +1,22 @@ +package com.zcloud.fire.check.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zcloud.fire.check.persistence.FireCheckPointListDO; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordPointDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-12 11:10:20 + */ +@Mapper +public interface FireCheckRecordPointMapper extends BaseMapper { + + IPage getCheckRecordPointList(IPage iPage, Map params); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckRecordUserMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckRecordUserMapper.java new file mode 100644 index 0000000..cf32003 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckRecordUserMapper.java @@ -0,0 +1,17 @@ +package com.zcloud.fire.check.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordUserDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-12 11:12:04 + */ +@Mapper +public interface FireCheckRecordUserMapper extends BaseMapper { + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireDeviceMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireDeviceMapper.java index d7904fb..8b943a3 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireDeviceMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireDeviceMapper.java @@ -2,6 +2,7 @@ package com.zcloud.fire.check.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zcloud.fire.check.persistence.dataobject.DataStatisticDO; import com.zcloud.fire.check.persistence.dataobject.FireDeviceDO; import com.zcloud.fire.check.persistence.dataobject.FireDeviceStatisticDO; import org.apache.ibatis.annotations.Mapper; @@ -24,5 +25,13 @@ public interface FireDeviceMapper extends BaseMapper { IPage getFireDevicePage(IPage iPage, Map params); List getAllList(@Param("params")Map params); + + FireDeviceDO getInfoById(Long id); + + List getDeviceListByFirePointId(String firePointId); + + List countByCorpinfoIds(List corpinfoIds); + + Long getFireDeviceCount(Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FirePointMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FirePointMapper.java index 60a9942..1395a6c 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FirePointMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FirePointMapper.java @@ -2,6 +2,7 @@ package com.zcloud.fire.check.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zcloud.fire.check.persistence.dataobject.DataStatisticDO; import com.zcloud.fire.check.persistence.dataobject.FirePointDO; import com.zcloud.fire.check.persistence.dataobject.FirePointStatisticDO; import org.apache.ibatis.annotations.Mapper; @@ -21,5 +22,13 @@ public interface FirePointMapper extends BaseMapper { List countByFireRegionIdIn(List fireRegionIds); IPage getFirePointPage(IPage iPage, Map params); + + FirePointDO getInfoById(Long id); + + FirePointDO getInfoByUUId(String firePointId); + + List countByCorpinfoIds(List corpinfoIds); + + Long getFirePointCount(Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireRegionMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireRegionMapper.java index dcb1b48..9ce8422 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireRegionMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireRegionMapper.java @@ -2,9 +2,11 @@ package com.zcloud.fire.check.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zcloud.fire.check.persistence.dataobject.DataStatisticDO; import com.zcloud.fire.check.persistence.dataobject.FireRegionDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; import java.util.Map; /** @@ -17,5 +19,9 @@ import java.util.Map; public interface FireRegionMapper extends BaseMapper { IPage getFireRegionPage(IPage iPage, Map params); + + List countByCorpinfoIds(List corpinfoIds); + + Long getFireRegionCount(Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/CorpInfoRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/CorpInfoRepository.java index 5c89f0a..1f392a6 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/CorpInfoRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/CorpInfoRepository.java @@ -4,6 +4,7 @@ import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; import com.zcloud.fire.check.persistence.dataobject.CorpInfoDO; +import java.util.List; import java.util.Map; /** @@ -20,5 +21,6 @@ public interface CorpInfoRepository extends BaseRepository { Long getTotalCount(); boolean isSupper(); + } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckListItemRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckListItemRepository.java new file mode 100644 index 0000000..d9f4a85 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckListItemRepository.java @@ -0,0 +1,26 @@ +package com.zcloud.fire.check.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.fire.check.persistence.dataobject.FireCheckListItemDO; +import com.zcloud.fire.check.persistence.dataobject.FireCheckListItemStatisticDO; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-28 10:32:29 + */ +public interface FireCheckListItemRepository extends BaseRepository { + PageResponse listPage(Map params); + + List listByFireCheckId(String fireCheckId); + + void deleteByFireCheckId(String fireCheckId); + + List statisticListByFireCheckIdList(List fireCheckIdList); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckListRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckListRepository.java new file mode 100644 index 0000000..87d8c78 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckListRepository.java @@ -0,0 +1,42 @@ +package com.zcloud.fire.check.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.fire.check.persistence.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 javax.validation.constraints.NotEmpty; +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-28 10:32:09 + */ +public interface FireCheckListRepository extends BaseRepository { + PageResponse listPage(Map params); + + FireCheckListDO getInfoById(Long id); + + PageResponse appCheckList(Map params); + + PageResponse riskDistribution(Map params); + + PageResponse pointDistribution(Map params); + + List getCheckPointList(Map params); + + PageResponse getBackChecKList(Map params); + + + PageResponse checkListRecordList(Map params); + + FireCheckListDO getInfoByUUIdState(String fireCheckId, Integer code); + + PageResponse getCheckListRecord(Map params); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckListUserRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckListUserRepository.java new file mode 100644 index 0000000..dcf9ae2 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckListUserRepository.java @@ -0,0 +1,30 @@ +package com.zcloud.fire.check.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.fire.check.persistence.dataobject.FireCheckListStatisticDO; +import com.zcloud.fire.check.persistence.dataobject.FireCheckListUserDO; + +import javax.validation.constraints.NotNull; +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-11 15:32:50 + */ +public interface FireCheckListUserRepository extends BaseRepository { + PageResponse listPage(Map params); + + void deleteByFireCheckListId(String fireCheckListId); + + List getListUserNameByFireCheckIdList(List fireCheckIdList); + + List getListUserStatisticByFireCheckIdList(List fireCheckIdList); + + + List getListUserByFireCheckIdList(List fireCheckIdList); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordDeviceRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordDeviceRepository.java new file mode 100644 index 0000000..e0ecf07 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordDeviceRepository.java @@ -0,0 +1,25 @@ +package com.zcloud.fire.check.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordDeviceDO; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-12 11:10:03 + */ +public interface FireCheckRecordDeviceRepository extends BaseRepository { + PageResponse listPage(Map params); + + List getBackChecKRecordPoiList(List idList); + + List getCheckRecordDeviceList(String fireRecordId); + + void updateNormalNull(Long id); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordHiddenRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordHiddenRepository.java new file mode 100644 index 0000000..9dbd173 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordHiddenRepository.java @@ -0,0 +1,44 @@ +package com.zcloud.fire.check.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.fire.check.domain.model.FireCheckRecordHiddenE; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordHiddenDO; +import com.zcloud.gbscommon.zcloudhidden.request.HiddenAddCmd; +import org.apache.commons.lang3.function.Failable; + +import javax.validation.constraints.NotEmpty; +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-12 11:11:16 + */ +public interface FireCheckRecordHiddenRepository extends BaseRepository { + PageResponse listPage(Map params); + + + List getChecKRecordDeviceList(List fireRecordDeviceIdList); + + List getChecKRecordHiddenList(String fireRecordId); + + FireCheckRecordHiddenDO listByFireCheckRecordDeviceId(String fireRecordDeviceId); + + void add(FireCheckRecordHiddenDO fireCheckRecordHiddenDO, HiddenAddCmd hiddenAddCmd); + + void updateHidden(FireCheckRecordHiddenDO d, HiddenAddCmd hiddenAddCmd); + + void deletedFireCheckRecordHiddenById(FireCheckRecordHiddenDO fireCheckRecordHiddenDO); + + void updateHiddenStatus(String fireRecordId, Boolean hiddenStatus); + + List getHiddenListByFireCheckId(@NotEmpty(message = "请选择消防点检") String fireCheckId, Integer code); + + List getHiddenList(@NotEmpty(message = "检查记录信息不能为空") String fireRecordId); + + List getByOtherCheckRecordId(@NotEmpty(message = "检查记录信息不能为空") String fireRecordId); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordPointRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordPointRepository.java new file mode 100644 index 0000000..69e008c --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordPointRepository.java @@ -0,0 +1,24 @@ +package com.zcloud.fire.check.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.fire.check.persistence.FireCheckPointListDO; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordPointDO; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-12 11:10:20 + */ +public interface FireCheckRecordPointRepository extends BaseRepository { + PageResponse listPage(Map params); + + List getInfoByFireCheckRecordId(String fireCheckId); + + PageResponse getCheckRecordPointList(Map params); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordRepository.java new file mode 100644 index 0000000..3af472e --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordRepository.java @@ -0,0 +1,33 @@ +package com.zcloud.fire.check.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.fire.check.persistence.dataobject.DataStatisticDO; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordDO; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordStatisticDO; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-12 11:10:59 + */ +public interface FireCheckRecordRepository extends BaseRepository { + PageResponse listPage(Map params); + + FireCheckRecordDO getNoFinishedInfoId(String fireCheckId); + + PageResponse getCheckRecordList(Map params); + + FireCheckRecordDO getChecKRecordInfo(String fireRecordId); + + List statisticListByFireCheckIdList(List fireCheckIdList); + + List DataStatisticDO(List corpinfoIds); + + PageResponse getCheckRecordPageH5(Map params); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordUserRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordUserRepository.java new file mode 100644 index 0000000..34fb376 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordUserRepository.java @@ -0,0 +1,21 @@ +package com.zcloud.fire.check.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordUserDO; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-12 11:12:04 + */ +public interface FireCheckRecordUserRepository extends BaseRepository { + PageResponse listPage(Map params); + + List getListByFireRecordId(String fireRecordId); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckStandardRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckStandardRepository.java index 96f9b61..5bfcf59 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckStandardRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckStandardRepository.java @@ -20,5 +20,7 @@ public interface FireCheckStandardRepository extends BaseRepository listAll(Map params); boolean addBatch(List fireCheckStandardDOList); + + List getCheckStandardList(List fireDeviceTypeList); } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireDeviceRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireDeviceRepository.java index 87a26a9..07f2991 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireDeviceRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireDeviceRepository.java @@ -2,6 +2,7 @@ package com.zcloud.fire.check.persistence.repository; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.fire.check.persistence.dataobject.DataStatisticDO; import com.zcloud.fire.check.persistence.dataobject.FireDeviceDO; import javax.validation.constraints.NotEmpty; @@ -28,5 +29,13 @@ public interface FireDeviceRepository extends BaseRepository { boolean addBatch(List fireDeviceDOS); List getAllList(Map params); + + FireDeviceDO getInfoById(Long id); + + Long getFireDeviceCount(); + + List getDeviceListByFirePointId(@NotEmpty(message = "消防点位id不能为空") String firePointId); + + List countByCorpinfoIds(List corpinfoIds); } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FirePointRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FirePointRepository.java index 9cb9cfc..fffa85c 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FirePointRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FirePointRepository.java @@ -2,6 +2,7 @@ package com.zcloud.fire.check.persistence.repository; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.fire.check.persistence.dataobject.DataStatisticDO; import com.zcloud.fire.check.persistence.dataobject.FirePointDO; import javax.validation.constraints.NotEmpty; @@ -29,5 +30,13 @@ public interface FirePointRepository extends BaseRepository { List listByFireRegionId(String fireRegionId); boolean existsByFirePointCode(@NotEmpty(message = "消防点位编码不能为空") String firePointCode); + + FirePointDO getInfoById(Long id); + + Long getFirePointCount(); + + FirePointDO getInfoByUUId(@NotEmpty(message = "消防点位id不能为空") String firePointId); + + List countByCorpinfoIds(List corpinfoIds); } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireRegionRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireRegionRepository.java index be3de76..fbf86b2 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireRegionRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireRegionRepository.java @@ -2,6 +2,7 @@ package com.zcloud.fire.check.persistence.repository; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.fire.check.persistence.dataobject.DataStatisticDO; import com.zcloud.fire.check.persistence.dataobject.FireRegionDO; import javax.validation.constraints.NotEmpty; @@ -23,5 +24,9 @@ public interface FireRegionRepository extends BaseRepository { List listByCorpinfoId(Long corpinfoId); boolean existsByFireRegionCode(@NotEmpty(message = "编码不能为空") String fireRegionCode); + + Long getFireRegionCount(); + + List countByCorpinfoIds(List corpinfoIds); } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/CorpInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/CorpInfoRepositoryImpl.java index 3fab81c..ac41876 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/CorpInfoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/CorpInfoRepositoryImpl.java @@ -16,6 +16,7 @@ import com.zcloud.gbscommon.utils.Query; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Map; /** @@ -59,12 +60,11 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl implements FireCheckListItemRepository { + private final FireCheckListItemMapper fireCheckListItemMapper; + + @Override + public PageResponse listPage(Map params) { + IPage iPage = new Query().getPage(params); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + queryWrapper.orderByDesc("create_time"); + IPage result = fireCheckListItemMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public List listByFireCheckId(String fireCheckId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_check_id", fireCheckId); + return fireCheckListItemMapper.selectList(queryWrapper); + } + @Override + public void deleteByFireCheckId(String fireCheckId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_check_id", fireCheckId); + fireCheckListItemMapper.delete(queryWrapper); + } + + @Override + public List statisticListByFireCheckIdList(List fireCheckIdList) { + return fireCheckListItemMapper.statisticListByFireCheckIdList(fireCheckIdList); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java new file mode 100644 index 0000000..0c647b1 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java @@ -0,0 +1,166 @@ +package com.zcloud.fire.check.persistence.repository.impl; + +import cn.hutool.core.collection.CollUtil; +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.jjb.saas.framework.repository.common.PageHelper; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.fire.check.domain.model.CorpInfoE; +import com.zcloud.fire.check.domain.model.DateTimeE; +import com.zcloud.fire.check.domain.model.FireCheckListE; +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 com.zcloud.fire.check.persistence.mapper.FireCheckListMapper; +import com.zcloud.fire.check.persistence.repository.CorpInfoRepository; +import com.zcloud.fire.check.persistence.repository.FireCheckListRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-11-28 10:32:09 + */ +@Service +@RequiredArgsConstructor +public class FireCheckListRepositoryImpl extends BaseRepositoryImpl implements FireCheckListRepository { + private final FireCheckListMapper fireCheckListMapper; + private final CorpInfoRepository corpInfoRepository; + + @Override + public PageResponse listPage(Map params) { + IPage iPage = new Query().getPage(params); + if (params.get("corpinfoId") != null && StringUtils.isNotEmpty(params.get("corpinfoId").toString())) { + params.put("corpinfoId", params.get("corpinfoId")); + } else { + if(!corpInfoRepository.isSupper()){ + params.put("corpinfoId", AuthContext.getTenantId()); + if(!CorpInfoE.isCorp()){ + //是个人，只能查询自己的清单 + params.put("userId", AuthContext.getUserId()); + } + } + } + IPage result = fireCheckListMapper.listPage(iPage, params); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public FireCheckListDO getInfoById(Long id) { + return fireCheckListMapper.getInfoById(id); + } + + @Override + public PageResponse appCheckList(Map params) { + IPage iPage = new Query().getPage(params); + if (params.get("corpinfoId") != null && StringUtils.isNotEmpty(params.get("corpinfoId").toString())) { + params.put("corpinfoId", params.get("corpinfoId")); + } else { + if(!corpInfoRepository.isSupper()){ + params.put("corpinfoId", AuthContext.getTenantId()); + if(!CorpInfoE.isCorp()){ + //是个人，只能查询自己的清单 + params.put("userId", AuthContext.getUserId()); + } + } + } + params.put("currentTime", new Date()); + FireCheckListE fireCheckListE = new FireCheckListE(); + DateTimeE dateTimeE = fireCheckListE.getCheckRecordInterval(null); + IPage result = fireCheckListMapper.appCheckList(iPage, params,dateTimeE); + + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public PageResponse riskDistribution(Map params) { + IPage iPage = new Query().getPage(params); + IPage result = fireCheckListMapper.riskDistribution(iPage, params); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public PageResponse pointDistribution(Map params) { + IPage iPage = new Query().getPage(params); + IPage result = fireCheckListMapper.pointDistribution(iPage, params); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public List getCheckPointList(Map params) { + return fireCheckListMapper.getCheckPointList( params); + } + + @Override + public PageResponse getBackChecKList(Map params) { + IPage iPage = new Query().getPage(params); + IPage result = fireCheckListMapper.getBackChecKList(iPage, params); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + + + @Override + public PageResponse checkListRecordList(Map params) { + IPage iPage = new Query().getPage(params); + if (params.get("corpinfoId") != null && StringUtils.isNotEmpty(params.get("corpinfoId").toString())) { + params.put("corpinfoId", params.get("corpinfoId")); + } else { + if(!corpInfoRepository.isSupper()){ + params.put("corpinfoId", AuthContext.getTenantId()); + if(!CorpInfoE.isCorp()){ + //是个人，只能查询自己的清单 + params.put("userId", AuthContext.getUserId()); + } + } + } + FireCheckListE fireCheckListE = new FireCheckListE(); + DateTimeE dateTimeE = fireCheckListE.getCheckRecordInterval(null); + IPage result = fireCheckListMapper.checkListRecordList(iPage, params,dateTimeE); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + + @Override + public FireCheckListDO getInfoByUUIdState(String fireCheckId, Integer state) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_check_id", fireCheckId); + queryWrapper.eq("state", state); + return fireCheckListMapper.selectOne(queryWrapper); + } + + @Override + public PageResponse getCheckListRecord(Map params) { + IPage iPage = new Query().getPage(params); + if (params.get("corpinfoId") != null && StringUtils.isNotEmpty(params.get("corpinfoId").toString())) { + params.put("corpinfoId", params.get("corpinfoId")); + } else { + if(!corpInfoRepository.isSupper()){ + params.put("corpinfoId", AuthContext.getTenantId()); + if(!CorpInfoE.isCorp()){ + //是个人，只能查询自己的清单 + params.put("userId", AuthContext.getUserId()); + } + } + } + FireCheckListE fireCheckListE = new FireCheckListE(); + DateTimeE dateTimeE = fireCheckListE.getCheckRecordInterval(null); + IPage result = fireCheckListMapper.getCheckListRecord(iPage, params,dateTimeE); + return PageHelper.pageToResponse(result, result.getRecords()); + + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListUserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListUserRepositoryImpl.java new file mode 100644 index 0000000..69138ac --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListUserRepositoryImpl.java @@ -0,0 +1,65 @@ +package com.zcloud.fire.check.persistence.repository.impl; + +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.repository.common.PageHelper; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.fire.check.persistence.dataobject.FireCheckListStatisticDO; +import com.zcloud.fire.check.persistence.dataobject.FireCheckListUserDO; +import com.zcloud.fire.check.persistence.mapper.FireCheckListUserMapper; +import com.zcloud.fire.check.persistence.repository.FireCheckListUserRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-11 15:32:50 + */ +@Service +@RequiredArgsConstructor +public class FireCheckListUserRepositoryImpl extends BaseRepositoryImpl implements FireCheckListUserRepository { + private final FireCheckListUserMapper fireCheckListUserMapper; + + @Override + public PageResponse listPage(Map params) { + IPage iPage = new Query().getPage(params); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + queryWrapper.orderByDesc("create_time"); + IPage result = fireCheckListUserMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public void deleteByFireCheckListId(String fireCheckListId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_check_id", fireCheckListId); + fireCheckListUserMapper.delete(queryWrapper); + } + + @Override + public List getListUserNameByFireCheckIdList(List fireCheckIdList) { + return fireCheckListUserMapper.getListUserNameByFireCheckIdList(fireCheckIdList); + } + + @Override + public List getListUserStatisticByFireCheckIdList(List fireCheckIdList) { + return fireCheckListUserMapper.getListUserStatisticByFireCheckIdList(fireCheckIdList); + } + + + + @Override + public List getListUserByFireCheckIdList(List fireCheckIdList) { + return fireCheckListUserMapper.getListUserByFireCheckIdList(fireCheckIdList); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordDeviceRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordDeviceRepositoryImpl.java new file mode 100644 index 0000000..df835b7 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordDeviceRepositoryImpl.java @@ -0,0 +1,62 @@ +package com.zcloud.fire.check.persistence.repository.impl; + +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.repository.common.PageHelper; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.fire.check.domain.enums.FireCheckRecordPointCheckedFlagEnum; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordDeviceDO; +import com.zcloud.fire.check.persistence.mapper.FireCheckRecordDeviceMapper; +import com.zcloud.fire.check.persistence.repository.FireCheckRecordDeviceRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-12 11:10:03 + */ +@Service +@RequiredArgsConstructor +public class FireCheckRecordDeviceRepositoryImpl extends BaseRepositoryImpl implements FireCheckRecordDeviceRepository { + private final FireCheckRecordDeviceMapper fireCheckRecordDeviceMapper; + + @Override + public PageResponse listPage(Map params) { + IPage iPage = new Query().getPage(params); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + queryWrapper.orderByDesc("create_time"); + IPage result = fireCheckRecordDeviceMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public List getBackChecKRecordPoiList(List idList) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("fire_record_point_id", idList); + queryWrapper.eq("checked_flag", FireCheckRecordPointCheckedFlagEnum.REJECTED.getCode()); + return fireCheckRecordDeviceMapper.selectList(queryWrapper); + } + + @Override + public List getCheckRecordDeviceList(String fireRecordId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_record_id", fireRecordId); + queryWrapper.orderByDesc("create_time"); + return fireCheckRecordDeviceMapper.selectList(queryWrapper); + } + + @Override + public void updateNormalNull(Long id) { + fireCheckRecordDeviceMapper.updateNormalNull(id); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordHiddenRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordHiddenRepositoryImpl.java new file mode 100644 index 0000000..efe18ea --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordHiddenRepositoryImpl.java @@ -0,0 +1,157 @@ +package com.zcloud.fire.check.persistence.repository.impl; + +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.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.repository.common.PageHelper; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.fire.check.domain.enums.HiddenCheckTypeEnum; +import com.zcloud.fire.check.domain.model.FireCheckRecordHiddenE; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordHiddenDO; +import com.zcloud.fire.check.persistence.mapper.FireCheckRecordHiddenMapper; +import com.zcloud.fire.check.persistence.repository.FireCheckRecordHiddenRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import com.zcloud.gbscommon.zcloudhidden.face.ZcloudHiddenFacade; +import com.zcloud.gbscommon.zcloudhidden.request.HiddenAddCmd; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.exception.ExceptionUtils; +import org.apache.dubbo.config.annotation.DubboReference; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-12 11:11:16 + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class FireCheckRecordHiddenRepositoryImpl extends BaseRepositoryImpl implements FireCheckRecordHiddenRepository { + private final FireCheckRecordHiddenMapper fireCheckRecordHiddenMapper; + @DubboReference + private ZcloudHiddenFacade zcloudHiddenFacade; + @Override + public PageResponse listPage(Map params) { + IPage iPage = new Query().getPage(params); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + queryWrapper.orderByDesc("create_time"); + IPage result = fireCheckRecordHiddenMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public List getChecKRecordDeviceList(List fireRecordDeviceIdList) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("fire_record_device_id", fireRecordDeviceIdList); + queryWrapper.eq("hidden_check_type", HiddenCheckTypeEnum.CHECK_ITEM_HIDDEN.getCode()); + return fireCheckRecordHiddenMapper.selectList(queryWrapper); + } + + @Override + public List getChecKRecordHiddenList(String fireRecordId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_record_id", fireRecordId); + return fireCheckRecordHiddenMapper.selectList(queryWrapper); + } + + @Override + public FireCheckRecordHiddenDO listByFireCheckRecordDeviceId(String fireRecordDeviceId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_record_device_id", fireRecordDeviceId); + queryWrapper.eq("hidden_check_type", HiddenCheckTypeEnum.CHECK_ITEM_HIDDEN.getCode()); + return fireCheckRecordHiddenMapper.selectOne(queryWrapper); + } + + @Override + public void add(FireCheckRecordHiddenDO fireCheckRecordHiddenDO, HiddenAddCmd hiddenAddCmd) { + save(fireCheckRecordHiddenDO); + // 调用dubbo接口新增隐患信息 + try { + log.info("新增隐患记录，checkrecord:{},参数：{}", fireCheckRecordHiddenDO.getFireRecordId(), JSONUtil.toJsonStr(hiddenAddCmd)); + SingleResponse singleResponse = zcloudHiddenFacade.addHidden(hiddenAddCmd); + log.info("新增隐患记录，checkrecord:{},隐患id：{}，返回结果：{}", fireCheckRecordHiddenDO.getFireRecordId(), hiddenAddCmd.getHiddenId(), JSONUtil.toJsonStr(singleResponse)); + } catch (Exception e) { + log.error("新增隐患记录，checkrecord:{},隐患id：{}，返回结果：{}", fireCheckRecordHiddenDO.getFireRecordId(), JSONUtil.toJsonStr(hiddenAddCmd), ExceptionUtils.getStackTrace(e)); + throw new BizException("新增隐患信息失败:{}",e.getMessage()); + } + } + + @Override + public void updateHidden(FireCheckRecordHiddenDO fireCheckRecordHiddenDO, HiddenAddCmd hiddenAddCmd) { + updateById(fireCheckRecordHiddenDO); + // 调用dubbo接口更新隐患信息 + try { + log.info("更新隐患记录，checkrecord:{},参数：{}", fireCheckRecordHiddenDO.getFireRecordId(), JSONUtil.toJsonStr(hiddenAddCmd)); + SingleResponse singleResponse = zcloudHiddenFacade.updateHidden(hiddenAddCmd); + }catch (Exception e){ + log.error("修改隐患记录，checkrecord:{},隐患id：{}，返回结果：{}", fireCheckRecordHiddenDO.getFireRecordId(), JSONUtil.toJsonStr(hiddenAddCmd), ExceptionUtils.getStackTrace(e)); + throw new BizException("修改隐患信息失败:{}",e.getMessage()); + } + } + + @Override + public void deletedFireCheckRecordHiddenById(FireCheckRecordHiddenDO fireCheckRecordHiddenDO) { + removeById(fireCheckRecordHiddenDO); + + HiddenAddCmd hiddenDeleteCmd = new HiddenAddCmd(); + hiddenDeleteCmd.setHiddenId(fireCheckRecordHiddenDO.getHiddenId()); + try { + log.info("删除隐患记录，checkrecord:{},参数：{}", fireCheckRecordHiddenDO.getFireRecordId(), JSONUtil.toJsonStr(hiddenDeleteCmd)); + SingleResponse singleResponse = zcloudHiddenFacade.deleteHidden(hiddenDeleteCmd); + log.info("删除隐患记录，checkrecord:{},隐患id：{}，返回结果：{}", fireCheckRecordHiddenDO.getFireRecordId(), fireCheckRecordHiddenDO.getHiddenId(), JSONUtil.toJsonStr(singleResponse)); + } catch (Exception e) { + log.error("删除隐患记录，checkrecord:{},隐患id：{}，返回结果：{}", fireCheckRecordHiddenDO.getFireRecordId(), JSONUtil.toJsonStr(hiddenDeleteCmd), ExceptionUtils.getStackTrace(e)); + throw new BizException("删除隐患信息失败:{}",e.getMessage()); + } + } + + @Override + public void updateHiddenStatus(String fireRecordId, Boolean hiddenStatus) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_record_id", fireRecordId); + List fireCheckRecordHiddenDOList = fireCheckRecordHiddenMapper.selectList(queryWrapper); + if(CollUtil.isNotEmpty(fireCheckRecordHiddenDOList) || hiddenStatus){ + HiddenAddCmd updateHiddenStatusCmd = new HiddenAddCmd(); + updateHiddenStatusCmd.setForeignKey(fireRecordId); + updateHiddenStatusCmd.setState(100); + log.info("更新隐患状态，请求参数：{}", JSONUtil.toJsonStr(updateHiddenStatusCmd)); + SingleResponse singleResponse = zcloudHiddenFacade.updateHiddenStatus(updateHiddenStatusCmd); + log.info("更新隐患状态，返回结果：{}", JSONUtil.toJsonStr(singleResponse)); + } + } + + @Override + public List getHiddenListByFireCheckId(String fireCheckId, Integer code) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_check_id", fireCheckId); + queryWrapper.eq("hidden_check_type", code); + return fireCheckRecordHiddenMapper.selectList(queryWrapper); + } + + @Override + public List getHiddenList(String fireRecordId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_record_id", fireRecordId); + return fireCheckRecordHiddenMapper.selectList(queryWrapper); + } + + @Override + public List getByOtherCheckRecordId(String fireRecordId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_record_id", fireRecordId); + queryWrapper.eq("hidden_check_type", HiddenCheckTypeEnum.OTHER_HIDDEN.getCode()); + return fireCheckRecordHiddenMapper.selectList(queryWrapper); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordPointRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordPointRepositoryImpl.java new file mode 100644 index 0000000..ce916af --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordPointRepositoryImpl.java @@ -0,0 +1,60 @@ +package com.zcloud.fire.check.persistence.repository.impl; + +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.repository.common.PageHelper; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.fire.check.domain.enums.FireCheckRecordPointCheckedFlagEnum; +import com.zcloud.fire.check.persistence.FireCheckPointListDO; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordDO; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordPointDO; +import com.zcloud.fire.check.persistence.mapper.FireCheckRecordPointMapper; +import com.zcloud.fire.check.persistence.repository.FireCheckRecordPointRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-12 11:10:20 + */ +@Service +@RequiredArgsConstructor +public class FireCheckRecordPointRepositoryImpl extends BaseRepositoryImpl implements FireCheckRecordPointRepository { + private final FireCheckRecordPointMapper fireCheckRecordPointMapper; + + @Override + public PageResponse listPage(Map params) { + IPage iPage = new Query().getPage(params); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + queryWrapper.orderByDesc("create_time"); + IPage result = fireCheckRecordPointMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public List getInfoByFireCheckRecordId(String fireCheckId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_record_id", fireCheckId); + queryWrapper.eq("checked_flag", FireCheckRecordPointCheckedFlagEnum.CHECKED.getCode()); + + queryWrapper.orderByDesc("create_time"); + List fireCheckRecordPointDOS = fireCheckRecordPointMapper.selectList(queryWrapper); + return fireCheckRecordPointDOS; + } + @Override + public PageResponse getCheckRecordPointList(Map params) { + IPage iPage = new Query().getPage(params); + IPage result = fireCheckRecordPointMapper.getCheckRecordPointList(iPage, params); + return PageHelper.pageToResponse(result, result.getRecords()); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordRepositoryImpl.java new file mode 100644 index 0000000..0100615 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordRepositoryImpl.java @@ -0,0 +1,107 @@ +package com.zcloud.fire.check.persistence.repository.impl; + +import cn.hutool.core.collection.CollUtil; +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.jjb.saas.framework.repository.common.PageHelper; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.fire.check.domain.enums.CommonFlagEnum; +import com.zcloud.fire.check.domain.model.CorpInfoE; +import com.zcloud.fire.check.persistence.dataobject.DataStatisticDO; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordDO; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordStatisticDO; +import com.zcloud.fire.check.persistence.mapper.FireCheckRecordMapper; +import com.zcloud.fire.check.persistence.repository.CorpInfoRepository; +import com.zcloud.fire.check.persistence.repository.FireCheckRecordRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.stereotype.Service; + +import java.time.LocalDate; +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-12 11:10:59 + */ +@Service +@RequiredArgsConstructor +public class FireCheckRecordRepositoryImpl extends BaseRepositoryImpl implements FireCheckRecordRepository { + private final FireCheckRecordMapper fireCheckRecordMapper; + private final CorpInfoRepository corpInfoRepository; + @Override + public PageResponse listPage(Map params) { + IPage iPage = new Query().getPage(params); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + queryWrapper.orderByDesc("create_time"); + IPage result = fireCheckRecordMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public FireCheckRecordDO getNoFinishedInfoId(String fireCheckId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_check_id", fireCheckId); + queryWrapper.eq("finished_flag", CommonFlagEnum.NO.getCode()); + queryWrapper.le("period_start", LocalDate.now().toString()); + queryWrapper.ge("period_end", LocalDate.now().toString()); + + queryWrapper.orderByDesc("create_time"); + List fireCheckRecordDOList = fireCheckRecordMapper.selectList(queryWrapper); + if(CollUtil.isNotEmpty(fireCheckRecordDOList)){ + return fireCheckRecordDOList.get(0); + } + return null; + } + + @Override + public PageResponse getCheckRecordList(Map params) { + IPage iPage = new Query().getPage(params); + if (params.get("corpinfoId") != null && StringUtils.isNotEmpty(params.get("corpinfoId").toString())) { + params.put("corpinfoId", params.get("corpinfoId")); + } else { + if(!corpInfoRepository.isSupper()){ + params.put("corpinfoId", AuthContext.getTenantId()); + if(!CorpInfoE.isCorp()){ + //是个人，只能查询自己的清单 + params.put("userId", AuthContext.getUserId()); + } + } + } + IPage result = fireCheckRecordMapper.getCheckRecordList(iPage, params); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public FireCheckRecordDO getChecKRecordInfo(String fireRecordId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_record_id", fireRecordId); + return fireCheckRecordMapper.selectOne(queryWrapper); + } + + @Override + public List statisticListByFireCheckIdList(List fireCheckIdList) { + return fireCheckRecordMapper.statisticListByFireCheckIdList(fireCheckIdList); + } + + @Override + public List DataStatisticDO(List corpinfoIds) { + return fireCheckRecordMapper.DataStatisticDO(corpinfoIds); + } + + @Override + public PageResponse getCheckRecordPageH5(Map params) { + IPage iPage = new Query().getPage(params); + IPage result = fireCheckRecordMapper.getCheckRecordPageH5(iPage, params); + return PageHelper.pageToResponse(result, result.getRecords()); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordUserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordUserRepositoryImpl.java new file mode 100644 index 0000000..9188f06 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckRecordUserRepositoryImpl.java @@ -0,0 +1,47 @@ +package com.zcloud.fire.check.persistence.repository.impl; + +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.repository.common.PageHelper; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordUserDO; +import com.zcloud.fire.check.persistence.mapper.FireCheckRecordUserMapper; +import com.zcloud.fire.check.persistence.repository.FireCheckRecordUserRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2025-12-12 11:12:04 + */ +@Service +@RequiredArgsConstructor +public class FireCheckRecordUserRepositoryImpl extends BaseRepositoryImpl implements FireCheckRecordUserRepository { + private final FireCheckRecordUserMapper fireCheckRecordUserMapper; + + @Override + public PageResponse listPage(Map params) { + IPage iPage = new Query().getPage(params); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + queryWrapper.orderByDesc("create_time"); + IPage result = fireCheckRecordUserMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public List getListByFireRecordId(String fireRecordId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("fire_record_id", fireRecordId); + return fireCheckRecordUserMapper.selectList(queryWrapper); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckStandardRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckStandardRepositoryImpl.java index 64d696d..b69b441 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckStandardRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckStandardRepositoryImpl.java @@ -33,7 +33,7 @@ public class FireCheckStandardRepositoryImpl extends BaseRepositoryImpl iPage = new Query().getPage(params); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); - queryWrapper.orderByDesc("create_time"); + queryWrapper.orderByDesc("device_name").orderByDesc("fire_device_type").orderByDesc("create_time"); IPage result = fireCheckStandardMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); } @@ -50,5 +50,12 @@ public class FireCheckStandardRepositoryImpl extends BaseRepositoryImpl getCheckStandardList(List fireDeviceTypeList) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("fire_device_type", fireDeviceTypeList); + return fireCheckStandardMapper.selectList(queryWrapper); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireDeviceRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireDeviceRepositoryImpl.java index 7b6870a..c5edb8b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireDeviceRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireDeviceRepositoryImpl.java @@ -6,10 +6,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; -import com.zcloud.fire.check.persistence.dataobject.FireDeviceDO; -import com.zcloud.fire.check.persistence.dataobject.FireDeviceStatisticDO; -import com.zcloud.fire.check.persistence.dataobject.FirePointDO; -import com.zcloud.fire.check.persistence.dataobject.FirePointStatisticDO; +import com.zcloud.fire.check.domain.enums.CorpTypeEnum; +import com.zcloud.fire.check.domain.enums.UserTypeEnum; +import com.zcloud.fire.check.persistence.dataobject.*; import com.zcloud.fire.check.persistence.mapper.FireDeviceMapper; import com.zcloud.fire.check.persistence.repository.CorpInfoRepository; import com.zcloud.fire.check.persistence.repository.FireDeviceRepository; @@ -19,6 +18,7 @@ import lombok.RequiredArgsConstructor; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -40,15 +40,13 @@ public class FireDeviceRepositoryImpl extends BaseRepositoryImpl iPage = new Query().getPage(params); if (params.get("corpinfoId") != null && StringUtils.isNotEmpty(params.get("corpinfoId").toString())) { params.put("corpinfoId", params.get("corpinfoId")); + } else { + params.put("corpinfoId", AuthContext.getTenantId()); } - else { - if(!corpInfoRepository.isSupper()){ - params.put("corpinfoId", AuthContext.getTenantId()); - } - } - IPage result =fireDeviceMapper.getFireDevicePage(iPage,params); + IPage result = fireDeviceMapper.getFireDevicePage(iPage, params); return PageHelper.pageToResponse(result, result.getRecords()); } + @Override public long countByFirePointId(String firePointId) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -87,14 +85,37 @@ public class FireDeviceRepositoryImpl extends BaseRepositoryImpl getAllList(Map params) { if (params.get("corpinfoId") != null && StringUtils.isNotEmpty(params.get("corpinfoId").toString())) { params.put("corpinfoId", params.get("corpinfoId")); - } - else { - if(!corpInfoRepository.isSupper()){ + } else { + if (!corpInfoRepository.isSupper()) { params.put("corpinfoId", AuthContext.getTenantId()); } } - List result =fireDeviceMapper.getAllList(params); + List result = fireDeviceMapper.getAllList(params); return result; } + + @Override + public FireDeviceDO getInfoById(Long id) { + return fireDeviceMapper.getInfoById(id); + } + + @Override + public Long getFireDeviceCount() { + Map params = new HashMap<>(); + params.put("corpTypeList", CorpTypeEnum.getCodesByEnterpriseType(UserTypeEnum.QY.getCode())); + Long count = fireDeviceMapper.getFireDeviceCount(params); + + return count; + } + + @Override + public List getDeviceListByFirePointId(String firePointId) { + return fireDeviceMapper.getDeviceListByFirePointId(firePointId); + } + + @Override + public List countByCorpinfoIds(List corpinfoIds) { + return fireDeviceMapper.countByCorpinfoIds(corpinfoIds); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FirePointRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FirePointRepositoryImpl.java index f6fee89..03abe45 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FirePointRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FirePointRepositoryImpl.java @@ -6,6 +6,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.fire.check.domain.enums.CorpTypeEnum; +import com.zcloud.fire.check.domain.enums.FireRegionStateEnum; +import com.zcloud.fire.check.domain.enums.UserTypeEnum; +import com.zcloud.fire.check.persistence.dataobject.DataStatisticDO; import com.zcloud.fire.check.persistence.dataobject.FirePointDO; import com.zcloud.fire.check.persistence.dataobject.FirePointStatisticDO; import com.zcloud.fire.check.persistence.dataobject.FireRegionDO; @@ -18,6 +22,7 @@ import lombok.RequiredArgsConstructor; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -39,13 +44,12 @@ public class FirePointRepositoryImpl extends BaseRepositoryImpl iPage = new Query().getPage(params); if (params.get("corpinfoId") != null && StringUtils.isNotEmpty(params.get("corpinfoId").toString())) { params.put("corpinfoId", params.get("corpinfoId")); + } else { +// if(!corpInfoRepository.isSupper()){ + params.put("corpinfoId", AuthContext.getTenantId()); +// } } - else { - if(!corpInfoRepository.isSupper()){ - params.put("corpinfoId", AuthContext.getTenantId()); - } - } - IPage result =firePointMapper.getFirePointPage(iPage,params); + IPage result = firePointMapper.getFirePointPage(iPage, params); return PageHelper.pageToResponse(result, result.getRecords()); @@ -89,11 +93,36 @@ public class FirePointRepositoryImpl extends BaseRepositoryImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("fire_point_code", firePointCode); return firePointMapper.selectCount(queryWrapper) > 0; } + + @Override + public FirePointDO getInfoById(Long id) { + return firePointMapper.getInfoById(id); + } + + @Override + public Long getFirePointCount() { + Map params = new HashMap<>(); + params.put("corpTypeList", CorpTypeEnum.getCodesByEnterpriseType(UserTypeEnum.QY.getCode())); + Long count = firePointMapper.getFirePointCount(params); + + return count; + } + + @Override + public FirePointDO getInfoByUUId(String firePointId) { + return firePointMapper.getInfoByUUId(firePointId); + } + + @Override + public List countByCorpinfoIds(List corpinfoIds) { + return firePointMapper.countByCorpinfoIds(corpinfoIds); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireRegionRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireRegionRepositoryImpl.java index 8d7de9e..ffa2821 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireRegionRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireRegionRepositoryImpl.java @@ -7,8 +7,11 @@ import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.fire.check.domain.enums.CommonFlagEnum; +import com.zcloud.fire.check.domain.enums.CorpTypeEnum; import com.zcloud.fire.check.domain.enums.FireRegionStateEnum; +import com.zcloud.fire.check.domain.enums.UserTypeEnum; import com.zcloud.fire.check.domain.model.CorpInfoE; +import com.zcloud.fire.check.persistence.dataobject.DataStatisticDO; import com.zcloud.fire.check.persistence.dataobject.FireRegionDO; import com.zcloud.fire.check.persistence.mapper.FireRegionMapper; import com.zcloud.fire.check.persistence.repository.CorpInfoRepository; @@ -19,6 +22,7 @@ import lombok.RequiredArgsConstructor; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -40,9 +44,9 @@ public class FireRegionRepositoryImpl extends BaseRepositoryImpl iPage = new Query().getPage(params); IPage result =fireRegionMapper.getFireRegionPage(iPage,params); @@ -69,6 +73,18 @@ public class FireRegionRepositoryImpl extends BaseRepositoryImpl 0; } + @Override + public Long getFireRegionCount() { + Map params = new HashMap<>(); + params.put("state", FireRegionStateEnum.ENABLE.getCode()); + params.put("corpTypeList", CorpTypeEnum.getCodesByEnterpriseType(UserTypeEnum.QY.getCode())); + Long count = fireRegionMapper.getFireRegionCount(params); + return count; + } + @Override + public List countByCorpinfoIds(List corpinfoIds) { + return fireRegionMapper.countByCorpinfoIds(corpinfoIds); + } } diff --git a/web-infrastructure/src/main/resources/mapper/FireCheckListItemMapper.xml b/web-infrastructure/src/main/resources/mapper/FireCheckListItemMapper.xml new file mode 100644 index 0000000..b96c41d --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/FireCheckListItemMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/FireCheckListMapper.xml b/web-infrastructure/src/main/resources/mapper/FireCheckListMapper.xml new file mode 100644 index 0000000..286158d --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/FireCheckListMapper.xml @@ -0,0 +1,335 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/FireCheckListUserMapper.xml b/web-infrastructure/src/main/resources/mapper/FireCheckListUserMapper.xml new file mode 100644 index 0000000..8cf3625 --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/FireCheckListUserMapper.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/FireCheckRecordDeviceMapper.xml b/web-infrastructure/src/main/resources/mapper/FireCheckRecordDeviceMapper.xml new file mode 100644 index 0000000..67b70be --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/FireCheckRecordDeviceMapper.xml @@ -0,0 +1,15 @@ + + + + + + + UPDATE fire_check_record_device + SET normal_flag=null + + WHERE id = #{id} + AND delete_enum = 'FALSE' + + + diff --git a/web-infrastructure/src/main/resources/mapper/FireCheckRecordHiddenMapper.xml b/web-infrastructure/src/main/resources/mapper/FireCheckRecordHiddenMapper.xml new file mode 100644 index 0000000..edd23b7 --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/FireCheckRecordHiddenMapper.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/FireCheckRecordMapper.xml b/web-infrastructure/src/main/resources/mapper/FireCheckRecordMapper.xml new file mode 100644 index 0000000..5c2c27d --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/FireCheckRecordMapper.xml @@ -0,0 +1,88 @@ + + + + + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/FireCheckRecordPointMapper.xml b/web-infrastructure/src/main/resources/mapper/FireCheckRecordPointMapper.xml new file mode 100644 index 0000000..f4290f8 --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/FireCheckRecordPointMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/FireCheckRecordUserMapper.xml b/web-infrastructure/src/main/resources/mapper/FireCheckRecordUserMapper.xml new file mode 100644 index 0000000..22e61a0 --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/FireCheckRecordUserMapper.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/FireDeviceMapper.xml b/web-infrastructure/src/main/resources/mapper/FireDeviceMapper.xml index 68c3ec6..fee2ac5 100644 --- a/web-infrastructure/src/main/resources/mapper/FireDeviceMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/FireDeviceMapper.xml @@ -15,6 +15,7 @@ SELECT d.*, + r.department_id as departmentId, p.fire_point_name as firePointName, r.fire_region_name as fireRegionName, r.fire_region_code as fireRegionCode, p.fire_point_code as firePointCode, dp.name as departmentName, - u.name as userName + u.name as userName, + po.post_name as userPostName FROM fire_device d LEFT JOIN fire_point p ON d.fire_point_id = p.fire_point_id LEFT JOIN fire_region r ON p.fire_region_id = r.fire_region_id - LEFT JOIN department dp ON d.department_id = dp.id + LEFT JOIN department dp ON r.department_id = dp.id LEFT JOIN user u ON u.id = p.user_id + left join post po on u.post_id = po.id WHERE d.delete_enum = 'false' AND d.corpinfo_id = #{params.corpinfoId} @@ -84,6 +88,12 @@ #{id} + + AND d.fire_device_id IN + + #{id} + + AND d.fire_point_id = #{params.firePointId} @@ -100,7 +110,7 @@ AND d.fire_device_code LIKE CONCAT('%', #{params.fireDeviceCode}, '%') - AND d.department_id IN + AND r.department_id IN #{departmentId} @@ -115,5 +125,61 @@ order by d.create_time desc + + + + diff --git a/web-infrastructure/src/main/resources/mapper/FirePointMapper.xml b/web-infrastructure/src/main/resources/mapper/FirePointMapper.xml index 41c0a52..3bcb714 100644 --- a/web-infrastructure/src/main/resources/mapper/FirePointMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/FirePointMapper.xml @@ -16,12 +16,13 @@ + + + + diff --git a/web-infrastructure/src/main/resources/mapper/FireRegionMapper.xml b/web-infrastructure/src/main/resources/mapper/FireRegionMapper.xml index 46deeef..baa7a5e 100644 --- a/web-infrastructure/src/main/resources/mapper/FireRegionMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/FireRegionMapper.xml @@ -23,8 +23,34 @@ and fr.department_id = #{params.departmentId} + + and fr.state = #{params.state} + order by fr.create_time desc + +