diff --git a/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenAcceptRecordController.java b/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenAcceptRecordController.java new file mode 100644 index 0000000..9f16b40 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenAcceptRecordController.java @@ -0,0 +1,82 @@ +package com.zcloud.key.project.web.hidden; + + +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.key.project.api.hidden.HiddenAcceptRecordServiceI; +import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordAddCmd; +import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordPageQry; +import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordUpdateCmd; +import com.zcloud.key.project.dto.clientobject.hidden.HiddenAcceptRecordCO; +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 2026-03-20 11:33:08 + */ +@Api(tags = "隐患验收记录") +@RequestMapping("/${application.gateway}/hiddenAcceptRecord") +@RestController +@AllArgsConstructor +public class HiddenAcceptRecordController { + private final HiddenAcceptRecordServiceI hiddenAcceptRecordService; + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody HiddenAcceptRecordAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + return hiddenAcceptRecordService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody HiddenAcceptRecordPageQry qry) { + return hiddenAcceptRecordService.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 HiddenAcceptRecordCO()); + } + + @ApiOperation("删除") + @DeleteMapping("/{id}") + public Response remove(@PathVariable("id") Long id) { + hiddenAcceptRecordService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("删除多个") + @DeleteMapping("/ids") + public Response removeBatch(@RequestParam Long[] ids) { + hiddenAcceptRecordService.removeBatch(ids); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改") + @PutMapping("/edit") + public SingleResponse edit(@Validated @RequestBody HiddenAcceptRecordUpdateCmd hiddenAcceptRecordUpdateCmd) { + hiddenAcceptRecordService.edit(hiddenAcceptRecordUpdateCmd); + return SingleResponse.buildSuccess(); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenController.java b/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenController.java new file mode 100644 index 0000000..de3d210 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenController.java @@ -0,0 +1,82 @@ +package com.zcloud.key.project.web.hidden; + + +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.key.project.api.hidden.HiddenServiceI; +import com.zcloud.key.project.dto.hidden.HiddenAddCmd; +import com.zcloud.key.project.dto.hidden.HiddenPageQry; +import com.zcloud.key.project.dto.hidden.HiddenUpdateCmd; +import com.zcloud.key.project.dto.clientobject.hidden.HiddenCO; +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 2026-03-20 11:32:51 + */ +@Api(tags = "隐患主表") +@RequestMapping("/${application.gateway}/hidden") +@RestController +@AllArgsConstructor +public class HiddenController { + private final HiddenServiceI hiddenService; + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody HiddenAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + return hiddenService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody HiddenPageQry qry) { + return hiddenService.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 HiddenCO()); + } + + @ApiOperation("删除") + @DeleteMapping("/{id}") + public Response remove(@PathVariable("id") Long id) { + hiddenService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("删除多个") + @DeleteMapping("/ids") + public Response removeBatch(@RequestParam Long[] ids) { + hiddenService.removeBatch(ids); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改") + @PutMapping("/edit") + public SingleResponse edit(@Validated @RequestBody HiddenUpdateCmd hiddenUpdateCmd) { + hiddenService.edit(hiddenUpdateCmd); + return SingleResponse.buildSuccess(); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenFindUserController.java b/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenFindUserController.java new file mode 100644 index 0000000..438af96 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenFindUserController.java @@ -0,0 +1,82 @@ +package com.zcloud.key.project.web.hidden; + + +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.key.project.api.hidden.HiddenFindUserServiceI; +import com.zcloud.key.project.dto.hidden.HiddenFindUserAddCmd; +import com.zcloud.key.project.dto.hidden.HiddenFindUserPageQry; +import com.zcloud.key.project.dto.hidden.HiddenFindUserUpdateCmd; +import com.zcloud.key.project.dto.clientobject.hidden.HiddenFindUserCO; +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 2026-03-20 11:33:23 + */ +@Api(tags = "隐患发现人表") +@RequestMapping("/${application.gateway}/hiddenFindUser") +@RestController +@AllArgsConstructor +public class HiddenFindUserController { + private final HiddenFindUserServiceI hiddenFindUserService; + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody HiddenFindUserAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + return hiddenFindUserService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody HiddenFindUserPageQry qry) { + return hiddenFindUserService.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 HiddenFindUserCO()); + } + + @ApiOperation("删除") + @DeleteMapping("/{id}") + public Response remove(@PathVariable("id") Long id) { + hiddenFindUserService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("删除多个") + @DeleteMapping("/ids") + public Response removeBatch(@RequestParam Long[] ids) { + hiddenFindUserService.removeBatch(ids); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改") + @PutMapping("/edit") + public SingleResponse edit(@Validated @RequestBody HiddenFindUserUpdateCmd hiddenFindUserUpdateCmd) { + hiddenFindUserService.edit(hiddenFindUserUpdateCmd); + return SingleResponse.buildSuccess(); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenRectificationRecordController.java b/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenRectificationRecordController.java new file mode 100644 index 0000000..3727f43 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenRectificationRecordController.java @@ -0,0 +1,82 @@ +package com.zcloud.key.project.web.hidden; + + +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.key.project.api.hidden.HiddenRectificationRecordServiceI; +import com.zcloud.key.project.dto.hidden.HiddenRectificationRecordAddCmd; +import com.zcloud.key.project.dto.hidden.HiddenRectificationRecordPageQry; +import com.zcloud.key.project.dto.hidden.HiddenRectificationRecordUpdateCmd; +import com.zcloud.key.project.dto.clientobject.hidden.HiddenRectificationRecordCO; +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 2026-03-20 11:33:38 + */ +@Api(tags = "隐患整改记录") +@RequestMapping("/${application.gateway}/hiddenRectificationRecord") +@RestController +@AllArgsConstructor +public class HiddenRectificationRecordController { + private final HiddenRectificationRecordServiceI hiddenRectificationRecordService; + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody HiddenRectificationRecordAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + return hiddenRectificationRecordService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody HiddenRectificationRecordPageQry qry) { + return hiddenRectificationRecordService.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 HiddenRectificationRecordCO()); + } + + @ApiOperation("删除") + @DeleteMapping("/{id}") + public Response remove(@PathVariable("id") Long id) { + hiddenRectificationRecordService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("删除多个") + @DeleteMapping("/ids") + public Response removeBatch(@RequestParam Long[] ids) { + hiddenRectificationRecordService.removeBatch(ids); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改") + @PutMapping("/edit") + public SingleResponse edit(@Validated @RequestBody HiddenRectificationRecordUpdateCmd hiddenRectificationRecordUpdateCmd) { + hiddenRectificationRecordService.edit(hiddenRectificationRecordUpdateCmd); + return SingleResponse.buildSuccess(); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/key/project/web/KeyProjectCameraController.java b/web-adapter/src/main/java/com/zcloud/key/project/web/project/KeyProjectCameraController.java similarity index 76% rename from web-adapter/src/main/java/com/zcloud/key/project/web/KeyProjectCameraController.java rename to web-adapter/src/main/java/com/zcloud/key/project/web/project/KeyProjectCameraController.java index 0f7a4f4..0f532bc 100644 --- a/web-adapter/src/main/java/com/zcloud/key/project/web/KeyProjectCameraController.java +++ b/web-adapter/src/main/java/com/zcloud/key/project/web/project/KeyProjectCameraController.java @@ -1,28 +1,20 @@ -package com.zcloud.key.project.web; +package com.zcloud.key.project.web.project; 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.key.project.api.KeyProjectCameraServiceI; -import com.zcloud.key.project.dto.CameraListCmd; -import com.zcloud.key.project.dto.KeyProjectCameraAddCmd; -import com.zcloud.key.project.dto.KeyProjectCameraPageQry; -import com.zcloud.key.project.dto.KeyProjectCameraUpdateCmd; -import com.zcloud.key.project.dto.clientobject.CameraInfoCO; -import com.zcloud.key.project.dto.clientobject.KeyProjectCO; -import com.zcloud.key.project.dto.clientobject.KeyProjectCameraCO; +import com.zcloud.key.project.api.project.KeyProjectCameraServiceI; +import com.zcloud.key.project.dto.project.CameraListCmd; +import com.zcloud.key.project.dto.project.KeyProjectCameraPageQry; +import com.zcloud.key.project.dto.clientobject.project.CameraInfoCO; +import com.zcloud.key.project.dto.clientobject.project.KeyProjectCameraCO; 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 * diff --git a/web-adapter/src/main/java/com/zcloud/key/project/web/KeyProjectController.java b/web-adapter/src/main/java/com/zcloud/key/project/web/project/KeyProjectController.java similarity index 89% rename from web-adapter/src/main/java/com/zcloud/key/project/web/KeyProjectController.java rename to web-adapter/src/main/java/com/zcloud/key/project/web/project/KeyProjectController.java index 0aaa738..b4bba93 100644 --- a/web-adapter/src/main/java/com/zcloud/key/project/web/KeyProjectController.java +++ b/web-adapter/src/main/java/com/zcloud/key/project/web/project/KeyProjectController.java @@ -1,22 +1,22 @@ -package com.zcloud.key.project.web; +package com.zcloud.key.project.web.project; -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.key.project.api.KeyProjectServiceI; +import com.zcloud.key.project.api.project.KeyProjectServiceI; import com.zcloud.key.project.domain.enums.KeyProjectApplyStatusEnum; -import com.zcloud.key.project.dto.*; -import com.zcloud.key.project.dto.clientobject.*; +import com.zcloud.key.project.dto.clientobject.project.CorpStatisticsCO; +import com.zcloud.key.project.dto.clientobject.project.KeyProjectCO; +import com.zcloud.key.project.dto.clientobject.project.KeyProjectStatisticsCO; +import com.zcloud.key.project.dto.clientobject.project.XgfCorpStatisticsCO; +import com.zcloud.key.project.dto.project.*; 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 * @@ -24,7 +24,7 @@ import java.util.ArrayList; * @Date 2026-03-16 10:00:38 */ @Api(tags = "重点作业表") -@RequestMapping("/${application.gateway}/info") +@RequestMapping("/${application.gateway}/keyProject") @RestController @AllArgsConstructor public class KeyProjectController { diff --git a/web-app/src/main/java/com/zcloud/key/project/command/convertor/hidden/HiddenAcceptRecordCoConvertor.java b/web-app/src/main/java/com/zcloud/key/project/command/convertor/hidden/HiddenAcceptRecordCoConvertor.java new file mode 100644 index 0000000..30ca229 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/key/project/command/convertor/hidden/HiddenAcceptRecordCoConvertor.java @@ -0,0 +1,24 @@ +package com.zcloud.key.project.command.convertor.hidden; + +import com.zcloud.key.project.dto.clientobject.hidden.HiddenAcceptRecordCO; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenAcceptRecordDO; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2026-03-20 11:33:08 + */ +@Mapper(componentModel = "spring") +public interface HiddenAcceptRecordCoConvertor { + /** + * @param hiddenAcceptRecordDOs + * @return + */ + List converDOsToCOs(List hiddenAcceptRecordDOs); +} + diff --git a/web-app/src/main/java/com/zcloud/key/project/command/convertor/hidden/HiddenCoConvertor.java b/web-app/src/main/java/com/zcloud/key/project/command/convertor/hidden/HiddenCoConvertor.java new file mode 100644 index 0000000..5a060db --- /dev/null +++ b/web-app/src/main/java/com/zcloud/key/project/command/convertor/hidden/HiddenCoConvertor.java @@ -0,0 +1,24 @@ +package com.zcloud.key.project.command.convertor.hidden; + +import com.zcloud.key.project.dto.clientobject.hidden.HiddenCO; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2026-03-20 11:32:51 + */ +@Mapper(componentModel = "spring") +public interface HiddenCoConvertor { + /** + * @param hiddenDOs + * @return + */ + List converDOsToCOs(List hiddenDOs); +} + diff --git a/web-app/src/main/java/com/zcloud/key/project/command/convertor/hidden/HiddenFindUserCoConvertor.java b/web-app/src/main/java/com/zcloud/key/project/command/convertor/hidden/HiddenFindUserCoConvertor.java new file mode 100644 index 0000000..e17475c --- /dev/null +++ b/web-app/src/main/java/com/zcloud/key/project/command/convertor/hidden/HiddenFindUserCoConvertor.java @@ -0,0 +1,24 @@ +package com.zcloud.key.project.command.convertor.hidden; + +import com.zcloud.key.project.dto.clientobject.hidden.HiddenFindUserCO; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenFindUserDO; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2026-03-20 11:33:23 + */ +@Mapper(componentModel = "spring") +public interface HiddenFindUserCoConvertor { + /** + * @param hiddenFindUserDOs + * @return + */ + List converDOsToCOs(List hiddenFindUserDOs); +} + diff --git a/web-app/src/main/java/com/zcloud/key/project/command/convertor/hidden/HiddenRectificationRecordCoConvertor.java b/web-app/src/main/java/com/zcloud/key/project/command/convertor/hidden/HiddenRectificationRecordCoConvertor.java new file mode 100644 index 0000000..278f08e --- /dev/null +++ b/web-app/src/main/java/com/zcloud/key/project/command/convertor/hidden/HiddenRectificationRecordCoConvertor.java @@ -0,0 +1,24 @@ +package com.zcloud.key.project.command.convertor.hidden; + +import com.zcloud.key.project.dto.clientobject.hidden.HiddenRectificationRecordCO; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenRectificationRecordDO; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2026-03-20 11:33:38 + */ +@Mapper(componentModel = "spring") +public interface HiddenRectificationRecordCoConvertor { + /** + * @param hiddenRectificationRecordDOs + * @return + */ + List converDOsToCOs(List hiddenRectificationRecordDOs); +} + diff --git a/web-app/src/main/java/com/zcloud/key/project/command/convertor/KeyProjectCameraCoConvertor.java b/web-app/src/main/java/com/zcloud/key/project/command/convertor/project/KeyProjectCameraCoConvertor.java similarity index 56% rename from web-app/src/main/java/com/zcloud/key/project/command/convertor/KeyProjectCameraCoConvertor.java rename to web-app/src/main/java/com/zcloud/key/project/command/convertor/project/KeyProjectCameraCoConvertor.java index fa16d10..c4513e9 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/convertor/KeyProjectCameraCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/convertor/project/KeyProjectCameraCoConvertor.java @@ -1,10 +1,10 @@ -package com.zcloud.key.project.command.convertor; +package com.zcloud.key.project.command.convertor.project; -import com.zcloud.key.project.dto.KeyProjectCameraAddCmd; -import com.zcloud.key.project.dto.clientobject.CameraInfoCO; -import com.zcloud.key.project.dto.clientobject.KeyProjectCameraCO; -import com.zcloud.key.project.persistence.dataobject.CameraInfoDO; -import com.zcloud.key.project.persistence.dataobject.KeyProjectCameraDO; +import com.zcloud.key.project.dto.project.KeyProjectCameraAddCmd; +import com.zcloud.key.project.dto.clientobject.project.CameraInfoCO; +import com.zcloud.key.project.dto.clientobject.project.KeyProjectCameraCO; +import com.zcloud.key.project.persistence.dataobject.project.CameraInfoDO; +import com.zcloud.key.project.persistence.dataobject.project.KeyProjectCameraDO; import org.mapstruct.Mapper; import java.util.List; diff --git a/web-app/src/main/java/com/zcloud/key/project/command/convertor/KeyProjectCoConvertor.java b/web-app/src/main/java/com/zcloud/key/project/command/convertor/project/KeyProjectCoConvertor.java similarity index 75% rename from web-app/src/main/java/com/zcloud/key/project/command/convertor/KeyProjectCoConvertor.java rename to web-app/src/main/java/com/zcloud/key/project/command/convertor/project/KeyProjectCoConvertor.java index 491422d..d0e5c7f 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/convertor/KeyProjectCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/convertor/project/KeyProjectCoConvertor.java @@ -1,13 +1,13 @@ -package com.zcloud.key.project.command.convertor; +package com.zcloud.key.project.command.convertor.project; -import com.zcloud.key.project.dto.clientobject.CorpStatisticsCO; -import com.zcloud.key.project.dto.clientobject.KeyProjectCO; -import com.zcloud.key.project.dto.clientobject.KeyProjectStatisticsCO; -import com.zcloud.key.project.dto.clientobject.XgfCorpStatisticsCO; -import com.zcloud.key.project.persistence.dataobject.CorpStatisticsDO; -import com.zcloud.key.project.persistence.dataobject.KeyProjectDO; -import com.zcloud.key.project.persistence.dataobject.KeyProjectStatisticsDO; -import com.zcloud.key.project.persistence.dataobject.XgfCorpStatisticsDO; +import com.zcloud.key.project.dto.clientobject.project.CorpStatisticsCO; +import com.zcloud.key.project.dto.clientobject.project.KeyProjectCO; +import com.zcloud.key.project.dto.clientobject.project.KeyProjectStatisticsCO; +import com.zcloud.key.project.dto.clientobject.project.XgfCorpStatisticsCO; +import com.zcloud.key.project.persistence.dataobject.project.CorpStatisticsDO; +import com.zcloud.key.project.persistence.dataobject.project.KeyProjectDO; +import com.zcloud.key.project.persistence.dataobject.project.KeyProjectStatisticsDO; +import com.zcloud.key.project.persistence.dataobject.project.XgfCorpStatisticsDO; import org.apache.commons.lang.StringUtils; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordAddExe.java b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordAddExe.java new file mode 100644 index 0000000..b033ffb --- /dev/null +++ b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordAddExe.java @@ -0,0 +1,40 @@ +package com.zcloud.key.project.command.hidden; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.key.project.domain.gateway.hidden.HiddenAcceptRecordGateway; +import com.zcloud.key.project.domain.model.hidden.HiddenAcceptRecordE; +import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordAddCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2026-03-20 11:33:08 + */ +@Component +@AllArgsConstructor +public class HiddenAcceptRecordAddExe { + private final HiddenAcceptRecordGateway hiddenAcceptRecordGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(HiddenAcceptRecordAddCmd cmd) { + HiddenAcceptRecordE hiddenAcceptRecordE = new HiddenAcceptRecordE(); + BeanUtils.copyProperties(cmd, hiddenAcceptRecordE); + boolean res = false; + try { + res = hiddenAcceptRecordGateway.add(hiddenAcceptRecordE); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("保存失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordRemoveExe.java b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordRemoveExe.java new file mode 100644 index 0000000..3312e4a --- /dev/null +++ b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordRemoveExe.java @@ -0,0 +1,39 @@ +package com.zcloud.key.project.command.hidden; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.key.project.domain.gateway.hidden.HiddenAcceptRecordGateway; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2026-03-20 11:33:08 + */ +@Component +@AllArgsConstructor +public class HiddenAcceptRecordRemoveExe { + private final HiddenAcceptRecordGateway hiddenAcceptRecordGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long id) { + boolean res = hiddenAcceptRecordGateway.deletedHiddenAcceptRecordById(id); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long[] ids) { + boolean res = hiddenAcceptRecordGateway.deletedHiddenAcceptRecordByIds(ids); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java new file mode 100644 index 0000000..373f8eb --- /dev/null +++ b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java @@ -0,0 +1,34 @@ +package com.zcloud.key.project.command.hidden; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.key.project.domain.gateway.hidden.HiddenAcceptRecordGateway; +import com.zcloud.key.project.domain.model.hidden.HiddenAcceptRecordE; +import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2026-03-20 11:33:08 + */ +@Component +@AllArgsConstructor +public class HiddenAcceptRecordUpdateExe { + private final HiddenAcceptRecordGateway hiddenAcceptRecordGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(HiddenAcceptRecordUpdateCmd hiddenAcceptRecordUpdateCmd) { + HiddenAcceptRecordE hiddenAcceptRecordE = new HiddenAcceptRecordE(); + BeanUtils.copyProperties(hiddenAcceptRecordUpdateCmd, hiddenAcceptRecordE); + boolean res = hiddenAcceptRecordGateway.update(hiddenAcceptRecordE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAddExe.java b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAddExe.java new file mode 100644 index 0000000..5de367f --- /dev/null +++ b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAddExe.java @@ -0,0 +1,40 @@ +package com.zcloud.key.project.command.hidden; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.key.project.domain.gateway.hidden.HiddenGateway; +import com.zcloud.key.project.domain.model.hidden.HiddenE; +import com.zcloud.key.project.dto.hidden.HiddenAddCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2026-03-20 11:32:51 + */ +@Component +@AllArgsConstructor +public class HiddenAddExe { + private final HiddenGateway hiddenGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(HiddenAddCmd cmd) { + HiddenE hiddenE = new HiddenE(); + BeanUtils.copyProperties(cmd, hiddenE); + boolean res = false; + try { + res = hiddenGateway.add(hiddenE); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("保存失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenFindUserAddExe.java b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenFindUserAddExe.java new file mode 100644 index 0000000..40d6bbb --- /dev/null +++ b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenFindUserAddExe.java @@ -0,0 +1,40 @@ +package com.zcloud.key.project.command.hidden; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.key.project.domain.gateway.hidden.HiddenFindUserGateway; +import com.zcloud.key.project.domain.model.hidden.HiddenFindUserE; +import com.zcloud.key.project.dto.hidden.HiddenFindUserAddCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2026-03-20 11:33:23 + */ +@Component +@AllArgsConstructor +public class HiddenFindUserAddExe { + private final HiddenFindUserGateway hiddenFindUserGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(HiddenFindUserAddCmd cmd) { + HiddenFindUserE hiddenFindUserE = new HiddenFindUserE(); + BeanUtils.copyProperties(cmd, hiddenFindUserE); + boolean res = false; + try { + res = hiddenFindUserGateway.add(hiddenFindUserE); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("保存失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenFindUserRemoveExe.java b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenFindUserRemoveExe.java new file mode 100644 index 0000000..694f15c --- /dev/null +++ b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenFindUserRemoveExe.java @@ -0,0 +1,39 @@ +package com.zcloud.key.project.command.hidden; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.key.project.domain.gateway.hidden.HiddenFindUserGateway; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2026-03-20 11:33:23 + */ +@Component +@AllArgsConstructor +public class HiddenFindUserRemoveExe { + private final HiddenFindUserGateway hiddenFindUserGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long id) { + boolean res = hiddenFindUserGateway.deletedHiddenFindUserById(id); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long[] ids) { + boolean res = hiddenFindUserGateway.deletedHiddenFindUserByIds(ids); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenFindUserUpdateExe.java b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenFindUserUpdateExe.java new file mode 100644 index 0000000..87a3397 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenFindUserUpdateExe.java @@ -0,0 +1,34 @@ +package com.zcloud.key.project.command.hidden; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.key.project.domain.gateway.hidden.HiddenFindUserGateway; +import com.zcloud.key.project.domain.model.hidden.HiddenFindUserE; +import com.zcloud.key.project.dto.hidden.HiddenFindUserUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2026-03-20 11:33:23 + */ +@Component +@AllArgsConstructor +public class HiddenFindUserUpdateExe { + private final HiddenFindUserGateway hiddenFindUserGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(HiddenFindUserUpdateCmd hiddenFindUserUpdateCmd) { + HiddenFindUserE hiddenFindUserE = new HiddenFindUserE(); + BeanUtils.copyProperties(hiddenFindUserUpdateCmd, hiddenFindUserE); + boolean res = hiddenFindUserGateway.update(hiddenFindUserE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenRectificationRecordAddExe.java b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenRectificationRecordAddExe.java new file mode 100644 index 0000000..04646bd --- /dev/null +++ b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenRectificationRecordAddExe.java @@ -0,0 +1,40 @@ +package com.zcloud.key.project.command.hidden; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.key.project.domain.gateway.hidden.HiddenRectificationRecordGateway; +import com.zcloud.key.project.domain.model.hidden.HiddenRectificationRecordE; +import com.zcloud.key.project.dto.hidden.HiddenRectificationRecordAddCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2026-03-20 11:33:38 + */ +@Component +@AllArgsConstructor +public class HiddenRectificationRecordAddExe { + private final HiddenRectificationRecordGateway hiddenRectificationRecordGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(HiddenRectificationRecordAddCmd cmd) { + HiddenRectificationRecordE hiddenRectificationRecordE = new HiddenRectificationRecordE(); + BeanUtils.copyProperties(cmd, hiddenRectificationRecordE); + boolean res = false; + try { + res = hiddenRectificationRecordGateway.add(hiddenRectificationRecordE); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("保存失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenRectificationRecordRemoveExe.java b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenRectificationRecordRemoveExe.java new file mode 100644 index 0000000..809cba2 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenRectificationRecordRemoveExe.java @@ -0,0 +1,39 @@ +package com.zcloud.key.project.command.hidden; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.key.project.domain.gateway.hidden.HiddenRectificationRecordGateway; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2026-03-20 11:33:38 + */ +@Component +@AllArgsConstructor +public class HiddenRectificationRecordRemoveExe { + private final HiddenRectificationRecordGateway hiddenRectificationRecordGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long id) { + boolean res = hiddenRectificationRecordGateway.deletedHiddenRectificationRecordById(id); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long[] ids) { + boolean res = hiddenRectificationRecordGateway.deletedHiddenRectificationRecordByIds(ids); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenRectificationRecordUpdateExe.java b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenRectificationRecordUpdateExe.java new file mode 100644 index 0000000..bfdef2e --- /dev/null +++ b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenRectificationRecordUpdateExe.java @@ -0,0 +1,34 @@ +package com.zcloud.key.project.command.hidden; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.key.project.domain.gateway.hidden.HiddenRectificationRecordGateway; +import com.zcloud.key.project.domain.model.hidden.HiddenRectificationRecordE; +import com.zcloud.key.project.dto.hidden.HiddenRectificationRecordUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2026-03-20 11:33:38 + */ +@Component +@AllArgsConstructor +public class HiddenRectificationRecordUpdateExe { + private final HiddenRectificationRecordGateway hiddenRectificationRecordGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(HiddenRectificationRecordUpdateCmd hiddenRectificationRecordUpdateCmd) { + HiddenRectificationRecordE hiddenRectificationRecordE = new HiddenRectificationRecordE(); + BeanUtils.copyProperties(hiddenRectificationRecordUpdateCmd, hiddenRectificationRecordE); + boolean res = hiddenRectificationRecordGateway.update(hiddenRectificationRecordE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenRemoveExe.java b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenRemoveExe.java new file mode 100644 index 0000000..94dda1a --- /dev/null +++ b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenRemoveExe.java @@ -0,0 +1,39 @@ +package com.zcloud.key.project.command.hidden; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.key.project.domain.gateway.hidden.HiddenGateway; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2026-03-20 11:32:51 + */ +@Component +@AllArgsConstructor +public class HiddenRemoveExe { + private final HiddenGateway hiddenGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long id) { + boolean res = hiddenGateway.deletedHiddenById(id); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long[] ids) { + boolean res = hiddenGateway.deletedHiddenByIds(ids); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenUpdateExe.java b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenUpdateExe.java new file mode 100644 index 0000000..d8d256e --- /dev/null +++ b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenUpdateExe.java @@ -0,0 +1,34 @@ +package com.zcloud.key.project.command.hidden; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.key.project.domain.gateway.hidden.HiddenGateway; +import com.zcloud.key.project.domain.model.hidden.HiddenE; +import com.zcloud.key.project.dto.hidden.HiddenUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2026-03-20 11:32:52 + */ +@Component +@AllArgsConstructor +public class HiddenUpdateExe { + private final HiddenGateway hiddenGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(HiddenUpdateCmd hiddenUpdateCmd) { + HiddenE hiddenE = new HiddenE(); + BeanUtils.copyProperties(hiddenUpdateCmd, hiddenE); + boolean res = hiddenGateway.update(hiddenE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/key/project/command/KeyProjectAddExe.java b/web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectAddExe.java similarity index 73% rename from web-app/src/main/java/com/zcloud/key/project/command/KeyProjectAddExe.java rename to web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectAddExe.java index 58fe62c..46bfbb6 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/KeyProjectAddExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectAddExe.java @@ -1,16 +1,14 @@ -package com.zcloud.key.project.command; +package com.zcloud.key.project.command.project; import com.alibaba.cola.exception.BizException; import com.zcloud.gbscommon.utils.Tools; -import com.zcloud.key.project.command.convertor.KeyProjectCameraCoConvertor; -import com.zcloud.key.project.domain.enums.KeyProjectApplyStatusEnum; -import com.zcloud.key.project.domain.gateway.KeyProjectCameraGateway; -import com.zcloud.key.project.domain.gateway.KeyProjectGateway; -import com.zcloud.key.project.domain.model.KeyProjectE; -import com.zcloud.key.project.dto.KeyProjectAddCmd; -import com.zcloud.key.project.dto.KeyProjectCameraAddCmd; -import com.zcloud.key.project.persistence.dataobject.KeyProjectCameraDO; -import com.zcloud.key.project.persistence.repository.KeyProjectCameraRepository; +import com.zcloud.key.project.command.convertor.project.KeyProjectCameraCoConvertor; +import com.zcloud.key.project.domain.gateway.project.KeyProjectGateway; +import com.zcloud.key.project.domain.model.project.KeyProjectE; +import com.zcloud.key.project.dto.project.KeyProjectAddCmd; +import com.zcloud.key.project.dto.project.KeyProjectCameraAddCmd; +import com.zcloud.key.project.persistence.dataobject.project.KeyProjectCameraDO; +import com.zcloud.key.project.persistence.repository.project.KeyProjectCameraRepository; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/key/project/command/KeyProjectCameraAddExe.java b/web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectCameraAddExe.java similarity index 79% rename from web-app/src/main/java/com/zcloud/key/project/command/KeyProjectCameraAddExe.java rename to web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectCameraAddExe.java index 0e086b7..dd15c82 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/KeyProjectCameraAddExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectCameraAddExe.java @@ -1,9 +1,9 @@ -package com.zcloud.key.project.command; +package com.zcloud.key.project.command.project; import com.alibaba.cola.exception.BizException; -import com.zcloud.key.project.domain.gateway.KeyProjectCameraGateway; -import com.zcloud.key.project.domain.model.KeyProjectCameraE; -import com.zcloud.key.project.dto.KeyProjectCameraAddCmd; +import com.zcloud.key.project.domain.gateway.project.KeyProjectCameraGateway; +import com.zcloud.key.project.domain.model.project.KeyProjectCameraE; +import com.zcloud.key.project.dto.project.KeyProjectCameraAddCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/key/project/command/KeyProjectCameraRemoveExe.java b/web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectCameraRemoveExe.java similarity index 88% rename from web-app/src/main/java/com/zcloud/key/project/command/KeyProjectCameraRemoveExe.java rename to web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectCameraRemoveExe.java index ae2a009..7c76951 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/KeyProjectCameraRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectCameraRemoveExe.java @@ -1,7 +1,7 @@ -package com.zcloud.key.project.command; +package com.zcloud.key.project.command.project; import com.alibaba.cola.exception.BizException; -import com.zcloud.key.project.domain.gateway.KeyProjectCameraGateway; +import com.zcloud.key.project.domain.gateway.project.KeyProjectCameraGateway; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/web-app/src/main/java/com/zcloud/key/project/command/KeyProjectCameraUpdateExe.java b/web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectCameraUpdateExe.java similarity index 77% rename from web-app/src/main/java/com/zcloud/key/project/command/KeyProjectCameraUpdateExe.java rename to web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectCameraUpdateExe.java index f93c902..2170b26 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/KeyProjectCameraUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectCameraUpdateExe.java @@ -1,9 +1,9 @@ -package com.zcloud.key.project.command; +package com.zcloud.key.project.command.project; import com.alibaba.cola.exception.BizException; -import com.zcloud.key.project.domain.gateway.KeyProjectCameraGateway; -import com.zcloud.key.project.domain.model.KeyProjectCameraE; -import com.zcloud.key.project.dto.KeyProjectCameraUpdateCmd; +import com.zcloud.key.project.domain.gateway.project.KeyProjectCameraGateway; +import com.zcloud.key.project.domain.model.project.KeyProjectCameraE; +import com.zcloud.key.project.dto.project.KeyProjectCameraUpdateCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/key/project/command/KeyProjectRemoveExe.java b/web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectRemoveExe.java similarity index 84% rename from web-app/src/main/java/com/zcloud/key/project/command/KeyProjectRemoveExe.java rename to web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectRemoveExe.java index d38f1af..cee1e87 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/KeyProjectRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectRemoveExe.java @@ -1,10 +1,10 @@ -package com.zcloud.key.project.command; +package com.zcloud.key.project.command.project; import com.alibaba.cola.exception.BizException; import com.zcloud.key.project.domain.enums.KeyProjectApplyStatusEnum; -import com.zcloud.key.project.domain.gateway.KeyProjectGateway; -import com.zcloud.key.project.persistence.dataobject.KeyProjectDO; -import com.zcloud.key.project.persistence.repository.KeyProjectRepository; +import com.zcloud.key.project.domain.gateway.project.KeyProjectGateway; +import com.zcloud.key.project.persistence.dataobject.project.KeyProjectDO; +import com.zcloud.key.project.persistence.repository.project.KeyProjectRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/web-app/src/main/java/com/zcloud/key/project/command/KeyProjectUpdateExe.java b/web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectUpdateExe.java similarity index 85% rename from web-app/src/main/java/com/zcloud/key/project/command/KeyProjectUpdateExe.java rename to web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectUpdateExe.java index 549b2ec..9b27783 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/KeyProjectUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectUpdateExe.java @@ -1,18 +1,18 @@ -package com.zcloud.key.project.command; +package com.zcloud.key.project.command.project; import com.alibaba.cola.exception.BizException; import com.zcloud.gbscommon.utils.Tools; -import com.zcloud.key.project.command.convertor.KeyProjectCameraCoConvertor; +import com.zcloud.key.project.command.convertor.project.KeyProjectCameraCoConvertor; import com.zcloud.key.project.domain.enums.KeyProjectApplyStatusEnum; -import com.zcloud.key.project.domain.gateway.KeyProjectGateway; -import com.zcloud.key.project.domain.model.KeyProjectE; -import com.zcloud.key.project.dto.KeyProjectCameraAddCmd; -import com.zcloud.key.project.dto.KeyProjectUpdateCmd; -import com.zcloud.key.project.dto.KeyProjectUpdateStatusCmd; -import com.zcloud.key.project.persistence.dataobject.KeyProjectCameraDO; -import com.zcloud.key.project.persistence.dataobject.KeyProjectDO; -import com.zcloud.key.project.persistence.repository.KeyProjectCameraRepository; -import com.zcloud.key.project.persistence.repository.KeyProjectRepository; +import com.zcloud.key.project.domain.gateway.project.KeyProjectGateway; +import com.zcloud.key.project.domain.model.project.KeyProjectE; +import com.zcloud.key.project.dto.project.KeyProjectCameraAddCmd; +import com.zcloud.key.project.dto.project.KeyProjectUpdateCmd; +import com.zcloud.key.project.dto.project.KeyProjectUpdateStatusCmd; +import com.zcloud.key.project.persistence.dataobject.project.KeyProjectCameraDO; +import com.zcloud.key.project.persistence.dataobject.project.KeyProjectDO; +import com.zcloud.key.project.persistence.repository.project.KeyProjectCameraRepository; +import com.zcloud.key.project.persistence.repository.project.KeyProjectRepository; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenAcceptRecordQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenAcceptRecordQueryExe.java new file mode 100644 index 0000000..cfa2ef4 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenAcceptRecordQueryExe.java @@ -0,0 +1,42 @@ +package com.zcloud.key.project.command.query.hidden; + +import com.alibaba.cola.dto.PageResponse; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.key.project.command.convertor.hidden.HiddenAcceptRecordCoConvertor; +import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordPageQry; +import com.zcloud.key.project.dto.clientobject.hidden.HiddenAcceptRecordCO; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenAcceptRecordDO; +import com.zcloud.key.project.persistence.repository.hidden.HiddenAcceptRecordRepository; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2026-03-20 11:33:08 + */ +@Component +@AllArgsConstructor +public class HiddenAcceptRecordQueryExe { + private final HiddenAcceptRecordRepository hiddenAcceptRecordRepository; + private final HiddenAcceptRecordCoConvertor hiddenAcceptRecordCoConvertor; + + /** + * 分页 + * + * @param hiddenAcceptRecordPageQry + * @return + */ + public PageResponse execute(HiddenAcceptRecordPageQry hiddenAcceptRecordPageQry) { + Map params = PageQueryHelper.toHashMap(hiddenAcceptRecordPageQry); + PageResponse pageResponse = hiddenAcceptRecordRepository.listPage(params); + List examCenterCOS = hiddenAcceptRecordCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenFindUserQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenFindUserQueryExe.java new file mode 100644 index 0000000..8c2419b --- /dev/null +++ b/web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenFindUserQueryExe.java @@ -0,0 +1,42 @@ +package com.zcloud.key.project.command.query.hidden; + +import com.alibaba.cola.dto.PageResponse; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.key.project.command.convertor.hidden.HiddenFindUserCoConvertor; +import com.zcloud.key.project.dto.hidden.HiddenFindUserPageQry; +import com.zcloud.key.project.dto.clientobject.hidden.HiddenFindUserCO; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenFindUserDO; +import com.zcloud.key.project.persistence.repository.hidden.HiddenFindUserRepository; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2026-03-20 11:33:23 + */ +@Component +@AllArgsConstructor +public class HiddenFindUserQueryExe { + private final HiddenFindUserRepository hiddenFindUserRepository; + private final HiddenFindUserCoConvertor hiddenFindUserCoConvertor; + + /** + * 分页 + * + * @param hiddenFindUserPageQry + * @return + */ + public PageResponse execute(HiddenFindUserPageQry hiddenFindUserPageQry) { + Map params = PageQueryHelper.toHashMap(hiddenFindUserPageQry); + PageResponse pageResponse = hiddenFindUserRepository.listPage(params); + List examCenterCOS = hiddenFindUserCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenQueryExe.java new file mode 100644 index 0000000..ee76dea --- /dev/null +++ b/web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenQueryExe.java @@ -0,0 +1,42 @@ +package com.zcloud.key.project.command.query.hidden; + +import com.alibaba.cola.dto.PageResponse; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.key.project.command.convertor.hidden.HiddenCoConvertor; +import com.zcloud.key.project.dto.hidden.HiddenPageQry; +import com.zcloud.key.project.dto.clientobject.hidden.HiddenCO; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO; +import com.zcloud.key.project.persistence.repository.hidden.HiddenRepository; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2026-03-20 11:32:51 + */ +@Component +@AllArgsConstructor +public class HiddenQueryExe { + private final HiddenRepository hiddenRepository; + private final HiddenCoConvertor hiddenCoConvertor; + + /** + * 分页 + * + * @param hiddenPageQry + * @return + */ + public PageResponse execute(HiddenPageQry hiddenPageQry) { + Map params = PageQueryHelper.toHashMap(hiddenPageQry); + PageResponse pageResponse = hiddenRepository.listPage(params); + List examCenterCOS = hiddenCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenRectificationRecordQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenRectificationRecordQueryExe.java new file mode 100644 index 0000000..755530a --- /dev/null +++ b/web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenRectificationRecordQueryExe.java @@ -0,0 +1,42 @@ +package com.zcloud.key.project.command.query.hidden; + +import com.alibaba.cola.dto.PageResponse; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.key.project.command.convertor.hidden.HiddenRectificationRecordCoConvertor; +import com.zcloud.key.project.dto.hidden.HiddenRectificationRecordPageQry; +import com.zcloud.key.project.dto.clientobject.hidden.HiddenRectificationRecordCO; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenRectificationRecordDO; +import com.zcloud.key.project.persistence.repository.hidden.HiddenRectificationRecordRepository; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + + +/** + * web-app + * + * @Author zhaokai + * @Date 2026-03-20 11:33:38 + */ +@Component +@AllArgsConstructor +public class HiddenRectificationRecordQueryExe { + private final HiddenRectificationRecordRepository hiddenRectificationRecordRepository; + private final HiddenRectificationRecordCoConvertor hiddenRectificationRecordCoConvertor; + + /** + * 分页 + * + * @param hiddenRectificationRecordPageQry + * @return + */ + public PageResponse execute(HiddenRectificationRecordPageQry hiddenRectificationRecordPageQry) { + Map params = PageQueryHelper.toHashMap(hiddenRectificationRecordPageQry); + PageResponse pageResponse = hiddenRectificationRecordRepository.listPage(params); + List examCenterCOS = hiddenRectificationRecordCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/KeyProjectCameraQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectCameraQueryExe.java similarity index 79% rename from web-app/src/main/java/com/zcloud/key/project/command/query/KeyProjectCameraQueryExe.java rename to web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectCameraQueryExe.java index 974ff23..0291a02 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/query/KeyProjectCameraQueryExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectCameraQueryExe.java @@ -1,18 +1,17 @@ -package com.zcloud.key.project.command.query; +package com.zcloud.key.project.command.query.project; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.zcloud.key.project.command.convertor.KeyProjectCameraCoConvertor; +import com.zcloud.key.project.command.convertor.project.KeyProjectCameraCoConvertor; import com.zcloud.key.project.domain.enums.KeyProjectCameraTypeEnum; -import com.zcloud.key.project.dto.CameraListCmd; -import com.zcloud.key.project.dto.KeyProjectCameraPageQry; -import com.zcloud.key.project.dto.clientobject.CameraInfoCO; -import com.zcloud.key.project.dto.clientobject.KeyProjectCO; -import com.zcloud.key.project.dto.clientobject.KeyProjectCameraCO; -import com.zcloud.key.project.persistence.dataobject.CameraInfoDO; -import com.zcloud.key.project.persistence.dataobject.KeyProjectCameraDO; -import com.zcloud.key.project.persistence.repository.KeyProjectCameraRepository; +import com.zcloud.key.project.dto.project.CameraListCmd; +import com.zcloud.key.project.dto.project.KeyProjectCameraPageQry; +import com.zcloud.key.project.dto.clientobject.project.CameraInfoCO; +import com.zcloud.key.project.dto.clientobject.project.KeyProjectCameraCO; +import com.zcloud.key.project.persistence.dataobject.project.CameraInfoDO; +import com.zcloud.key.project.persistence.dataobject.project.KeyProjectCameraDO; +import com.zcloud.key.project.persistence.repository.project.KeyProjectCameraRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/KeyProjectQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java similarity index 89% rename from web-app/src/main/java/com/zcloud/key/project/command/query/KeyProjectQueryExe.java rename to web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java index 3aa862c..e22fc01 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/query/KeyProjectQueryExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java @@ -1,24 +1,24 @@ -package com.zcloud.key.project.command.query; +package com.zcloud.key.project.command.query.project; import cn.hutool.core.collection.CollUtil; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.zcloud.key.project.command.convertor.KeyProjectCameraCoConvertor; -import com.zcloud.key.project.command.convertor.KeyProjectCoConvertor; +import com.zcloud.key.project.command.convertor.project.KeyProjectCameraCoConvertor; +import com.zcloud.key.project.command.convertor.project.KeyProjectCoConvertor; import com.zcloud.key.project.domain.enums.KeyProjectCameraTypeEnum; -import com.zcloud.key.project.dto.CorpStatisticsPageQry; -import com.zcloud.key.project.dto.KeyProjectPageQry; -import com.zcloud.key.project.dto.XgfCorpStatisticsPageQry; -import com.zcloud.key.project.dto.clientobject.CorpStatisticsCO; -import com.zcloud.key.project.dto.clientobject.KeyProjectCO; -import com.zcloud.key.project.dto.clientobject.KeyProjectStatisticsCO; -import com.zcloud.key.project.dto.KeyProjectStatisticsPageQry; -import com.zcloud.key.project.dto.clientobject.XgfCorpStatisticsCO; -import com.zcloud.key.project.persistence.dataobject.*; +import com.zcloud.key.project.dto.project.CorpStatisticsPageQry; +import com.zcloud.key.project.dto.project.KeyProjectPageQry; +import com.zcloud.key.project.dto.project.XgfCorpStatisticsPageQry; +import com.zcloud.key.project.dto.clientobject.project.CorpStatisticsCO; +import com.zcloud.key.project.dto.clientobject.project.KeyProjectCO; +import com.zcloud.key.project.dto.clientobject.project.KeyProjectStatisticsCO; +import com.zcloud.key.project.dto.project.KeyProjectStatisticsPageQry; +import com.zcloud.key.project.dto.clientobject.project.XgfCorpStatisticsCO; +import com.zcloud.key.project.persistence.dataobject.project.*; import com.zcloud.key.project.persistence.repository.CorpInfoRepository; -import com.zcloud.key.project.persistence.repository.KeyProjectCameraRepository; -import com.zcloud.key.project.persistence.repository.KeyProjectRepository; +import com.zcloud.key.project.persistence.repository.project.KeyProjectCameraRepository; +import com.zcloud.key.project.persistence.repository.project.KeyProjectRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenAcceptRecordServiceImpl.java b/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenAcceptRecordServiceImpl.java new file mode 100644 index 0000000..2768849 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenAcceptRecordServiceImpl.java @@ -0,0 +1,59 @@ +package com.zcloud.key.project.service.hidden; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.key.project.api.hidden.HiddenAcceptRecordServiceI; +import com.zcloud.key.project.command.hidden.HiddenAcceptRecordAddExe; +import com.zcloud.key.project.command.hidden.HiddenAcceptRecordRemoveExe; +import com.zcloud.key.project.command.hidden.HiddenAcceptRecordUpdateExe; +import com.zcloud.key.project.command.query.hidden.HiddenAcceptRecordQueryExe; +import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordAddCmd; +import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordPageQry; +import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordUpdateCmd; +import com.zcloud.key.project.dto.clientobject.hidden.HiddenAcceptRecordCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * web-app + * + * @Author zhaokai + * @Date 2026-03-20 11:33:08 + */ +@Service +@AllArgsConstructor +public class HiddenAcceptRecordServiceImpl implements HiddenAcceptRecordServiceI { + private final HiddenAcceptRecordAddExe hiddenAcceptRecordAddExe; + private final HiddenAcceptRecordUpdateExe hiddenAcceptRecordUpdateExe; + private final HiddenAcceptRecordRemoveExe hiddenAcceptRecordRemoveExe; + private final HiddenAcceptRecordQueryExe hiddenAcceptRecordQueryExe; + + @Override + public PageResponse listPage(HiddenAcceptRecordPageQry qry) { + + return hiddenAcceptRecordQueryExe.execute(qry); + } + + @Override + public SingleResponse add(HiddenAcceptRecordAddCmd cmd) { + + hiddenAcceptRecordAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(HiddenAcceptRecordUpdateCmd hiddenAcceptRecordUpdateCmd) { + hiddenAcceptRecordUpdateExe.execute(hiddenAcceptRecordUpdateCmd); + } + + @Override + public void remove(Long id) { + hiddenAcceptRecordRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + hiddenAcceptRecordRemoveExe.execute(ids); + } +} + diff --git a/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenFindUserServiceImpl.java b/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenFindUserServiceImpl.java new file mode 100644 index 0000000..07b752c --- /dev/null +++ b/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenFindUserServiceImpl.java @@ -0,0 +1,59 @@ +package com.zcloud.key.project.service.hidden; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.key.project.api.hidden.HiddenFindUserServiceI; +import com.zcloud.key.project.command.hidden.HiddenFindUserAddExe; +import com.zcloud.key.project.command.hidden.HiddenFindUserRemoveExe; +import com.zcloud.key.project.command.hidden.HiddenFindUserUpdateExe; +import com.zcloud.key.project.command.query.hidden.HiddenFindUserQueryExe; +import com.zcloud.key.project.dto.hidden.HiddenFindUserAddCmd; +import com.zcloud.key.project.dto.hidden.HiddenFindUserPageQry; +import com.zcloud.key.project.dto.hidden.HiddenFindUserUpdateCmd; +import com.zcloud.key.project.dto.clientobject.hidden.HiddenFindUserCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * web-app + * + * @Author zhaokai + * @Date 2026-03-20 11:33:23 + */ +@Service +@AllArgsConstructor +public class HiddenFindUserServiceImpl implements HiddenFindUserServiceI { + private final HiddenFindUserAddExe hiddenFindUserAddExe; + private final HiddenFindUserUpdateExe hiddenFindUserUpdateExe; + private final HiddenFindUserRemoveExe hiddenFindUserRemoveExe; + private final HiddenFindUserQueryExe hiddenFindUserQueryExe; + + @Override + public PageResponse listPage(HiddenFindUserPageQry qry) { + + return hiddenFindUserQueryExe.execute(qry); + } + + @Override + public SingleResponse add(HiddenFindUserAddCmd cmd) { + + hiddenFindUserAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(HiddenFindUserUpdateCmd hiddenFindUserUpdateCmd) { + hiddenFindUserUpdateExe.execute(hiddenFindUserUpdateCmd); + } + + @Override + public void remove(Long id) { + hiddenFindUserRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + hiddenFindUserRemoveExe.execute(ids); + } +} + diff --git a/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenRectificationRecordServiceImpl.java b/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenRectificationRecordServiceImpl.java new file mode 100644 index 0000000..4775785 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenRectificationRecordServiceImpl.java @@ -0,0 +1,59 @@ +package com.zcloud.key.project.service.hidden; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.key.project.api.hidden.HiddenRectificationRecordServiceI; +import com.zcloud.key.project.command.hidden.HiddenRectificationRecordAddExe; +import com.zcloud.key.project.command.hidden.HiddenRectificationRecordRemoveExe; +import com.zcloud.key.project.command.hidden.HiddenRectificationRecordUpdateExe; +import com.zcloud.key.project.command.query.hidden.HiddenRectificationRecordQueryExe; +import com.zcloud.key.project.dto.hidden.HiddenRectificationRecordAddCmd; +import com.zcloud.key.project.dto.hidden.HiddenRectificationRecordPageQry; +import com.zcloud.key.project.dto.hidden.HiddenRectificationRecordUpdateCmd; +import com.zcloud.key.project.dto.clientobject.hidden.HiddenRectificationRecordCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * web-app + * + * @Author zhaokai + * @Date 2026-03-20 11:33:38 + */ +@Service +@AllArgsConstructor +public class HiddenRectificationRecordServiceImpl implements HiddenRectificationRecordServiceI { + private final HiddenRectificationRecordAddExe hiddenRectificationRecordAddExe; + private final HiddenRectificationRecordUpdateExe hiddenRectificationRecordUpdateExe; + private final HiddenRectificationRecordRemoveExe hiddenRectificationRecordRemoveExe; + private final HiddenRectificationRecordQueryExe hiddenRectificationRecordQueryExe; + + @Override + public PageResponse listPage(HiddenRectificationRecordPageQry qry) { + + return hiddenRectificationRecordQueryExe.execute(qry); + } + + @Override + public SingleResponse add(HiddenRectificationRecordAddCmd cmd) { + + hiddenRectificationRecordAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(HiddenRectificationRecordUpdateCmd hiddenRectificationRecordUpdateCmd) { + hiddenRectificationRecordUpdateExe.execute(hiddenRectificationRecordUpdateCmd); + } + + @Override + public void remove(Long id) { + hiddenRectificationRecordRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + hiddenRectificationRecordRemoveExe.execute(ids); + } +} + diff --git a/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenServiceImpl.java b/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenServiceImpl.java new file mode 100644 index 0000000..e489564 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenServiceImpl.java @@ -0,0 +1,59 @@ +package com.zcloud.key.project.service.hidden; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.key.project.api.hidden.HiddenServiceI; +import com.zcloud.key.project.command.hidden.HiddenAddExe; +import com.zcloud.key.project.command.hidden.HiddenRemoveExe; +import com.zcloud.key.project.command.hidden.HiddenUpdateExe; +import com.zcloud.key.project.command.query.hidden.HiddenQueryExe; +import com.zcloud.key.project.dto.hidden.HiddenAddCmd; +import com.zcloud.key.project.dto.hidden.HiddenPageQry; +import com.zcloud.key.project.dto.hidden.HiddenUpdateCmd; +import com.zcloud.key.project.dto.clientobject.hidden.HiddenCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * web-app + * + * @Author zhaokai + * @Date 2026-03-20 11:32:52 + */ +@Service +@AllArgsConstructor +public class HiddenServiceImpl implements HiddenServiceI { + private final HiddenAddExe hiddenAddExe; + private final HiddenUpdateExe hiddenUpdateExe; + private final HiddenRemoveExe hiddenRemoveExe; + private final HiddenQueryExe hiddenQueryExe; + + @Override + public PageResponse listPage(HiddenPageQry qry) { + + return hiddenQueryExe.execute(qry); + } + + @Override + public SingleResponse add(HiddenAddCmd cmd) { + + hiddenAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(HiddenUpdateCmd hiddenUpdateCmd) { + hiddenUpdateExe.execute(hiddenUpdateCmd); + } + + @Override + public void remove(Long id) { + hiddenRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + hiddenRemoveExe.execute(ids); + } +} + diff --git a/web-app/src/main/java/com/zcloud/key/project/service/KeyProjectCameraServiceImpl.java b/web-app/src/main/java/com/zcloud/key/project/service/project/KeyProjectCameraServiceImpl.java similarity index 66% rename from web-app/src/main/java/com/zcloud/key/project/service/KeyProjectCameraServiceImpl.java rename to web-app/src/main/java/com/zcloud/key/project/service/project/KeyProjectCameraServiceImpl.java index 2c36661..dc80eb0 100644 --- a/web-app/src/main/java/com/zcloud/key/project/service/KeyProjectCameraServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/key/project/service/project/KeyProjectCameraServiceImpl.java @@ -1,24 +1,21 @@ -package com.zcloud.key.project.service; +package com.zcloud.key.project.service.project; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.key.project.api.KeyProjectCameraServiceI; -import com.zcloud.key.project.command.KeyProjectCameraAddExe; -import com.zcloud.key.project.command.KeyProjectCameraRemoveExe; -import com.zcloud.key.project.command.KeyProjectCameraUpdateExe; -import com.zcloud.key.project.command.query.KeyProjectCameraQueryExe; -import com.zcloud.key.project.dto.CameraListCmd; -import com.zcloud.key.project.dto.KeyProjectCameraAddCmd; -import com.zcloud.key.project.dto.KeyProjectCameraPageQry; -import com.zcloud.key.project.dto.KeyProjectCameraUpdateCmd; -import com.zcloud.key.project.dto.clientobject.CameraInfoCO; -import com.zcloud.key.project.dto.clientobject.KeyProjectCO; -import com.zcloud.key.project.dto.clientobject.KeyProjectCameraCO; +import com.zcloud.key.project.api.project.KeyProjectCameraServiceI; +import com.zcloud.key.project.command.project.KeyProjectCameraAddExe; +import com.zcloud.key.project.command.project.KeyProjectCameraRemoveExe; +import com.zcloud.key.project.command.project.KeyProjectCameraUpdateExe; +import com.zcloud.key.project.command.query.project.KeyProjectCameraQueryExe; +import com.zcloud.key.project.dto.project.CameraListCmd; +import com.zcloud.key.project.dto.project.KeyProjectCameraAddCmd; +import com.zcloud.key.project.dto.project.KeyProjectCameraPageQry; +import com.zcloud.key.project.dto.project.KeyProjectCameraUpdateCmd; +import com.zcloud.key.project.dto.clientobject.project.CameraInfoCO; +import com.zcloud.key.project.dto.clientobject.project.KeyProjectCameraCO; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; -import java.util.Collection; -import java.util.Collections; import java.util.List; /** diff --git a/web-app/src/main/java/com/zcloud/key/project/service/KeyProjectServiceImpl.java b/web-app/src/main/java/com/zcloud/key/project/service/project/KeyProjectServiceImpl.java similarity index 75% rename from web-app/src/main/java/com/zcloud/key/project/service/KeyProjectServiceImpl.java rename to web-app/src/main/java/com/zcloud/key/project/service/project/KeyProjectServiceImpl.java index a8c7200..7e60ee5 100644 --- a/web-app/src/main/java/com/zcloud/key/project/service/KeyProjectServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/key/project/service/project/KeyProjectServiceImpl.java @@ -1,18 +1,17 @@ -package com.zcloud.key.project.service; +package com.zcloud.key.project.service.project; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.key.project.api.KeyProjectServiceI; -import com.zcloud.key.project.command.KeyProjectAddExe; -import com.zcloud.key.project.command.KeyProjectRemoveExe; -import com.zcloud.key.project.command.KeyProjectUpdateExe; -import com.zcloud.key.project.command.query.KeyProjectQueryExe; -import com.zcloud.key.project.dto.*; -import com.zcloud.key.project.dto.clientobject.CorpStatisticsCO; -import com.zcloud.key.project.dto.clientobject.KeyProjectCO; -import com.zcloud.key.project.dto.clientobject.KeyProjectStatisticsCO; -import com.zcloud.key.project.dto.KeyProjectStatisticsPageQry; -import com.zcloud.key.project.dto.clientobject.XgfCorpStatisticsCO; +import com.zcloud.key.project.api.project.KeyProjectServiceI; +import com.zcloud.key.project.command.project.KeyProjectAddExe; +import com.zcloud.key.project.command.project.KeyProjectRemoveExe; +import com.zcloud.key.project.command.project.KeyProjectUpdateExe; +import com.zcloud.key.project.command.query.project.KeyProjectQueryExe; +import com.zcloud.key.project.dto.clientobject.project.CorpStatisticsCO; +import com.zcloud.key.project.dto.clientobject.project.KeyProjectCO; +import com.zcloud.key.project.dto.clientobject.project.KeyProjectStatisticsCO; +import com.zcloud.key.project.dto.project.*; +import com.zcloud.key.project.dto.clientobject.project.XgfCorpStatisticsCO; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenAcceptRecordServiceI.java b/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenAcceptRecordServiceI.java new file mode 100644 index 0000000..d58a481 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenAcceptRecordServiceI.java @@ -0,0 +1,27 @@ +package com.zcloud.key.project.api.hidden; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordAddCmd; +import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordPageQry; +import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordUpdateCmd; +import com.zcloud.key.project.dto.clientobject.hidden.HiddenAcceptRecordCO; + +/** + * web-client + * + * @Author zhaokai + * @Date 2026-03-20 11:33:08 + */ +public interface HiddenAcceptRecordServiceI { + PageResponse listPage(HiddenAcceptRecordPageQry qry); + + SingleResponse add(HiddenAcceptRecordAddCmd cmd); + + void edit(HiddenAcceptRecordUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); +} + diff --git a/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenFindUserServiceI.java b/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenFindUserServiceI.java new file mode 100644 index 0000000..d1d47f0 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenFindUserServiceI.java @@ -0,0 +1,27 @@ +package com.zcloud.key.project.api.hidden; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.key.project.dto.hidden.HiddenFindUserAddCmd; +import com.zcloud.key.project.dto.hidden.HiddenFindUserPageQry; +import com.zcloud.key.project.dto.hidden.HiddenFindUserUpdateCmd; +import com.zcloud.key.project.dto.clientobject.hidden.HiddenFindUserCO; + +/** + * web-client + * + * @Author zhaokai + * @Date 2026-03-20 11:33:23 + */ +public interface HiddenFindUserServiceI { + PageResponse listPage(HiddenFindUserPageQry qry); + + SingleResponse add(HiddenFindUserAddCmd cmd); + + void edit(HiddenFindUserUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); +} + diff --git a/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenRectificationRecordServiceI.java b/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenRectificationRecordServiceI.java new file mode 100644 index 0000000..5f1e7ee --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenRectificationRecordServiceI.java @@ -0,0 +1,27 @@ +package com.zcloud.key.project.api.hidden; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.key.project.dto.hidden.HiddenRectificationRecordAddCmd; +import com.zcloud.key.project.dto.hidden.HiddenRectificationRecordPageQry; +import com.zcloud.key.project.dto.hidden.HiddenRectificationRecordUpdateCmd; +import com.zcloud.key.project.dto.clientobject.hidden.HiddenRectificationRecordCO; + +/** + * web-client + * + * @Author zhaokai + * @Date 2026-03-20 11:33:38 + */ +public interface HiddenRectificationRecordServiceI { + PageResponse listPage(HiddenRectificationRecordPageQry qry); + + SingleResponse add(HiddenRectificationRecordAddCmd cmd); + + void edit(HiddenRectificationRecordUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); +} + diff --git a/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenServiceI.java b/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenServiceI.java new file mode 100644 index 0000000..f69f938 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenServiceI.java @@ -0,0 +1,27 @@ +package com.zcloud.key.project.api.hidden; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.key.project.dto.hidden.HiddenAddCmd; +import com.zcloud.key.project.dto.hidden.HiddenPageQry; +import com.zcloud.key.project.dto.hidden.HiddenUpdateCmd; +import com.zcloud.key.project.dto.clientobject.hidden.HiddenCO; + +/** + * web-client + * + * @Author zhaokai + * @Date 2026-03-20 11:32:52 + */ +public interface HiddenServiceI { + PageResponse listPage(HiddenPageQry qry); + + SingleResponse add(HiddenAddCmd cmd); + + void edit(HiddenUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); +} + diff --git a/web-client/src/main/java/com/zcloud/key/project/api/KeyProjectCameraServiceI.java b/web-client/src/main/java/com/zcloud/key/project/api/project/KeyProjectCameraServiceI.java similarity index 56% rename from web-client/src/main/java/com/zcloud/key/project/api/KeyProjectCameraServiceI.java rename to web-client/src/main/java/com/zcloud/key/project/api/project/KeyProjectCameraServiceI.java index b6e4860..3422943 100644 --- a/web-client/src/main/java/com/zcloud/key/project/api/KeyProjectCameraServiceI.java +++ b/web-client/src/main/java/com/zcloud/key/project/api/project/KeyProjectCameraServiceI.java @@ -1,16 +1,14 @@ -package com.zcloud.key.project.api; +package com.zcloud.key.project.api.project; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.key.project.dto.CameraListCmd; -import com.zcloud.key.project.dto.KeyProjectCameraAddCmd; -import com.zcloud.key.project.dto.KeyProjectCameraPageQry; -import com.zcloud.key.project.dto.KeyProjectCameraUpdateCmd; -import com.zcloud.key.project.dto.clientobject.CameraInfoCO; -import com.zcloud.key.project.dto.clientobject.KeyProjectCO; -import com.zcloud.key.project.dto.clientobject.KeyProjectCameraCO; +import com.zcloud.key.project.dto.project.CameraListCmd; +import com.zcloud.key.project.dto.project.KeyProjectCameraAddCmd; +import com.zcloud.key.project.dto.project.KeyProjectCameraPageQry; +import com.zcloud.key.project.dto.project.KeyProjectCameraUpdateCmd; +import com.zcloud.key.project.dto.clientobject.project.CameraInfoCO; +import com.zcloud.key.project.dto.clientobject.project.KeyProjectCameraCO; -import java.util.Collection; import java.util.List; /** diff --git a/web-client/src/main/java/com/zcloud/key/project/api/KeyProjectServiceI.java b/web-client/src/main/java/com/zcloud/key/project/api/project/KeyProjectServiceI.java similarity index 68% rename from web-client/src/main/java/com/zcloud/key/project/api/KeyProjectServiceI.java rename to web-client/src/main/java/com/zcloud/key/project/api/project/KeyProjectServiceI.java index 3dc4706..bc5b078 100644 --- a/web-client/src/main/java/com/zcloud/key/project/api/KeyProjectServiceI.java +++ b/web-client/src/main/java/com/zcloud/key/project/api/project/KeyProjectServiceI.java @@ -1,13 +1,12 @@ -package com.zcloud.key.project.api; +package com.zcloud.key.project.api.project; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.key.project.dto.*; -import com.zcloud.key.project.dto.clientobject.CorpStatisticsCO; -import com.zcloud.key.project.dto.clientobject.KeyProjectCO; -import com.zcloud.key.project.dto.clientobject.KeyProjectStatisticsCO; -import com.zcloud.key.project.dto.KeyProjectStatisticsPageQry; -import com.zcloud.key.project.dto.clientobject.XgfCorpStatisticsCO; +import com.zcloud.key.project.dto.clientobject.project.CorpStatisticsCO; +import com.zcloud.key.project.dto.clientobject.project.KeyProjectCO; +import com.zcloud.key.project.dto.clientobject.project.KeyProjectStatisticsCO; +import com.zcloud.key.project.dto.project.*; +import com.zcloud.key.project.dto.clientobject.project.XgfCorpStatisticsCO; /** * web-client diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenAcceptRecordCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenAcceptRecordCO.java new file mode 100644 index 0000000..71db449 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenAcceptRecordCO.java @@ -0,0 +1,76 @@ +package com.zcloud.key.project.dto.clientobject.hidden; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2026-03-20 11:33:08 + */ +@Data +public class HiddenAcceptRecordCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String hiddenAcceptRecordId; + //隐患主键id + @ApiModelProperty(value = "隐患主键id") + private String hiddenId; + //安全检查id + @ApiModelProperty(value = "安全检查id") + private String inspectionId; + //验收人部门id + @ApiModelProperty(value = "验收人部门id") + private Long acceptDepartmentId; + //验收人id + @ApiModelProperty(value = "验收人id") + private Long acceptUserId; + //验收时间 + @ApiModelProperty(value = "验收时间") + private LocalDateTime acceptTime; + //乐观锁 + @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/key/project/dto/clientobject/hidden/HiddenCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenCO.java new file mode 100644 index 0000000..c4fd406 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenCO.java @@ -0,0 +1,103 @@ +package com.zcloud.key.project.dto.clientobject.hidden; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2026-03-20 11:32:51 + */ +@Data +public class HiddenCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String hiddenId; + //来源ID外键 + @ApiModelProperty(value = "来源ID外键") + private String foreignKey; + //隐患来源,1-视频识别报警,2-安全环保检查(监管端) 3-安全环保检查(企业端) + @ApiModelProperty(value = "隐患来源,1-视频识别报警,2-安全环保检查(监管端) 3-安全环保检查(企业端)") + private Integer source; + //隐患状态 1,未整改,2:已整改,3:已验收,4:验收打回 + @ApiModelProperty(value = "隐患状态 1,未整改,2:已整改,3:已验收,4:验收打回") + private Integer state; + //隐患级别 + @ApiModelProperty(value = "隐患级别") + private String hiddenLevel; + //隐患级别名称 + @ApiModelProperty(value = "隐患级别名称") + private String hiddenLevelName; + //隐患描述 + @ApiModelProperty(value = "隐患描述") + private String hiddenDesc; + //法律依据 + @ApiModelProperty(value = "法律依据") + private String legalBasis; + //隐患位置描述 + @ApiModelProperty(value = "隐患位置描述") + private String positionDesc; + //隐患类型 + @ApiModelProperty(value = "隐患类型") + private String hiddenType; + //隐患类型名称 + @ApiModelProperty(value = "隐患类型名称") + private String hiddenTypeName; + //整改类型 1立即整改 2延期整改 + @ApiModelProperty(value = "整改类型 1立即整改 2延期整改") + private Integer rectificationType; + //整改期限(整改截至日期) + @ApiModelProperty(value = "整改期限(整改截至日期)") + private LocalDateTime rectificationDeadline; + //整改人部门id + @ApiModelProperty(value = "整改人部门id") + private Long rectificationDepartmentId; + //整改人id + @ApiModelProperty(value = "整改人id") + private Long rectificationUserId; + //乐观锁 + @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/key/project/dto/clientobject/hidden/HiddenFindUserCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenFindUserCO.java new file mode 100644 index 0000000..2cf2b06 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenFindUserCO.java @@ -0,0 +1,70 @@ +package com.zcloud.key.project.dto.clientobject.hidden; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2026-03-20 11:33:23 + */ +@Data +public class HiddenFindUserCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String hiddenFindUserId; + //隐患主键id + @ApiModelProperty(value = "隐患主键id") + private String hiddenId; + //安全检查id + @ApiModelProperty(value = "安全检查id") + private String inspectionId; + //发现人id + @ApiModelProperty(value = "发现人id") + private Long findUserId; + //乐观锁 + @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/key/project/dto/clientobject/hidden/HiddenRectificationRecordCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenRectificationRecordCO.java new file mode 100644 index 0000000..1c1ef74 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenRectificationRecordCO.java @@ -0,0 +1,79 @@ +package com.zcloud.key.project.dto.clientobject.hidden; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2026-03-20 11:33:38 + */ +@Data +public class HiddenRectificationRecordCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String hiddenRectificationRecordId; + //隐患主键id + @ApiModelProperty(value = "隐患主键id") + private String hiddenId; + //安全检查id + @ApiModelProperty(value = "安全检查id") + private String inspectionId; + //整改人部门id + @ApiModelProperty(value = "整改人部门id") + private Long rectificationDepartmentId; + //整改人id + @ApiModelProperty(value = "整改人id") + private Long rectificationUserId; + //整改时间 + @ApiModelProperty(value = "整改时间") + private LocalDateTime rectificationTime; + //整改描述 + @ApiModelProperty(value = "整改描述") + private String rectificationDesc; + //乐观锁 + @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/key/project/dto/clientobject/CameraInfoCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/CameraInfoCO.java similarity index 69% rename from web-client/src/main/java/com/zcloud/key/project/dto/clientobject/CameraInfoCO.java rename to web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/CameraInfoCO.java index e2e7227..dfb0505 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/CameraInfoCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/CameraInfoCO.java @@ -1,14 +1,9 @@ -package com.zcloud.key.project.dto.clientobject; +package com.zcloud.key.project.dto.clientobject.project; -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.io.Serializable; -import java.time.LocalDateTime; -import java.util.List; /** diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/CorpStatisticsCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/CorpStatisticsCO.java similarity index 84% rename from web-client/src/main/java/com/zcloud/key/project/dto/clientobject/CorpStatisticsCO.java rename to web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/CorpStatisticsCO.java index 8e10b6d..f6292b1 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/CorpStatisticsCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/CorpStatisticsCO.java @@ -1,13 +1,9 @@ -package com.zcloud.key.project.dto.clientobject; +package com.zcloud.key.project.dto.clientobject.project; -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.io.Serializable; -import java.time.LocalDateTime; import java.util.List; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/KeyProjectCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectCO.java similarity index 97% rename from web-client/src/main/java/com/zcloud/key/project/dto/clientobject/KeyProjectCO.java rename to web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectCO.java index fdb7a44..5c44062 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/KeyProjectCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectCO.java @@ -1,4 +1,4 @@ -package com.zcloud.key.project.dto.clientobject; +package com.zcloud.key.project.dto.clientobject.project; import com.alibaba.cola.dto.ClientObject; import com.baomidou.mybatisplus.annotation.TableField; @@ -44,6 +44,9 @@ public class KeyProjectCO extends ClientObject { @ApiModelProperty(value = "是否已有项目内作业,1:是,0:否") private Integer projectWorkFlag; //重点作业名称 + @ApiModelProperty(value = "重点作业id") + private String projectId; + //重点作业名称 @ApiModelProperty(value = "重点作业名称") private String projectName; //涉及重点作业属性类型 diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/KeyProjectCameraCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectCameraCO.java similarity index 83% rename from web-client/src/main/java/com/zcloud/key/project/dto/clientobject/KeyProjectCameraCO.java rename to web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectCameraCO.java index 66afc16..18103b0 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/KeyProjectCameraCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectCameraCO.java @@ -1,12 +1,9 @@ -package com.zcloud.key.project.dto.clientobject; +package com.zcloud.key.project.dto.clientobject.project; -import com.alibaba.cola.dto.ClientObject; -import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import java.time.LocalDateTime; /** diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/KeyProjectStatisticsCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectStatisticsCO.java similarity index 88% rename from web-client/src/main/java/com/zcloud/key/project/dto/clientobject/KeyProjectStatisticsCO.java rename to web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectStatisticsCO.java index 3964264..53c1f20 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/KeyProjectStatisticsCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectStatisticsCO.java @@ -1,4 +1,4 @@ -package com.zcloud.key.project.dto.clientobject; +package com.zcloud.key.project.dto.clientobject.project; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -22,6 +22,9 @@ public class KeyProjectStatisticsCO implements Serializable { @ApiModelProperty(value = "业务主键id") private String keyProjectId; //重点作业名称 + @ApiModelProperty(value = "重点作业id") + private String projectId; + //重点作业名称 @ApiModelProperty(value = "重点作业名称") private String projectName; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/XgfCorpStatisticsCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/XgfCorpStatisticsCO.java similarity index 95% rename from web-client/src/main/java/com/zcloud/key/project/dto/clientobject/XgfCorpStatisticsCO.java rename to web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/XgfCorpStatisticsCO.java index 8281d05..97a8b86 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/XgfCorpStatisticsCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/XgfCorpStatisticsCO.java @@ -1,4 +1,4 @@ -package com.zcloud.key.project.dto.clientobject; +package com.zcloud.key.project.dto.clientobject.project; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAcceptRecordAddCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAcceptRecordAddCmd.java new file mode 100644 index 0000000..21109dd --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAcceptRecordAddCmd.java @@ -0,0 +1,46 @@ +package com.zcloud.key.project.dto.hidden; + +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 2026-03-20 11:33:08 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class HiddenAcceptRecordAddCmd extends Command { + @ApiModelProperty(value = "隐患主键id", name = "hiddenId", required = true) + @NotEmpty(message = "隐患主键id不能为空") + private String hiddenId; + + @ApiModelProperty(value = "安全检查id", name = "inspectionId", required = true) + @NotEmpty(message = "安全检查id不能为空") + private String inspectionId; + + @ApiModelProperty(value = "验收人部门id", name = "acceptDepartmentId", required = true) + @NotNull(message = "验收人部门id不能为空") + private Long acceptDepartmentId; + + @ApiModelProperty(value = "验收人id", name = "acceptUserId", required = true) + @NotNull(message = "验收人id不能为空") + private Long acceptUserId; + + @ApiModelProperty(value = "验收时间", name = "acceptTime", required = true) + @NotEmpty(message = "验收时间不能为空") + private LocalDateTime acceptTime; + +} + diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAcceptRecordPageQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAcceptRecordPageQry.java new file mode 100644 index 0000000..181e88c --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAcceptRecordPageQry.java @@ -0,0 +1,28 @@ +package com.zcloud.key.project.dto.hidden; + +import com.alibaba.cola.dto.PageQuery; +import lombok.Data; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2026-03-20 11:33:08 + */ +@Data +public class HiddenAcceptRecordPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private String likeHiddenAcceptRecordId; +} + diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAcceptRecordUpdateCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAcceptRecordUpdateCmd.java new file mode 100644 index 0000000..e3c3372 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAcceptRecordUpdateCmd.java @@ -0,0 +1,47 @@ +package com.zcloud.key.project.dto.hidden; + +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 2026-03-20 11:33:08 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class HiddenAcceptRecordUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "业务主键id", name = "hiddenAcceptRecordId", required = true) + @NotEmpty(message = "业务主键id不能为空") + private String hiddenAcceptRecordId; + @ApiModelProperty(value = "隐患主键id", name = "hiddenId", required = true) + @NotEmpty(message = "隐患主键id不能为空") + private String hiddenId; + @ApiModelProperty(value = "安全检查id", name = "inspectionId", required = true) + @NotEmpty(message = "安全检查id不能为空") + private String inspectionId; + @ApiModelProperty(value = "验收人部门id", name = "acceptDepartmentId", required = true) + @NotNull(message = "验收人部门id不能为空") + private Long acceptDepartmentId; + @ApiModelProperty(value = "验收人id", name = "acceptUserId", required = true) + @NotNull(message = "验收人id不能为空") + private Long acceptUserId; + @ApiModelProperty(value = "验收时间", name = "acceptTime", required = true) + @NotEmpty(message = "验收时间不能为空") + private LocalDateTime acceptTime; +} + diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAddCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAddCmd.java new file mode 100644 index 0000000..dea3883 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAddCmd.java @@ -0,0 +1,82 @@ +package com.zcloud.key.project.dto.hidden; + +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 2026-03-20 11:32:51 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class HiddenAddCmd extends Command { + @ApiModelProperty(value = "来源ID外键", name = "foreignKey", required = true) + @NotEmpty(message = "来源ID外键不能为空") + private String foreignKey; + + @ApiModelProperty(value = "隐患来源,1-视频识别报警,2-安全环保检查(监管端) 3-安全环保检查(企业端)", name = "source", required = true) + @NotNull(message = "隐患来源,1-视频识别报警,2-安全环保检查(监管端) 3-安全环保检查(企业端)不能为空") + private Integer source; + + @ApiModelProperty(value = "隐患状态 1,未整改,2:已整改,3:已验收,4:验收打回", name = "state", required = true) + @NotNull(message = "隐患状态 1,未整改,2:已整改,3:已验收,4:验收打回不能为空") + private Integer state; + + @ApiModelProperty(value = "隐患级别", name = "hiddenLevel", required = true) + @NotEmpty(message = "隐患级别不能为空") + private String hiddenLevel; + + @ApiModelProperty(value = "隐患级别名称", name = "hiddenLevelName", required = true) + @NotEmpty(message = "隐患级别名称不能为空") + private String hiddenLevelName; + + @ApiModelProperty(value = "隐患描述", name = "hiddenDesc", required = true) + @NotEmpty(message = "隐患描述不能为空") + private String hiddenDesc; + + @ApiModelProperty(value = "法律依据", name = "legalBasis", required = true) + @NotEmpty(message = "法律依据不能为空") + private String legalBasis; + + @ApiModelProperty(value = "隐患位置描述", name = "positionDesc", required = true) + @NotEmpty(message = "隐患位置描述不能为空") + private String positionDesc; + + @ApiModelProperty(value = "隐患类型", name = "hiddenType", required = true) + @NotEmpty(message = "隐患类型不能为空") + private String hiddenType; + + @ApiModelProperty(value = "隐患类型名称", name = "hiddenTypeName", required = true) + @NotEmpty(message = "隐患类型名称不能为空") + private String hiddenTypeName; + + @ApiModelProperty(value = "整改类型 1立即整改 2延期整改", name = "rectificationType", required = true) + @NotNull(message = "整改类型 1立即整改 2延期整改不能为空") + private Integer rectificationType; + + @ApiModelProperty(value = "整改期限(整改截至日期)", name = "rectificationDeadline", required = true) + @NotEmpty(message = "整改期限(整改截至日期)不能为空") + private LocalDateTime rectificationDeadline; + + @ApiModelProperty(value = "整改人部门id", name = "rectificationDepartmentId", required = true) + @NotNull(message = "整改人部门id不能为空") + private Long rectificationDepartmentId; + + @ApiModelProperty(value = "整改人id", name = "rectificationUserId", required = true) + @NotNull(message = "整改人id不能为空") + private Long rectificationUserId; + +} + diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenFindUserAddCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenFindUserAddCmd.java new file mode 100644 index 0000000..04e378e --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenFindUserAddCmd.java @@ -0,0 +1,37 @@ +package com.zcloud.key.project.dto.hidden; + +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 2026-03-20 11:33:23 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class HiddenFindUserAddCmd extends Command { + @ApiModelProperty(value = "隐患主键id", name = "hiddenId", required = true) + @NotEmpty(message = "隐患主键id不能为空") + private String hiddenId; + + @ApiModelProperty(value = "安全检查id", name = "inspectionId", required = true) + @NotEmpty(message = "安全检查id不能为空") + private String inspectionId; + + @ApiModelProperty(value = "发现人id", name = "findUserId", required = true) + @NotNull(message = "发现人id不能为空") + private Long findUserId; + +} + diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenFindUserPageQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenFindUserPageQry.java new file mode 100644 index 0000000..855494b --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenFindUserPageQry.java @@ -0,0 +1,28 @@ +package com.zcloud.key.project.dto.hidden; + +import com.alibaba.cola.dto.PageQuery; +import lombok.Data; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2026-03-20 11:33:23 + */ +@Data +public class HiddenFindUserPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private String likeHiddenFindUserId; +} + diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenFindUserUpdateCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenFindUserUpdateCmd.java new file mode 100644 index 0000000..974ac6c --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenFindUserUpdateCmd.java @@ -0,0 +1,40 @@ +package com.zcloud.key.project.dto.hidden; + +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 2026-03-20 11:33:23 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class HiddenFindUserUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "业务主键id", name = "hiddenFindUserId", required = true) + @NotEmpty(message = "业务主键id不能为空") + private String hiddenFindUserId; + @ApiModelProperty(value = "隐患主键id", name = "hiddenId", required = true) + @NotEmpty(message = "隐患主键id不能为空") + private String hiddenId; + @ApiModelProperty(value = "安全检查id", name = "inspectionId", required = true) + @NotEmpty(message = "安全检查id不能为空") + private String inspectionId; + @ApiModelProperty(value = "发现人id", name = "findUserId", required = true) + @NotNull(message = "发现人id不能为空") + private Long findUserId; +} + diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenPageQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenPageQry.java new file mode 100644 index 0000000..e7cc439 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenPageQry.java @@ -0,0 +1,28 @@ +package com.zcloud.key.project.dto.hidden; + +import com.alibaba.cola.dto.PageQuery; +import lombok.Data; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2026-03-20 11:32:51 + */ +@Data +public class HiddenPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private String likeHiddenId; +} + diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenRectificationRecordAddCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenRectificationRecordAddCmd.java new file mode 100644 index 0000000..d8249b6 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenRectificationRecordAddCmd.java @@ -0,0 +1,50 @@ +package com.zcloud.key.project.dto.hidden; + +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 2026-03-20 11:33:38 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class HiddenRectificationRecordAddCmd extends Command { + @ApiModelProperty(value = "隐患主键id", name = "hiddenId", required = true) + @NotEmpty(message = "隐患主键id不能为空") + private String hiddenId; + + @ApiModelProperty(value = "安全检查id", name = "inspectionId", required = true) + @NotEmpty(message = "安全检查id不能为空") + private String inspectionId; + + @ApiModelProperty(value = "整改人部门id", name = "rectificationDepartmentId", required = true) + @NotNull(message = "整改人部门id不能为空") + private Long rectificationDepartmentId; + + @ApiModelProperty(value = "整改人id", name = "rectificationUserId", required = true) + @NotNull(message = "整改人id不能为空") + private Long rectificationUserId; + + @ApiModelProperty(value = "整改时间", name = "rectificationTime", required = true) + @NotEmpty(message = "整改时间不能为空") + private LocalDateTime rectificationTime; + + @ApiModelProperty(value = "整改描述", name = "rectificationDesc", required = true) + @NotEmpty(message = "整改描述不能为空") + private String rectificationDesc; + +} + diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenRectificationRecordPageQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenRectificationRecordPageQry.java new file mode 100644 index 0000000..2cfc96c --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenRectificationRecordPageQry.java @@ -0,0 +1,28 @@ +package com.zcloud.key.project.dto.hidden; + +import com.alibaba.cola.dto.PageQuery; +import lombok.Data; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2026-03-20 11:33:38 + */ +@Data +public class HiddenRectificationRecordPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private String likeHiddenRectificationRecordId; +} + diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenRectificationRecordUpdateCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenRectificationRecordUpdateCmd.java new file mode 100644 index 0000000..bcd2869 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenRectificationRecordUpdateCmd.java @@ -0,0 +1,50 @@ +package com.zcloud.key.project.dto.hidden; + +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 2026-03-20 11:33:38 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class HiddenRectificationRecordUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "业务主键id", name = "hiddenRectificationRecordId", required = true) + @NotEmpty(message = "业务主键id不能为空") + private String hiddenRectificationRecordId; + @ApiModelProperty(value = "隐患主键id", name = "hiddenId", required = true) + @NotEmpty(message = "隐患主键id不能为空") + private String hiddenId; + @ApiModelProperty(value = "安全检查id", name = "inspectionId", required = true) + @NotEmpty(message = "安全检查id不能为空") + private String inspectionId; + @ApiModelProperty(value = "整改人部门id", name = "rectificationDepartmentId", required = true) + @NotNull(message = "整改人部门id不能为空") + private Long rectificationDepartmentId; + @ApiModelProperty(value = "整改人id", name = "rectificationUserId", required = true) + @NotNull(message = "整改人id不能为空") + private Long rectificationUserId; + @ApiModelProperty(value = "整改时间", name = "rectificationTime", required = true) + @NotEmpty(message = "整改时间不能为空") + private LocalDateTime rectificationTime; + @ApiModelProperty(value = "整改描述", name = "rectificationDesc", required = true) + @NotEmpty(message = "整改描述不能为空") + private String rectificationDesc; +} + diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenUpdateCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenUpdateCmd.java new file mode 100644 index 0000000..eacbb37 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenUpdateCmd.java @@ -0,0 +1,74 @@ +package com.zcloud.key.project.dto.hidden; + +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 2026-03-20 11:32:52 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class HiddenUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "业务主键id", name = "hiddenId", required = true) + @NotEmpty(message = "业务主键id不能为空") + private String hiddenId; + @ApiModelProperty(value = "来源ID外键", name = "foreignKey", required = true) + @NotEmpty(message = "来源ID外键不能为空") + private String foreignKey; + @ApiModelProperty(value = "隐患来源,1-视频识别报警,2-安全环保检查(监管端) 3-安全环保检查(企业端)", name = "source", required = true) + @NotNull(message = "隐患来源,1-视频识别报警,2-安全环保检查(监管端) 3-安全环保检查(企业端)不能为空") + private Integer source; + @ApiModelProperty(value = "隐患状态 1,未整改,2:已整改,3:已验收,4:验收打回", name = "state", required = true) + @NotNull(message = "隐患状态 1,未整改,2:已整改,3:已验收,4:验收打回不能为空") + private Integer state; + @ApiModelProperty(value = "隐患级别", name = "hiddenLevel", required = true) + @NotEmpty(message = "隐患级别不能为空") + private String hiddenLevel; + @ApiModelProperty(value = "隐患级别名称", name = "hiddenLevelName", required = true) + @NotEmpty(message = "隐患级别名称不能为空") + private String hiddenLevelName; + @ApiModelProperty(value = "隐患描述", name = "hiddenDesc", required = true) + @NotEmpty(message = "隐患描述不能为空") + private String hiddenDesc; + @ApiModelProperty(value = "法律依据", name = "legalBasis", required = true) + @NotEmpty(message = "法律依据不能为空") + private String legalBasis; + @ApiModelProperty(value = "隐患位置描述", name = "positionDesc", required = true) + @NotEmpty(message = "隐患位置描述不能为空") + private String positionDesc; + @ApiModelProperty(value = "隐患类型", name = "hiddenType", required = true) + @NotEmpty(message = "隐患类型不能为空") + private String hiddenType; + @ApiModelProperty(value = "隐患类型名称", name = "hiddenTypeName", required = true) + @NotEmpty(message = "隐患类型名称不能为空") + private String hiddenTypeName; + @ApiModelProperty(value = "整改类型 1立即整改 2延期整改", name = "rectificationType", required = true) + @NotNull(message = "整改类型 1立即整改 2延期整改不能为空") + private Integer rectificationType; + @ApiModelProperty(value = "整改期限(整改截至日期)", name = "rectificationDeadline", required = true) + @NotEmpty(message = "整改期限(整改截至日期)不能为空") + private LocalDateTime rectificationDeadline; + @ApiModelProperty(value = "整改人部门id", name = "rectificationDepartmentId", required = true) + @NotNull(message = "整改人部门id不能为空") + private Long rectificationDepartmentId; + @ApiModelProperty(value = "整改人id", name = "rectificationUserId", required = true) + @NotNull(message = "整改人id不能为空") + private Long rectificationUserId; +} + diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/CameraListCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/CameraListCmd.java similarity index 89% rename from web-client/src/main/java/com/zcloud/key/project/dto/CameraListCmd.java rename to web-client/src/main/java/com/zcloud/key/project/dto/project/CameraListCmd.java index 0d2ffe6..2b4e486 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/CameraListCmd.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/CameraListCmd.java @@ -1,12 +1,9 @@ -package com.zcloud.key.project.dto; +package com.zcloud.key.project.dto.project; import com.alibaba.cola.dto.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; -import java.util.List; - /** * web-client diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/CorpStatisticsPageQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/CorpStatisticsPageQry.java similarity index 79% rename from web-client/src/main/java/com/zcloud/key/project/dto/CorpStatisticsPageQry.java rename to web-client/src/main/java/com/zcloud/key/project/dto/project/CorpStatisticsPageQry.java index 12e8b9b..a1f3d11 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/CorpStatisticsPageQry.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/CorpStatisticsPageQry.java @@ -1,14 +1,9 @@ -package com.zcloud.key.project.dto; +package com.zcloud.key.project.dto.project; 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; -import java.util.List; - /** * web-client diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/KeyProjectAddCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectAddCmd.java similarity index 97% rename from web-client/src/main/java/com/zcloud/key/project/dto/KeyProjectAddCmd.java rename to web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectAddCmd.java index 4092d48..7aeee37 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/KeyProjectAddCmd.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectAddCmd.java @@ -1,4 +1,4 @@ -package com.zcloud.key.project.dto; +package com.zcloud.key.project.dto.project; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; @@ -10,7 +10,6 @@ import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.time.LocalDate; -import java.time.LocalDateTime; import java.util.List; /** @@ -43,6 +42,9 @@ public class KeyProjectAddCmd implements Serializable { @ApiModelProperty(value = "是否已有项目内作业,1:是,0:否", name = "projectWorkFlag", required = true) @NotNull(message = "是否已有项目内作业,1:是,0:否不能为空") private Integer projectWorkFlag; + //重点作业名称 + @ApiModelProperty(value = "重点作业id") + private String projectId; @ApiModelProperty(value = "重点作业名称", name = "projectName", required = true) @NotEmpty(message = "重点作业名称不能为空") diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/KeyProjectCameraAddCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectCameraAddCmd.java similarity index 90% rename from web-client/src/main/java/com/zcloud/key/project/dto/KeyProjectCameraAddCmd.java rename to web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectCameraAddCmd.java index d8d28c0..37d5d9e 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/KeyProjectCameraAddCmd.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectCameraAddCmd.java @@ -1,10 +1,8 @@ -package com.zcloud.key.project.dto; +package com.zcloud.key.project.dto.project; -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; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/KeyProjectCameraPageQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectCameraPageQry.java similarity index 95% rename from web-client/src/main/java/com/zcloud/key/project/dto/KeyProjectCameraPageQry.java rename to web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectCameraPageQry.java index e10c2f9..5777434 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/KeyProjectCameraPageQry.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectCameraPageQry.java @@ -1,4 +1,4 @@ -package com.zcloud.key.project.dto; +package com.zcloud.key.project.dto.project; import com.alibaba.cola.dto.PageQuery; import io.swagger.annotations.ApiModelProperty; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/KeyProjectCameraUpdateCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectCameraUpdateCmd.java similarity index 96% rename from web-client/src/main/java/com/zcloud/key/project/dto/KeyProjectCameraUpdateCmd.java rename to web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectCameraUpdateCmd.java index 29227c4..7b9d621 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/KeyProjectCameraUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectCameraUpdateCmd.java @@ -1,4 +1,4 @@ -package com.zcloud.key.project.dto; +package com.zcloud.key.project.dto.project; import com.alibaba.cola.dto.Command; import io.swagger.annotations.ApiModelProperty; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/KeyProjectPageQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectPageQry.java similarity index 97% rename from web-client/src/main/java/com/zcloud/key/project/dto/KeyProjectPageQry.java rename to web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectPageQry.java index 38d3413..bd17445 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/KeyProjectPageQry.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectPageQry.java @@ -1,4 +1,4 @@ -package com.zcloud.key.project.dto; +package com.zcloud.key.project.dto.project; import com.alibaba.cola.dto.PageQuery; import com.fasterxml.jackson.annotation.JsonFormat; @@ -7,7 +7,6 @@ import lombok.Data; import javax.validation.constraints.NotEmpty; import java.time.LocalDate; -import java.time.LocalDateTime; import java.util.List; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/KeyProjectStatisticsPageQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectStatisticsPageQry.java similarity index 94% rename from web-client/src/main/java/com/zcloud/key/project/dto/KeyProjectStatisticsPageQry.java rename to web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectStatisticsPageQry.java index fb91b44..5375121 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/KeyProjectStatisticsPageQry.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectStatisticsPageQry.java @@ -1,4 +1,4 @@ -package com.zcloud.key.project.dto; +package com.zcloud.key.project.dto.project; import com.alibaba.cola.dto.PageQuery; import io.swagger.annotations.ApiModelProperty; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/KeyProjectUpdateCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectUpdateCmd.java similarity index 97% rename from web-client/src/main/java/com/zcloud/key/project/dto/KeyProjectUpdateCmd.java rename to web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectUpdateCmd.java index 7b16113..35c86b3 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/KeyProjectUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectUpdateCmd.java @@ -1,4 +1,4 @@ -package com.zcloud.key.project.dto; +package com.zcloud.key.project.dto.project; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; @@ -10,7 +10,6 @@ import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.time.LocalDate; -import java.time.LocalDateTime; import java.util.List; /** @@ -47,7 +46,9 @@ public class KeyProjectUpdateCmd implements Serializable { @ApiModelProperty(value = "是否已有项目内作业,1:是,0:否", name = "projectWorkFlag", required = true) @NotNull(message = "是否已有项目内作业,1:是,0:否不能为空") private Integer projectWorkFlag; - + //重点作业名称 + @ApiModelProperty(value = "重点作业id") + private String projectId; @ApiModelProperty(value = "重点作业名称", name = "projectName", required = true) @NotEmpty(message = "重点作业名称不能为空") private String projectName; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/KeyProjectUpdateStatusCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectUpdateStatusCmd.java similarity index 87% rename from web-client/src/main/java/com/zcloud/key/project/dto/KeyProjectUpdateStatusCmd.java rename to web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectUpdateStatusCmd.java index 1c077a7..bebad41 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/KeyProjectUpdateStatusCmd.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectUpdateStatusCmd.java @@ -1,15 +1,12 @@ -package com.zcloud.key.project.dto; +package com.zcloud.key.project.dto.project; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.io.Serializable; -import java.time.LocalDateTime; import java.util.List; /** diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/XgfCorpStatisticsPageQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/XgfCorpStatisticsPageQry.java similarity index 94% rename from web-client/src/main/java/com/zcloud/key/project/dto/XgfCorpStatisticsPageQry.java rename to web-client/src/main/java/com/zcloud/key/project/dto/project/XgfCorpStatisticsPageQry.java index 232088f..9980943 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/XgfCorpStatisticsPageQry.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/XgfCorpStatisticsPageQry.java @@ -1,4 +1,4 @@ -package com.zcloud.key.project.dto; +package com.zcloud.key.project.dto.project; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/web-domain/src/main/java/com/zcloud/key/project/domain/gateway/hidden/HiddenAcceptRecordGateway.java b/web-domain/src/main/java/com/zcloud/key/project/domain/gateway/hidden/HiddenAcceptRecordGateway.java new file mode 100644 index 0000000..c556b12 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/gateway/hidden/HiddenAcceptRecordGateway.java @@ -0,0 +1,30 @@ +package com.zcloud.key.project.domain.gateway.hidden; + +import com.zcloud.key.project.domain.model.hidden.HiddenAcceptRecordE; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2026-03-20 11:33:08 + */ +public interface HiddenAcceptRecordGateway { + + /** + * 新增 + */ + Boolean add(HiddenAcceptRecordE hiddenAcceptRecordE); + + /** + * 修改 + */ + Boolean update(HiddenAcceptRecordE hiddenAcceptRecordE); + + /** + * 删除 + */ + Boolean deletedHiddenAcceptRecordById(Long id); + + Boolean deletedHiddenAcceptRecordByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/key/project/domain/gateway/hidden/HiddenFindUserGateway.java b/web-domain/src/main/java/com/zcloud/key/project/domain/gateway/hidden/HiddenFindUserGateway.java new file mode 100644 index 0000000..7c1a611 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/gateway/hidden/HiddenFindUserGateway.java @@ -0,0 +1,30 @@ +package com.zcloud.key.project.domain.gateway.hidden; + +import com.zcloud.key.project.domain.model.hidden.HiddenFindUserE; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2026-03-20 11:33:23 + */ +public interface HiddenFindUserGateway { + + /** + * 新增 + */ + Boolean add(HiddenFindUserE hiddenFindUserE); + + /** + * 修改 + */ + Boolean update(HiddenFindUserE hiddenFindUserE); + + /** + * 删除 + */ + Boolean deletedHiddenFindUserById(Long id); + + Boolean deletedHiddenFindUserByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/key/project/domain/gateway/hidden/HiddenGateway.java b/web-domain/src/main/java/com/zcloud/key/project/domain/gateway/hidden/HiddenGateway.java new file mode 100644 index 0000000..30bd978 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/gateway/hidden/HiddenGateway.java @@ -0,0 +1,30 @@ +package com.zcloud.key.project.domain.gateway.hidden; + +import com.zcloud.key.project.domain.model.hidden.HiddenE; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2026-03-20 11:32:51 + */ +public interface HiddenGateway { + + /** + * 新增 + */ + Boolean add(HiddenE hiddenE); + + /** + * 修改 + */ + Boolean update(HiddenE hiddenE); + + /** + * 删除 + */ + Boolean deletedHiddenById(Long id); + + Boolean deletedHiddenByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/key/project/domain/gateway/hidden/HiddenRectificationRecordGateway.java b/web-domain/src/main/java/com/zcloud/key/project/domain/gateway/hidden/HiddenRectificationRecordGateway.java new file mode 100644 index 0000000..e0e5f4f --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/gateway/hidden/HiddenRectificationRecordGateway.java @@ -0,0 +1,30 @@ +package com.zcloud.key.project.domain.gateway.hidden; + +import com.zcloud.key.project.domain.model.hidden.HiddenRectificationRecordE; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2026-03-20 11:33:38 + */ +public interface HiddenRectificationRecordGateway { + + /** + * 新增 + */ + Boolean add(HiddenRectificationRecordE hiddenRectificationRecordE); + + /** + * 修改 + */ + Boolean update(HiddenRectificationRecordE hiddenRectificationRecordE); + + /** + * 删除 + */ + Boolean deletedHiddenRectificationRecordById(Long id); + + Boolean deletedHiddenRectificationRecordByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/key/project/domain/gateway/KeyProjectCameraGateway.java b/web-domain/src/main/java/com/zcloud/key/project/domain/gateway/project/KeyProjectCameraGateway.java similarity index 77% rename from web-domain/src/main/java/com/zcloud/key/project/domain/gateway/KeyProjectCameraGateway.java rename to web-domain/src/main/java/com/zcloud/key/project/domain/gateway/project/KeyProjectCameraGateway.java index d8d19b6..825a216 100644 --- a/web-domain/src/main/java/com/zcloud/key/project/domain/gateway/KeyProjectCameraGateway.java +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/gateway/project/KeyProjectCameraGateway.java @@ -1,6 +1,6 @@ -package com.zcloud.key.project.domain.gateway; +package com.zcloud.key.project.domain.gateway.project; -import com.zcloud.key.project.domain.model.KeyProjectCameraE; +import com.zcloud.key.project.domain.model.project.KeyProjectCameraE; /** * web-domain diff --git a/web-domain/src/main/java/com/zcloud/key/project/domain/gateway/KeyProjectGateway.java b/web-domain/src/main/java/com/zcloud/key/project/domain/gateway/project/KeyProjectGateway.java similarity index 76% rename from web-domain/src/main/java/com/zcloud/key/project/domain/gateway/KeyProjectGateway.java rename to web-domain/src/main/java/com/zcloud/key/project/domain/gateway/project/KeyProjectGateway.java index 02500cc..ca07b69 100644 --- a/web-domain/src/main/java/com/zcloud/key/project/domain/gateway/KeyProjectGateway.java +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/gateway/project/KeyProjectGateway.java @@ -1,6 +1,6 @@ -package com.zcloud.key.project.domain.gateway; +package com.zcloud.key.project.domain.gateway.project; -import com.zcloud.key.project.domain.model.KeyProjectE; +import com.zcloud.key.project.domain.model.project.KeyProjectE; /** * web-domain diff --git a/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenAcceptRecordE.java b/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenAcceptRecordE.java new file mode 100644 index 0000000..9f58c9a --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenAcceptRecordE.java @@ -0,0 +1,55 @@ +package com.zcloud.key.project.domain.model.hidden; + +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2026-03-20 11:33:08 + */ +@Data +public class HiddenAcceptRecordE extends BaseE { + //主键 + private Long id; + //业务主键id + private String hiddenAcceptRecordId; + //隐患主键id + private String hiddenId; + //安全检查id + private String inspectionId; + //验收人部门id + private Long acceptDepartmentId; + //验收人id + private Long acceptUserId; + //验收时间 + private LocalDateTime acceptTime; + //乐观锁 + 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/key/project/domain/model/hidden/HiddenE.java b/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenE.java new file mode 100644 index 0000000..363b004 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenE.java @@ -0,0 +1,73 @@ +package com.zcloud.key.project.domain.model.hidden; + +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2026-03-20 11:32:51 + */ +@Data +public class HiddenE extends BaseE { + //主键 + private Long id; + //业务主键id + private String hiddenId; + //来源ID外键 + private String foreignKey; + //隐患来源,1-视频识别报警,2-安全环保检查(监管端) 3-安全环保检查(企业端) + private Integer source; + //隐患状态 1,未整改,2:已整改,3:已验收,4:验收打回 + private Integer state; + //隐患级别 + private String hiddenLevel; + //隐患级别名称 + private String hiddenLevelName; + //隐患描述 + private String hiddenDesc; + //法律依据 + private String legalBasis; + //隐患位置描述 + private String positionDesc; + //隐患类型 + private String hiddenType; + //隐患类型名称 + private String hiddenTypeName; + //整改类型 1立即整改 2延期整改 + private Integer rectificationType; + //整改期限(整改截至日期) + private LocalDateTime rectificationDeadline; + //整改人部门id + private Long rectificationDepartmentId; + //整改人id + private Long rectificationUserId; + //乐观锁 + 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/key/project/domain/model/hidden/HiddenFindUserE.java b/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenFindUserE.java new file mode 100644 index 0000000..37655f1 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenFindUserE.java @@ -0,0 +1,51 @@ +package com.zcloud.key.project.domain.model.hidden; + +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2026-03-20 11:33:23 + */ +@Data +public class HiddenFindUserE extends BaseE { + //主键 + private Long id; + //业务主键id + private String hiddenFindUserId; + //隐患主键id + private String hiddenId; + //安全检查id + private String inspectionId; + //发现人id + private Long findUserId; + //乐观锁 + 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/key/project/domain/model/hidden/HiddenRectificationRecordE.java b/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenRectificationRecordE.java new file mode 100644 index 0000000..5ee3df0 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenRectificationRecordE.java @@ -0,0 +1,57 @@ +package com.zcloud.key.project.domain.model.hidden; + +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * web-domain + * + * @Author zhaokai + * @Date 2026-03-20 11:33:38 + */ +@Data +public class HiddenRectificationRecordE extends BaseE { + //主键 + private Long id; + //业务主键id + private String hiddenRectificationRecordId; + //隐患主键id + private String hiddenId; + //安全检查id + private String inspectionId; + //整改人部门id + private Long rectificationDepartmentId; + //整改人id + private Long rectificationUserId; + //整改时间 + private LocalDateTime rectificationTime; + //整改描述 + private String rectificationDesc; + //乐观锁 + 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/key/project/domain/model/KeyProjectCameraE.java b/web-domain/src/main/java/com/zcloud/key/project/domain/model/project/KeyProjectCameraE.java similarity index 95% rename from web-domain/src/main/java/com/zcloud/key/project/domain/model/KeyProjectCameraE.java rename to web-domain/src/main/java/com/zcloud/key/project/domain/model/project/KeyProjectCameraE.java index 60b9b98..879e1f5 100644 --- a/web-domain/src/main/java/com/zcloud/key/project/domain/model/KeyProjectCameraE.java +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/model/project/KeyProjectCameraE.java @@ -1,4 +1,4 @@ -package com.zcloud.key.project.domain.model; +package com.zcloud.key.project.domain.model.project; import com.jjb.saas.framework.domain.model.BaseE; import lombok.Data; diff --git a/web-domain/src/main/java/com/zcloud/key/project/domain/model/KeyProjectE.java b/web-domain/src/main/java/com/zcloud/key/project/domain/model/project/KeyProjectE.java similarity index 96% rename from web-domain/src/main/java/com/zcloud/key/project/domain/model/KeyProjectE.java rename to web-domain/src/main/java/com/zcloud/key/project/domain/model/project/KeyProjectE.java index dbb9ecd..ef2cd78 100644 --- a/web-domain/src/main/java/com/zcloud/key/project/domain/model/KeyProjectE.java +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/model/project/KeyProjectE.java @@ -1,7 +1,6 @@ -package com.zcloud.key.project.domain.model; +package com.zcloud.key.project.domain.model.project; import com.jjb.saas.framework.domain.model.BaseE; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.time.LocalDate; @@ -32,6 +31,8 @@ public class KeyProjectE extends BaseE { //是否已有项目内作业,1:是,0:否 private Integer projectWorkFlag; //重点作业名称 + private String projectId; + //重点作业名称 private String projectName; //涉及重点作业属性类型 private String projectType; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/hidden/HiddenAcceptRecordGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/hidden/HiddenAcceptRecordGatewayImpl.java new file mode 100644 index 0000000..869d3d4 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/hidden/HiddenAcceptRecordGatewayImpl.java @@ -0,0 +1,50 @@ +package com.zcloud.key.project.gatewayimpl.hidden; + +import com.zcloud.key.project.domain.gateway.hidden.HiddenAcceptRecordGateway; +import com.zcloud.key.project.domain.model.hidden.HiddenAcceptRecordE; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenAcceptRecordDO; +import com.zcloud.key.project.persistence.repository.hidden.HiddenAcceptRecordRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2026-03-20 11:33:08 + */ +@Service +@AllArgsConstructor +public class HiddenAcceptRecordGatewayImpl implements HiddenAcceptRecordGateway { + private final HiddenAcceptRecordRepository hiddenAcceptRecordRepository; + + @Override + public Boolean add(HiddenAcceptRecordE hiddenAcceptRecordE) { + HiddenAcceptRecordDO d = new HiddenAcceptRecordDO(); + BeanUtils.copyProperties(hiddenAcceptRecordE, d); + hiddenAcceptRecordRepository.save(d); + return true; + } + + @Override + public Boolean update(HiddenAcceptRecordE hiddenAcceptRecordE) { + HiddenAcceptRecordDO d = new HiddenAcceptRecordDO(); + BeanUtils.copyProperties(hiddenAcceptRecordE, d); + hiddenAcceptRecordRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedHiddenAcceptRecordById(Long id) { + return hiddenAcceptRecordRepository.removeById(id); + } + + @Override + public Boolean deletedHiddenAcceptRecordByIds(Long[] ids) { + return hiddenAcceptRecordRepository.removeByIds(Collections.singletonList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/hidden/HiddenFindUserGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/hidden/HiddenFindUserGatewayImpl.java new file mode 100644 index 0000000..a6b50d4 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/hidden/HiddenFindUserGatewayImpl.java @@ -0,0 +1,50 @@ +package com.zcloud.key.project.gatewayimpl.hidden; + +import com.zcloud.key.project.domain.gateway.hidden.HiddenFindUserGateway; +import com.zcloud.key.project.domain.model.hidden.HiddenFindUserE; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenFindUserDO; +import com.zcloud.key.project.persistence.repository.hidden.HiddenFindUserRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2026-03-20 11:33:23 + */ +@Service +@AllArgsConstructor +public class HiddenFindUserGatewayImpl implements HiddenFindUserGateway { + private final HiddenFindUserRepository hiddenFindUserRepository; + + @Override + public Boolean add(HiddenFindUserE hiddenFindUserE) { + HiddenFindUserDO d = new HiddenFindUserDO(); + BeanUtils.copyProperties(hiddenFindUserE, d); + hiddenFindUserRepository.save(d); + return true; + } + + @Override + public Boolean update(HiddenFindUserE hiddenFindUserE) { + HiddenFindUserDO d = new HiddenFindUserDO(); + BeanUtils.copyProperties(hiddenFindUserE, d); + hiddenFindUserRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedHiddenFindUserById(Long id) { + return hiddenFindUserRepository.removeById(id); + } + + @Override + public Boolean deletedHiddenFindUserByIds(Long[] ids) { + return hiddenFindUserRepository.removeByIds(Collections.singletonList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/hidden/HiddenGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/hidden/HiddenGatewayImpl.java new file mode 100644 index 0000000..3db0f94 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/hidden/HiddenGatewayImpl.java @@ -0,0 +1,50 @@ +package com.zcloud.key.project.gatewayimpl.hidden; + +import com.zcloud.key.project.domain.gateway.hidden.HiddenGateway; +import com.zcloud.key.project.domain.model.hidden.HiddenE; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO; +import com.zcloud.key.project.persistence.repository.hidden.HiddenRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2026-03-20 11:32:51 + */ +@Service +@AllArgsConstructor +public class HiddenGatewayImpl implements HiddenGateway { + private final HiddenRepository hiddenRepository; + + @Override + public Boolean add(HiddenE hiddenE) { + HiddenDO d = new HiddenDO(); + BeanUtils.copyProperties(hiddenE, d); + hiddenRepository.save(d); + return true; + } + + @Override + public Boolean update(HiddenE hiddenE) { + HiddenDO d = new HiddenDO(); + BeanUtils.copyProperties(hiddenE, d); + hiddenRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedHiddenById(Long id) { + return hiddenRepository.removeById(id); + } + + @Override + public Boolean deletedHiddenByIds(Long[] ids) { + return hiddenRepository.removeByIds(Collections.singletonList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/hidden/HiddenRectificationRecordGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/hidden/HiddenRectificationRecordGatewayImpl.java new file mode 100644 index 0000000..6656494 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/hidden/HiddenRectificationRecordGatewayImpl.java @@ -0,0 +1,50 @@ +package com.zcloud.key.project.gatewayimpl.hidden; + +import com.zcloud.key.project.domain.gateway.hidden.HiddenRectificationRecordGateway; +import com.zcloud.key.project.domain.model.hidden.HiddenRectificationRecordE; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenRectificationRecordDO; +import com.zcloud.key.project.persistence.repository.hidden.HiddenRectificationRecordRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2026-03-20 11:33:38 + */ +@Service +@AllArgsConstructor +public class HiddenRectificationRecordGatewayImpl implements HiddenRectificationRecordGateway { + private final HiddenRectificationRecordRepository hiddenRectificationRecordRepository; + + @Override + public Boolean add(HiddenRectificationRecordE hiddenRectificationRecordE) { + HiddenRectificationRecordDO d = new HiddenRectificationRecordDO(); + BeanUtils.copyProperties(hiddenRectificationRecordE, d); + hiddenRectificationRecordRepository.save(d); + return true; + } + + @Override + public Boolean update(HiddenRectificationRecordE hiddenRectificationRecordE) { + HiddenRectificationRecordDO d = new HiddenRectificationRecordDO(); + BeanUtils.copyProperties(hiddenRectificationRecordE, d); + hiddenRectificationRecordRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedHiddenRectificationRecordById(Long id) { + return hiddenRectificationRecordRepository.removeById(id); + } + + @Override + public Boolean deletedHiddenRectificationRecordByIds(Long[] ids) { + return hiddenRectificationRecordRepository.removeByIds(Collections.singletonList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/KeyProjectCameraGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/project/KeyProjectCameraGatewayImpl.java similarity index 80% rename from web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/KeyProjectCameraGatewayImpl.java rename to web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/project/KeyProjectCameraGatewayImpl.java index 360055b..c3d5774 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/KeyProjectCameraGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/project/KeyProjectCameraGatewayImpl.java @@ -1,10 +1,10 @@ -package com.zcloud.key.project.gatewayimpl; +package com.zcloud.key.project.gatewayimpl.project; import com.zcloud.gbscommon.utils.Tools; -import com.zcloud.key.project.domain.gateway.KeyProjectCameraGateway; -import com.zcloud.key.project.domain.model.KeyProjectCameraE; -import com.zcloud.key.project.persistence.dataobject.KeyProjectCameraDO; -import com.zcloud.key.project.persistence.repository.KeyProjectCameraRepository; +import com.zcloud.key.project.domain.gateway.project.KeyProjectCameraGateway; +import com.zcloud.key.project.domain.model.project.KeyProjectCameraE; +import com.zcloud.key.project.persistence.dataobject.project.KeyProjectCameraDO; +import com.zcloud.key.project.persistence.repository.project.KeyProjectCameraRepository; import lombok.AllArgsConstructor; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/KeyProjectGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/project/KeyProjectGatewayImpl.java similarity index 81% rename from web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/KeyProjectGatewayImpl.java rename to web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/project/KeyProjectGatewayImpl.java index 9c30620..c901f5a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/KeyProjectGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/project/KeyProjectGatewayImpl.java @@ -1,11 +1,11 @@ -package com.zcloud.key.project.gatewayimpl; +package com.zcloud.key.project.gatewayimpl.project; import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.gbscommon.utils.Tools; -import com.zcloud.key.project.domain.gateway.KeyProjectGateway; -import com.zcloud.key.project.domain.model.KeyProjectE; -import com.zcloud.key.project.persistence.dataobject.KeyProjectDO; -import com.zcloud.key.project.persistence.repository.KeyProjectRepository; +import com.zcloud.key.project.domain.gateway.project.KeyProjectGateway; +import com.zcloud.key.project.domain.model.project.KeyProjectE; +import com.zcloud.key.project.persistence.dataobject.project.KeyProjectDO; +import com.zcloud.key.project.persistence.repository.project.KeyProjectRepository; import lombok.AllArgsConstructor; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenAcceptRecordDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenAcceptRecordDO.java new file mode 100644 index 0000000..18678de --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenAcceptRecordDO.java @@ -0,0 +1,47 @@ +package com.zcloud.key.project.persistence.dataobject.hidden; + +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 2026-03-20 11:33:08 + */ +@Data +@TableName("hidden_accept_record") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class HiddenAcceptRecordDO extends BaseDO { + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String hiddenAcceptRecordId; + //隐患主键id + @ApiModelProperty(value = "隐患主键id") + private String hiddenId; + //安全检查id + @ApiModelProperty(value = "安全检查id") + private String inspectionId; + //验收人部门id + @ApiModelProperty(value = "验收人部门id") + private Long acceptDepartmentId; + //验收人id + @ApiModelProperty(value = "验收人id") + private Long acceptUserId; + //验收时间 + @ApiModelProperty(value = "验收时间") + private LocalDateTime acceptTime; + + public HiddenAcceptRecordDO(String hiddenAcceptRecordId) { + this.hiddenAcceptRecordId = hiddenAcceptRecordId; + } + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenDO.java new file mode 100644 index 0000000..2e54b28 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenDO.java @@ -0,0 +1,74 @@ +package com.zcloud.key.project.persistence.dataobject.hidden; + +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 2026-03-20 11:32:51 + */ +@Data +@TableName("hidden") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class HiddenDO extends BaseDO { + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String hiddenId; + //来源ID外键 + @ApiModelProperty(value = "来源ID外键") + private String foreignKey; + //隐患来源,1-视频识别报警,2-安全环保检查(监管端) 3-安全环保检查(企业端) + @ApiModelProperty(value = "隐患来源,1-视频识别报警,2-安全环保检查(监管端) 3-安全环保检查(企业端)") + private Integer source; + //隐患状态 1,未整改,2:已整改,3:已验收,4:验收打回 + @ApiModelProperty(value = "隐患状态 1,未整改,2:已整改,3:已验收,4:验收打回") + private Integer state; + //隐患级别 + @ApiModelProperty(value = "隐患级别") + private String hiddenLevel; + //隐患级别名称 + @ApiModelProperty(value = "隐患级别名称") + private String hiddenLevelName; + //隐患描述 + @ApiModelProperty(value = "隐患描述") + private String hiddenDesc; + //法律依据 + @ApiModelProperty(value = "法律依据") + private String legalBasis; + //隐患位置描述 + @ApiModelProperty(value = "隐患位置描述") + private String positionDesc; + //隐患类型 + @ApiModelProperty(value = "隐患类型") + private String hiddenType; + //隐患类型名称 + @ApiModelProperty(value = "隐患类型名称") + private String hiddenTypeName; + //整改类型 1立即整改 2延期整改 + @ApiModelProperty(value = "整改类型 1立即整改 2延期整改") + private Integer rectificationType; + //整改期限(整改截至日期) + @ApiModelProperty(value = "整改期限(整改截至日期)") + private LocalDateTime rectificationDeadline; + //整改人部门id + @ApiModelProperty(value = "整改人部门id") + private Long rectificationDepartmentId; + //整改人id + @ApiModelProperty(value = "整改人id") + private Long rectificationUserId; + + public HiddenDO(String hiddenId) { + this.hiddenId = hiddenId; + } + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenFindUserDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenFindUserDO.java new file mode 100644 index 0000000..8c01a5a --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenFindUserDO.java @@ -0,0 +1,39 @@ +package com.zcloud.key.project.persistence.dataobject.hidden; + +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 2026-03-20 11:33:23 + */ +@Data +@TableName("hidden_find_user") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class HiddenFindUserDO extends BaseDO { + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String hiddenFindUserId; + //隐患主键id + @ApiModelProperty(value = "隐患主键id") + private String hiddenId; + //安全检查id + @ApiModelProperty(value = "安全检查id") + private String inspectionId; + //发现人id + @ApiModelProperty(value = "发现人id") + private Long findUserId; + + public HiddenFindUserDO(String hiddenFindUserId) { + this.hiddenFindUserId = hiddenFindUserId; + } + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenRectificationRecordDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenRectificationRecordDO.java new file mode 100644 index 0000000..48466bd --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenRectificationRecordDO.java @@ -0,0 +1,50 @@ +package com.zcloud.key.project.persistence.dataobject.hidden; + +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 2026-03-20 11:33:38 + */ +@Data +@TableName("hidden_rectification_record") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class HiddenRectificationRecordDO extends BaseDO { + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String hiddenRectificationRecordId; + //隐患主键id + @ApiModelProperty(value = "隐患主键id") + private String hiddenId; + //安全检查id + @ApiModelProperty(value = "安全检查id") + private String inspectionId; + //整改人部门id + @ApiModelProperty(value = "整改人部门id") + private Long rectificationDepartmentId; + //整改人id + @ApiModelProperty(value = "整改人id") + private Long rectificationUserId; + //整改时间 + @ApiModelProperty(value = "整改时间") + private LocalDateTime rectificationTime; + //整改描述 + @ApiModelProperty(value = "整改描述") + private String rectificationDesc; + + public HiddenRectificationRecordDO(String hiddenRectificationRecordId) { + this.hiddenRectificationRecordId = hiddenRectificationRecordId; + } + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/CameraInfoDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CameraInfoDO.java similarity index 90% rename from web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/CameraInfoDO.java rename to web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CameraInfoDO.java index fbb77a2..dfa4b78 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/CameraInfoDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CameraInfoDO.java @@ -1,4 +1,4 @@ -package com.zcloud.key.project.persistence.dataobject; +package com.zcloud.key.project.persistence.dataobject.project; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/CorpInfoDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CorpInfoDO.java similarity index 99% rename from web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/CorpInfoDO.java rename to web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CorpInfoDO.java index 53b2870..2c39bf7 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/CorpInfoDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CorpInfoDO.java @@ -1,4 +1,4 @@ -package com.zcloud.key.project.persistence.dataobject; +package com.zcloud.key.project.persistence.dataobject.project; import com.baomidou.mybatisplus.annotation.TableName; import com.jjb.saas.framework.repository.basedo.BaseDO; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/CorpStatisticsDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CorpStatisticsDO.java similarity index 93% rename from web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/CorpStatisticsDO.java rename to web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CorpStatisticsDO.java index ae0fae0..e978105 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/CorpStatisticsDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CorpStatisticsDO.java @@ -1,10 +1,9 @@ -package com.zcloud.key.project.persistence.dataobject; +package com.zcloud.key.project.persistence.dataobject.project; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import java.util.List; /** diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/KeyProjectCameraDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectCameraDO.java similarity index 95% rename from web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/KeyProjectCameraDO.java rename to web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectCameraDO.java index 07f4ba3..469708a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/KeyProjectCameraDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectCameraDO.java @@ -1,4 +1,4 @@ -package com.zcloud.key.project.persistence.dataobject; +package com.zcloud.key.project.persistence.dataobject.project; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/KeyProjectDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectDO.java similarity index 96% rename from web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/KeyProjectDO.java rename to web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectDO.java index 26d0ee4..cf7d788 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/KeyProjectDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectDO.java @@ -1,4 +1,4 @@ -package com.zcloud.key.project.persistence.dataobject; +package com.zcloud.key.project.persistence.dataobject.project; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; @@ -10,7 +10,6 @@ import lombok.NoArgsConstructor; import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.List; /** * web-infrastructure @@ -45,6 +44,9 @@ public class KeyProjectDO extends BaseDO { @ApiModelProperty(value = "是否已有项目内作业,1:是,0:否") private Integer projectWorkFlag; //重点作业名称 + @ApiModelProperty(value = "重点作业id") + private String projectId; + //重点作业名称 @ApiModelProperty(value = "重点作业名称") private String projectName; //涉及重点作业属性类型 diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/KeyProjectStatisticsDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectStatisticsDO.java similarity index 87% rename from web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/KeyProjectStatisticsDO.java rename to web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectStatisticsDO.java index 39d7a29..7da9c6d 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/KeyProjectStatisticsDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectStatisticsDO.java @@ -1,10 +1,9 @@ -package com.zcloud.key.project.persistence.dataobject; +package com.zcloud.key.project.persistence.dataobject.project; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import java.util.List; /** @@ -21,6 +20,10 @@ public class KeyProjectStatisticsDO implements Serializable { //业务主键id @ApiModelProperty(value = "业务主键id") private String keyProjectId; + //重点作业名称 + @ApiModelProperty(value = "重点作业id") + private String projectId; + //重点作业名称 @ApiModelProperty(value = "重点作业名称") private String projectName; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/XgfCorpStatisticsDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/XgfCorpStatisticsDO.java similarity index 93% rename from web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/XgfCorpStatisticsDO.java rename to web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/XgfCorpStatisticsDO.java index f403aaf..e9737de 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/XgfCorpStatisticsDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/XgfCorpStatisticsDO.java @@ -1,10 +1,9 @@ -package com.zcloud.key.project.persistence.dataobject; +package com.zcloud.key.project.persistence.dataobject.project; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import java.util.List; /** diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/CorpInfoMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/CorpInfoMapper.java index 3a53229..1e7566a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/CorpInfoMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/CorpInfoMapper.java @@ -1,7 +1,7 @@ package com.zcloud.key.project.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zcloud.key.project.persistence.dataobject.CorpInfoDO; +import com.zcloud.key.project.persistence.dataobject.project.CorpInfoDO; import org.apache.ibatis.annotations.Mapper; /** diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenAcceptRecordMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenAcceptRecordMapper.java new file mode 100644 index 0000000..69c26d3 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenAcceptRecordMapper.java @@ -0,0 +1,17 @@ +package com.zcloud.key.project.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenAcceptRecordDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2026-03-20 11:33:08 + */ +@Mapper +public interface HiddenAcceptRecordMapper extends BaseMapper { + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenFindUserMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenFindUserMapper.java new file mode 100644 index 0000000..dab559f --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenFindUserMapper.java @@ -0,0 +1,17 @@ +package com.zcloud.key.project.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenFindUserDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2026-03-20 11:33:23 + */ +@Mapper +public interface HiddenFindUserMapper extends BaseMapper { + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenMapper.java new file mode 100644 index 0000000..51d8b11 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenMapper.java @@ -0,0 +1,17 @@ +package com.zcloud.key.project.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2026-03-20 11:32:51 + */ +@Mapper +public interface HiddenMapper extends BaseMapper { + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenRectificationRecordMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenRectificationRecordMapper.java new file mode 100644 index 0000000..50cf53f --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenRectificationRecordMapper.java @@ -0,0 +1,17 @@ +package com.zcloud.key.project.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenRectificationRecordDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2026-03-20 11:33:38 + */ +@Mapper +public interface HiddenRectificationRecordMapper extends BaseMapper { + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectCameraMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectCameraMapper.java index 3a4a90d..c4f6504 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectCameraMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectCameraMapper.java @@ -2,8 +2,8 @@ package com.zcloud.key.project.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.zcloud.key.project.persistence.dataobject.CameraInfoDO; -import com.zcloud.key.project.persistence.dataobject.KeyProjectCameraDO; +import com.zcloud.key.project.persistence.dataobject.project.CameraInfoDO; +import com.zcloud.key.project.persistence.dataobject.project.KeyProjectCameraDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectMapper.java index 650c661..c810a68 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectMapper.java @@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.datascope.annotation.DataScope; import com.jjb.saas.framework.datascope.annotation.DataScopes; -import com.zcloud.key.project.persistence.dataobject.CorpStatisticsDO; -import com.zcloud.key.project.persistence.dataobject.KeyProjectDO; -import com.zcloud.key.project.persistence.dataobject.KeyProjectStatisticsDO; -import com.zcloud.key.project.persistence.dataobject.XgfCorpStatisticsDO; +import com.zcloud.key.project.persistence.dataobject.project.CorpStatisticsDO; +import com.zcloud.key.project.persistence.dataobject.project.KeyProjectDO; +import com.zcloud.key.project.persistence.dataobject.project.KeyProjectStatisticsDO; +import com.zcloud.key.project.persistence.dataobject.project.XgfCorpStatisticsDO; import org.apache.ibatis.annotations.Mapper; import java.util.Map; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/CorpInfoRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/CorpInfoRepository.java index ec86756..422ad20 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/CorpInfoRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/CorpInfoRepository.java @@ -2,7 +2,7 @@ package com.zcloud.key.project.persistence.repository; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; -import com.zcloud.key.project.persistence.dataobject.CorpInfoDO; +import com.zcloud.key.project.persistence.dataobject.project.CorpInfoDO; import java.util.Map; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenAcceptRecordRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenAcceptRecordRepository.java new file mode 100644 index 0000000..f7e9e79 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenAcceptRecordRepository.java @@ -0,0 +1,18 @@ +package com.zcloud.key.project.persistence.repository.hidden; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenAcceptRecordDO; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2026-03-20 11:33:08 + */ +public interface HiddenAcceptRecordRepository extends BaseRepository { + PageResponse listPage(Map params); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenFindUserRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenFindUserRepository.java new file mode 100644 index 0000000..d94e197 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenFindUserRepository.java @@ -0,0 +1,18 @@ +package com.zcloud.key.project.persistence.repository.hidden; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenFindUserDO; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2026-03-20 11:33:23 + */ +public interface HiddenFindUserRepository extends BaseRepository { + PageResponse listPage(Map params); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenRectificationRecordRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenRectificationRecordRepository.java new file mode 100644 index 0000000..38a9c29 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenRectificationRecordRepository.java @@ -0,0 +1,18 @@ +package com.zcloud.key.project.persistence.repository.hidden; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenRectificationRecordDO; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2026-03-20 11:33:38 + */ +public interface HiddenRectificationRecordRepository extends BaseRepository { + PageResponse listPage(Map params); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenRepository.java new file mode 100644 index 0000000..2b2065a --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenRepository.java @@ -0,0 +1,18 @@ +package com.zcloud.key.project.persistence.repository.hidden; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2026-03-20 11:32:52 + */ +public interface HiddenRepository extends BaseRepository { + PageResponse listPage(Map params); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/CorpInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/CorpInfoRepositoryImpl.java index cfe0f40..10d612e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/CorpInfoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/CorpInfoRepositoryImpl.java @@ -12,7 +12,7 @@ import com.zcloud.gbscommon.utils.Query; import com.zcloud.key.project.domain.enums.CommonFlagEnum; import com.zcloud.key.project.domain.enums.CorpTypeEnum; import com.zcloud.key.project.domain.enums.UserTypeEnum; -import com.zcloud.key.project.persistence.dataobject.CorpInfoDO; +import com.zcloud.key.project.persistence.dataobject.project.CorpInfoDO; import com.zcloud.key.project.persistence.mapper.CorpInfoMapper; import com.zcloud.key.project.persistence.repository.CorpInfoRepository; import lombok.RequiredArgsConstructor; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenAcceptRecordRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenAcceptRecordRepositoryImpl.java new file mode 100644 index 0000000..98223b6 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenAcceptRecordRepositoryImpl.java @@ -0,0 +1,39 @@ +package com.zcloud.key.project.persistence.repository.impl.hidden; + +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.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenAcceptRecordDO; +import com.zcloud.key.project.persistence.mapper.HiddenAcceptRecordMapper; +import com.zcloud.key.project.persistence.repository.hidden.HiddenAcceptRecordRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2026-03-20 11:33:08 + */ +@Service +@RequiredArgsConstructor +public class HiddenAcceptRecordRepositoryImpl extends BaseRepositoryImpl implements HiddenAcceptRecordRepository { + private final HiddenAcceptRecordMapper hiddenAcceptRecordMapper; + + @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 = hiddenAcceptRecordMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenFindUserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenFindUserRepositoryImpl.java new file mode 100644 index 0000000..f86b7d9 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenFindUserRepositoryImpl.java @@ -0,0 +1,39 @@ +package com.zcloud.key.project.persistence.repository.impl.hidden; + +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.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenFindUserDO; +import com.zcloud.key.project.persistence.mapper.HiddenFindUserMapper; +import com.zcloud.key.project.persistence.repository.hidden.HiddenFindUserRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2026-03-20 11:33:23 + */ +@Service +@RequiredArgsConstructor +public class HiddenFindUserRepositoryImpl extends BaseRepositoryImpl implements HiddenFindUserRepository { + private final HiddenFindUserMapper hiddenFindUserMapper; + + @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 = hiddenFindUserMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenRectificationRecordRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenRectificationRecordRepositoryImpl.java new file mode 100644 index 0000000..bf3cdd9 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenRectificationRecordRepositoryImpl.java @@ -0,0 +1,39 @@ +package com.zcloud.key.project.persistence.repository.impl.hidden; + +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.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenRectificationRecordDO; +import com.zcloud.key.project.persistence.mapper.HiddenRectificationRecordMapper; +import com.zcloud.key.project.persistence.repository.hidden.HiddenRectificationRecordRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2026-03-20 11:33:38 + */ +@Service +@RequiredArgsConstructor +public class HiddenRectificationRecordRepositoryImpl extends BaseRepositoryImpl implements HiddenRectificationRecordRepository { + private final HiddenRectificationRecordMapper hiddenRectificationRecordMapper; + + @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 = hiddenRectificationRecordMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenRepositoryImpl.java new file mode 100644 index 0000000..2af528a --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenRepositoryImpl.java @@ -0,0 +1,39 @@ +package com.zcloud.key.project.persistence.repository.impl.hidden; + +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.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO; +import com.zcloud.key.project.persistence.mapper.HiddenMapper; +import com.zcloud.key.project.persistence.repository.hidden.HiddenRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhaokai + * @Date 2026-03-20 11:32:52 + */ +@Service +@RequiredArgsConstructor +public class HiddenRepositoryImpl extends BaseRepositoryImpl implements HiddenRepository { + private final HiddenMapper hiddenMapper; + + @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 = hiddenMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/KeyProjectCameraRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectCameraRepositoryImpl.java similarity index 87% rename from web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/KeyProjectCameraRepositoryImpl.java rename to web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectCameraRepositoryImpl.java index 891b0a9..a401782 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/KeyProjectCameraRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectCameraRepositoryImpl.java @@ -1,20 +1,18 @@ -package com.zcloud.key.project.persistence.repository.impl; +package com.zcloud.key.project.persistence.repository.impl.project; 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.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Query; -import com.zcloud.key.project.persistence.dataobject.CameraInfoDO; -import com.zcloud.key.project.persistence.dataobject.KeyProjectCameraDO; +import com.zcloud.key.project.persistence.dataobject.project.CameraInfoDO; +import com.zcloud.key.project.persistence.dataobject.project.KeyProjectCameraDO; import com.zcloud.key.project.persistence.mapper.KeyProjectCameraMapper; -import com.zcloud.key.project.persistence.repository.KeyProjectCameraRepository; +import com.zcloud.key.project.persistence.repository.project.KeyProjectCameraRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.util.Collections; import java.util.List; import java.util.Map; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/KeyProjectRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectRepositoryImpl.java similarity index 83% rename from web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/KeyProjectRepositoryImpl.java rename to web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectRepositoryImpl.java index 90c7ecf..665f3d0 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/KeyProjectRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectRepositoryImpl.java @@ -1,19 +1,16 @@ -package com.zcloud.key.project.persistence.repository.impl; +package com.zcloud.key.project.persistence.repository.impl.project; 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.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Query; -import com.zcloud.key.project.domain.enums.MenuEnum; -import com.zcloud.key.project.persistence.dataobject.CorpStatisticsDO; -import com.zcloud.key.project.persistence.dataobject.KeyProjectDO; -import com.zcloud.key.project.persistence.dataobject.KeyProjectStatisticsDO; -import com.zcloud.key.project.persistence.dataobject.XgfCorpStatisticsDO; +import com.zcloud.key.project.persistence.dataobject.project.CorpStatisticsDO; +import com.zcloud.key.project.persistence.dataobject.project.KeyProjectDO; +import com.zcloud.key.project.persistence.dataobject.project.KeyProjectStatisticsDO; +import com.zcloud.key.project.persistence.dataobject.project.XgfCorpStatisticsDO; import com.zcloud.key.project.persistence.mapper.KeyProjectMapper; -import com.zcloud.key.project.persistence.repository.KeyProjectRepository; +import com.zcloud.key.project.persistence.repository.project.KeyProjectRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/KeyProjectCameraRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/project/KeyProjectCameraRepository.java similarity index 77% rename from web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/KeyProjectCameraRepository.java rename to web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/project/KeyProjectCameraRepository.java index 5b84627..dec5e37 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/KeyProjectCameraRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/project/KeyProjectCameraRepository.java @@ -1,9 +1,9 @@ -package com.zcloud.key.project.persistence.repository; +package com.zcloud.key.project.persistence.repository.project; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; -import com.zcloud.key.project.persistence.dataobject.CameraInfoDO; -import com.zcloud.key.project.persistence.dataobject.KeyProjectCameraDO; +import com.zcloud.key.project.persistence.dataobject.project.CameraInfoDO; +import com.zcloud.key.project.persistence.dataobject.project.KeyProjectCameraDO; import java.util.List; import java.util.Map; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/KeyProjectRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/project/KeyProjectRepository.java similarity index 65% rename from web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/KeyProjectRepository.java rename to web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/project/KeyProjectRepository.java index c8a7385..84aa55e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/KeyProjectRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/project/KeyProjectRepository.java @@ -1,11 +1,11 @@ -package com.zcloud.key.project.persistence.repository; +package com.zcloud.key.project.persistence.repository.project; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; -import com.zcloud.key.project.persistence.dataobject.CorpStatisticsDO; -import com.zcloud.key.project.persistence.dataobject.KeyProjectDO; -import com.zcloud.key.project.persistence.dataobject.KeyProjectStatisticsDO; -import com.zcloud.key.project.persistence.dataobject.XgfCorpStatisticsDO; +import com.zcloud.key.project.persistence.dataobject.project.CorpStatisticsDO; +import com.zcloud.key.project.persistence.dataobject.project.KeyProjectDO; +import com.zcloud.key.project.persistence.dataobject.project.KeyProjectStatisticsDO; +import com.zcloud.key.project.persistence.dataobject.project.XgfCorpStatisticsDO; import java.util.Map; diff --git a/web-infrastructure/src/main/resources/mapper/HiddenAcceptRecordMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenAcceptRecordMapper.xml new file mode 100644 index 0000000..216fa6f --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/HiddenAcceptRecordMapper.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/HiddenFindUserMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenFindUserMapper.xml new file mode 100644 index 0000000..591eff2 --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/HiddenFindUserMapper.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml new file mode 100644 index 0000000..21b515d --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/HiddenRectificationRecordMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenRectificationRecordMapper.xml new file mode 100644 index 0000000..7140e15 --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/HiddenRectificationRecordMapper.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml b/web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml index 9386a13..997b0be 100644 --- a/web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml @@ -4,7 +4,7 @@ - SELECT lpc.*, @@ -24,7 +24,7 @@ WHERE key_project_id = #{keyProjectId} - SELECT lpc.*, @@ -38,7 +38,7 @@ WHERE lpc.key_project_id = #{params.keyProjectId} and lpc.delete_enum='false' - SELECT mc.fixed_camera_id as cameraId, mc.video_name as cameraName, 1 as cameraType FROM fixed_camera mc WHERE mc.delete_enum = 'FALSE' @@ -56,7 +56,7 @@ ) - SELECT mc.mobile_camera_id as cameraId, mc.video_name as cameraName, 2 as cameraType FROM mobile_camera mc diff --git a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml index 4e170e6..360f005 100644 --- a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml @@ -4,7 +4,7 @@ - SELECT kp.*, fpd.name AS masterDepartmentName, ci.name AS jurisdictionDepartmentName, @@ -86,7 +86,7 @@ GROUP BY kp.key_project_id ORDER BY kp.apply_status asc, kp.create_time DESC - SELECT kp.*, fpd.name AS masterDepartmentName, @@ -169,7 +169,7 @@ GROUP BY kp.key_project_id ORDER BY kp.update_time asc - SELECT kp.*, fpd.name AS masterDepartmentName, ci.name AS jurisdictionDepartmentName, @@ -189,7 +189,7 @@ - SELECT cp.id AS corpinfoId, cp.corp_name AS corpinfoName, COUNT(distinct kp.id) AS totalProjectCount, @@ -213,10 +213,11 @@ order by cp.corp_order ASC,cp.create_time desc - select kp.id, kp.key_project_id as keyProjectId, kp.project_name as projectName, + kp.project_id as projectId, COUNT(DISTINCT CASE WHEN kpc.camera_type = 1 THEN kpc.camera_id END) AS fixedCameraCount, COUNT(DISTINCT CASE WHEN kpc.camera_type = 2 THEN kpc.camera_id END) AS mobileCameraCount, GROUP_CONCAT(DISTINCT CASE WHEN kpc.camera_type = 1 THEN kpc.camera_id END) AS fixedCameraIdList, @@ -232,7 +233,7 @@ ORDER BY kp.apply_status asc, kp.create_time DESC - select kp.id, kp.jurisdiction_corpinfo_id as jurisdictionCorpinfoId, COUNT(distinct kp.id) AS totalProjectCount,