commit 72a0bd747fccaacf7ea157211831b6ce60b0da8b Author: fangjiakai <450850793@qq.com> Date: Tue Mar 10 08:29:37 2026 +0800 初始提交 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..cc1e449 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,9 @@ +FROM jjb-registry-registry.cn-hangzhou.cr.aliyuncs.com/pub/jdk:1.8.0_202 + +ENV TZ=Asia/Shanghai +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + +COPY ./start/target/start.jar /opt/app.jar + + +ENTRYPOINT ["java", "-jar", "/opt/app.jar"] diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..a42d248 --- /dev/null +++ b/pom.xml @@ -0,0 +1,86 @@ + + 4.0.0 + + com.jjb.saas + jjb-saas-parent + 2.2.0-SNAPSHOT + + com.zcloud.eightwork + zcloud-gbs-eightwork + pom + 1.0-SNAPSHOT + zcloud-gbs-eightwork + + UTF-8 + UTF-8 + + + + com.zcloud.gbscommon + zcloud_gbscommon + 1.0.0-SNAPSHOT + + + + + + com.jjb.saas + jjb-saas-system-client + 1.7.0-SNAPSHOT + + + + com.zcloud.eightwork + web-adapter + ${project.version} + + + com.zcloud.eightwork + web-client + ${project.version} + + + com.zcloud.eightwork + web-app + ${project.version} + + + com.zcloud.eightwork + web-domain + ${project.version} + + + com.zcloud.eightwork + web-infrastructure + ${project.version} + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + 2.6.6 + + + + + + org.apache.maven.plugins + maven-archetype-plugin + 3.4.1 + + + + + web-client + web-adapter + web-app + web-domain + web-infrastructure + start + + diff --git a/start/pom.xml b/start/pom.xml new file mode 100644 index 0000000..1ea587d --- /dev/null +++ b/start/pom.xml @@ -0,0 +1,54 @@ + + + 4.0.0 + + com.zcloud.eightwork + zcloud-gbs-eightwork + 1.0-SNAPSHOT + ../pom.xml + + + start + jar + start + + + + com.zcloud.eightwork + web-adapter + + + + org.flywaydb + flyway-mysql + + + com.jjb.saas + jjb-saas-gateway-starter + + + com.jjb.saas + jjb-saas-framework-web + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + com.zcloud.eightwork.Application + + + + + repackage + + + + + + + diff --git a/start/src/main/java/com/zcloud/eightwork/Application.java b/start/src/main/java/com/zcloud/eightwork/Application.java new file mode 100644 index 0000000..03c7509 --- /dev/null +++ b/start/src/main/java/com/zcloud/eightwork/Application.java @@ -0,0 +1,19 @@ +package com.zcloud.eightwork; + +import com.jjb.saas.base.starter.bootstart.JJBSpringbootApplication; +import org.springframework.boot.SpringApplication; + +/** + * Spring Boot Starter + * + */ +@JJBSpringbootApplication( + scanBasePackages = {"com.zcloud","com.jjb"}, + mapperPackages = {"com.zcloud.eightwork.persistence.mapper"} +) +public class Application { + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } +} diff --git a/start/src/main/resources/bootstrap.yml b/start/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..d921869 --- /dev/null +++ b/start/src/main/resources/bootstrap.yml @@ -0,0 +1,6 @@ +spring: + config: + import: + - classpath:nacos.yml + - classpath:sdk.yml + - classpath:swagger.yml diff --git a/start/src/main/resources/nacos.yml b/start/src/main/resources/nacos.yml new file mode 100644 index 0000000..ed7e421 --- /dev/null +++ b/start/src/main/resources/nacos.yml @@ -0,0 +1,38 @@ +nacos: + url: 192.168.20.100:30290 + namespace: jjb-dragon +application: + name: zcloud-gbs-eightwork + version: + gateway: eightwork + cn-name: 特殊作业 +spring: + application: + name: ${application.name}${application.version} + profiles: + # 环境配置 + active: test + cloud: + nacos: + config: + namespace: ${nacos.namespace} + server-addr: ${nacos.url} + file-extension: yml + shared-configs: + - config-common.yml + - config-port.yml + - config-mq.yml + - config-log.yml + - config-sdk-server.yml + - config-actuator.yml + - config-job.yml + - config-mysql.yml + - config-redis.yml + - config-cache.yml + - config-spring.yml + - config-mybatis.yml + - config-sdk.yml + - config-flyway.yml + discovery: + server-addr: ${spring.cloud.nacos.config.server-addr} + namespace: ${spring.cloud.nacos.config.namespace} diff --git a/start/src/main/resources/sdk.yml b/start/src/main/resources/sdk.yml new file mode 100644 index 0000000..cffc4f1 --- /dev/null +++ b/start/src/main/resources/sdk.yml @@ -0,0 +1,51 @@ +sdk: + server: + app-key: 722091ff53dd4abba078c2a00efd4a42 + client: + gateway: + url: ${common.gateway.network.http.external} + route: + - client: + system-code: ${application.name} + name: ${application.cn-name}-后端 + group-code: public_api + service: + system-code: ${application.name} + name: ${application.cn-name}-后端 + group-code: public_api + strip-prefix: 0 + uri: lb://${application.name} + path: /${application.gateway}/** + - client: + system-code: ${application.name}-container + name: ${application.cn-name}-前端 + group-code: public_api + service: + system-code: ${application.name}-container + name: ${application.cn-name}-前端 + group-code: public_api + strip-prefix: 0 + uri: lb://jjb-saas-base + path: /${application.gateway}/container/** + order: -2 +openapi: + appId: 1871106785124999168 + appKey: 7314ecfc11ff4d5fad1ac19284ed2ac3 + appSecret: 7565ab15-a2ae-4830-9b4d-fb382cd5fb30 + appPublicKey: 3059301306072a8648ce3d020106082a811ccf5501822d03420004f339671110a06681fcfd968ad9247bd3cd0d2ec6b2159d1d4b775e7ed5566b3297d82cf14b626ef11fdd6bc7ecb6bcfb3ea94ccd1f381f4116f43367be4b360f + appPrivateKey: 308193020100301306072a8648ce3d020106082a811ccf5501822d0479307702010104206b6abc8e717b7d042f1e8531190a7c18113e4a701417f2770d2150d33ba97779a00a06082a811ccf5501822da14403420004f339671110a06681fcfd968ad9247bd3cd0d2ec6b2159d1d4b775e7ed5566b3297d82cf14b626ef11fdd6bc7ecb6bcfb3ea94ccd1f381f4116f43367be4b360f + encryptType: SM2 + platform: + - name: default + openPublicKey: 3059301306072a8648ce3d020106082a811ccf5501822d034200045b5d8fcad91e113910406db4caf0f5c6688048e0f46742d55f872a25855316803ddb177cc9bb5906ff0b2ad4d6b1f1378a49109104613e79b5b5512e3710e88f + url: ${common.gateway.network.http.intranet} + protocol: HTTP + defaultPlatform: true + ##ciphertext plaintext + type: plaintext + apiPlatform: + - name: default + #多个可以逗号隔开 + apiCode: test:01 + #多个可以逗号隔开，可以为空 + tenantIds: 1838408702262321152 diff --git a/start/src/main/resources/swagger.yml b/start/src/main/resources/swagger.yml new file mode 100644 index 0000000..465379b --- /dev/null +++ b/start/src/main/resources/swagger.yml @@ -0,0 +1,15 @@ +swagger: + enabled: ${common.swagger.enabled} + title: ${application.cn-name} + description: ${application.cn-name}，一切皆有可能 + version: 1.0.0 + group-name: ${application.cn-name} +springfox: + documentation: + swagger-ui: + base-url: ${application.gateway} + swagger: + v2: + path: /${application.gateway}/v2/api-docs +open-doc: + brief-introduction-url: https://ipaas-gateway.cqjjb.cn/document-foreground/container/document/detail?siteId=1729854594279215106&docTypeId=1744908406080786434&dirId=1745034145606258688 diff --git a/web-adapter/pom.xml b/web-adapter/pom.xml new file mode 100644 index 0000000..c7fd6a1 --- /dev/null +++ b/web-adapter/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + + com.zcloud.eightwork + zcloud-gbs-eightwork + 1.0-SNAPSHOT + ../pom.xml + + + web-adapter + jar + web-adapter + + + + com.jjb.saas + jjb-saas-framework-adapter + + + + com.zcloud.eightwork + web-app + + + com.zcloud.eightwork + web-client + + + diff --git a/web-adapter/src/main/java/com/zcloud/eightwork/web/ConfinedSpaceController.java b/web-adapter/src/main/java/com/zcloud/eightwork/web/ConfinedSpaceController.java new file mode 100644 index 0000000..aec6a28 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/eightwork/web/ConfinedSpaceController.java @@ -0,0 +1,89 @@ +package com.zcloud.eightwork.web; + + +import cn.hutool.core.util.ObjectUtil; +import com.zcloud.eightwork.api.ConfinedSpaceServiceI; +import com.zcloud.eightwork.dto.ConfinedSpaceAddCmd; +import com.zcloud.eightwork.dto.ConfinedSpacePageQry; +import com.zcloud.eightwork.dto.ConfinedSpaceUpdateCmd; +import com.zcloud.eightwork.dto.clientobject.ConfinedSpaceCO; +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 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 fangjiakai + * @Date 2025-11-27 10:26:33 + */ +@Api(tags = "有限空间台账表") +@RequestMapping("/${application.gateway}/confinedSpace") +@RestController +@AllArgsConstructor +public class ConfinedSpaceController { + private final ConfinedSpaceServiceI confinedSpaceService; + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody ConfinedSpaceAddCmd cmd) { + if(ObjectUtil.isEmpty(cmd.getCorpinfoId())){ + cmd.setCorpinfoId(AuthContext.getTenantId()); + } + cmd.setDepartmentId(AuthContext.getOrgId()); + return confinedSpaceService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody ConfinedSpacePageQry qry) { + return confinedSpaceService.listPage(qry); + } + + @ApiOperation("所有数据") + @PostMapping("/listAll") + public MultiResponse listAll(@RequestBody ConfinedSpacePageQry qry) { + if(ObjectUtil.isEmpty(qry.getEqCorpinfoId())){ + qry.setEqCorpinfoId(AuthContext.getTenantId()); + } + return MultiResponse.of(confinedSpaceService.listAll(qry)); + } + + @ApiOperation("详情") + @GetMapping("/{id}") + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(confinedSpaceService.queryById(id)); + } + + @ApiOperation("删除") + @DeleteMapping("/{id}") + public Response remove(@PathVariable("id") Long id) { + confinedSpaceService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("删除多个") + @DeleteMapping("/ids") + public Response removeBatch(@RequestParam Long[] ids) { + confinedSpaceService.removeBatch(ids); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改") + @PutMapping("/edit") + public SingleResponse edit(@Validated @RequestBody ConfinedSpaceUpdateCmd confinedSpaceUpdateCmd) { + confinedSpaceService.edit(confinedSpaceUpdateCmd); + return SingleResponse.buildSuccess(); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/eightwork/web/EightworkInfoController.java b/web-adapter/src/main/java/com/zcloud/eightwork/web/EightworkInfoController.java new file mode 100644 index 0000000..f07b42d --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/eightwork/web/EightworkInfoController.java @@ -0,0 +1,84 @@ +package com.zcloud.eightwork.web; + + +import com.zcloud.eightwork.api.EightworkInfoServiceI; +import com.zcloud.eightwork.dto.EightworkInfoAddCmd; +import com.zcloud.eightwork.dto.EightworkInfoPageQry; +import com.zcloud.eightwork.dto.EightworkInfoUpdateCmd; +import com.zcloud.eightwork.dto.clientobject.EightworkInfoCO; +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 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 fangjiakai + * @Date 2025-11-12 10:58:53 + */ +@Api(tags = "") +@RequestMapping("/${application.gateway}/eightworkInfo") +@RestController +@AllArgsConstructor +public class EightworkInfoController { + private final EightworkInfoServiceI eightworkInfoService; + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody EightworkInfoAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + return eightworkInfoService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody EightworkInfoPageQry qry) { + qry.setEqDepartmentId(AuthContext.getOrgId()); + qry.setEqCreateId(AuthContext.getUserId()); + return eightworkInfoService.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(eightworkInfoService.queryById(id)); + } + + @ApiOperation("删除") + @DeleteMapping("/{id}") + public Response remove(@PathVariable("id") Long id) { + eightworkInfoService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("删除多个") + @DeleteMapping("/ids") + public Response removeBatch(@RequestParam Long[] ids) { + eightworkInfoService.removeBatch(ids); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改") + @PutMapping("/edit") + public SingleResponse edit(@Validated @RequestBody EightworkInfoUpdateCmd eightworkInfoUpdateCmd) { + eightworkInfoService.edit(eightworkInfoUpdateCmd); + return SingleResponse.buildSuccess(); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/eightwork/web/EightworkStepController.java b/web-adapter/src/main/java/com/zcloud/eightwork/web/EightworkStepController.java new file mode 100644 index 0000000..5e40a9e --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/eightwork/web/EightworkStepController.java @@ -0,0 +1,82 @@ +package com.zcloud.eightwork.web; + + +import com.zcloud.eightwork.api.EightworkStepServiceI; +import com.zcloud.eightwork.dto.EightworkStepAddCmd; +import com.zcloud.eightwork.dto.EightworkStepPageQry; +import com.zcloud.eightwork.dto.EightworkStepUpdateCmd; +import com.zcloud.eightwork.dto.clientobject.EightworkStepCO; +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 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 fangjiakai + * @Date 2025-11-05 09:53:12 + */ +@Api(tags = "八项作业任务步骤") +@RequestMapping("/${application.gateway}/eightworkStep") +@RestController +@AllArgsConstructor +public class EightworkStepController { + private final EightworkStepServiceI eightworkStepService; + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody EightworkStepAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + return eightworkStepService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody EightworkStepPageQry qry) { + return eightworkStepService.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 EightworkStepCO()); + } + + @ApiOperation("删除") + @DeleteMapping("/{id}") + public Response remove(@PathVariable("id") Long id) { + eightworkStepService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("删除多个") + @DeleteMapping("/ids") + public Response removeBatch(@RequestParam Long[] ids) { + eightworkStepService.removeBatch(ids); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改") + @PutMapping("/edit") + public SingleResponse edit(@Validated @RequestBody EightworkStepUpdateCmd eightworkStepUpdateCmd) { + eightworkStepService.edit(eightworkStepUpdateCmd); + return SingleResponse.buildSuccess(); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/eightwork/web/EightworkSupplementaryInfoController.java b/web-adapter/src/main/java/com/zcloud/eightwork/web/EightworkSupplementaryInfoController.java new file mode 100644 index 0000000..b609681 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/eightwork/web/EightworkSupplementaryInfoController.java @@ -0,0 +1,81 @@ +package com.zcloud.eightwork.web; + + +import com.zcloud.eightwork.api.EightworkSupplementaryInfoServiceI; +import com.zcloud.eightwork.dto.EightworkSupplementaryInfoAddCmd; +import com.zcloud.eightwork.dto.EightworkSupplementaryInfoPageQry; +import com.zcloud.eightwork.dto.EightworkSupplementaryInfoUpdateCmd; +import com.zcloud.eightwork.dto.clientobject.EightworkSupplementaryInfoCO; +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 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 fangjiakai + * @Date 2025-11-20 10:38:36 + */ +@Api(tags = "附属信息") +@RequestMapping("/${application.gateway}/eightworkSupplementaryInfo") +@RestController +@AllArgsConstructor +public class EightworkSupplementaryInfoController { + private final EightworkSupplementaryInfoServiceI eightworkSupplementaryInfoService; + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody EightworkSupplementaryInfoAddCmd cmd) { + return eightworkSupplementaryInfoService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody EightworkSupplementaryInfoPageQry qry) { + return eightworkSupplementaryInfoService.listPage(qry); + } + + @ApiOperation("所有数据") + @GetMapping("/listAll/{workId}") + public MultiResponse listAll(@PathVariable("workId") String workId) { + return MultiResponse.of(eightworkSupplementaryInfoService.listAll(workId)); + } + + @ApiOperation("详情") + @GetMapping("/{id}") + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(eightworkSupplementaryInfoService.queryById(id)); + } + + @ApiOperation("删除") + @DeleteMapping("/{id}") + public Response remove(@PathVariable("id") Long id) { + eightworkSupplementaryInfoService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("删除多个") + @DeleteMapping("/ids") + public Response removeBatch(@RequestParam Long[] ids) { + eightworkSupplementaryInfoService.removeBatch(ids); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改") + @PutMapping("/edit") + public SingleResponse edit(@Validated @RequestBody EightworkSupplementaryInfoUpdateCmd eightworkSupplementaryInfoUpdateCmd) { + eightworkSupplementaryInfoService.edit(eightworkSupplementaryInfoUpdateCmd); + return SingleResponse.buildSuccess(); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/eightwork/web/EightworkTaskController.java b/web-adapter/src/main/java/com/zcloud/eightwork/web/EightworkTaskController.java new file mode 100644 index 0000000..0de8d6c --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/eightwork/web/EightworkTaskController.java @@ -0,0 +1,82 @@ +package com.zcloud.eightwork.web; + + +import com.zcloud.eightwork.api.EightworkTaskServiceI; +import com.zcloud.eightwork.dto.EightworkTaskAddCmd; +import com.zcloud.eightwork.dto.EightworkTaskPageQry; +import com.zcloud.eightwork.dto.EightworkTaskUpdateCmd; +import com.zcloud.eightwork.dto.clientobject.EightworkTaskCO; +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 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 fangjiakai + * @Date 2025-11-05 09:53:37 + */ +@Api(tags = "八项作业流程任务") +@RequestMapping("/${application.gateway}/eightworkTask") +@RestController +@AllArgsConstructor +public class EightworkTaskController { + private final EightworkTaskServiceI eightworkTaskService; + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody EightworkTaskAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + return eightworkTaskService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody EightworkTaskPageQry qry) { + return eightworkTaskService.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 EightworkTaskCO()); + } + + @ApiOperation("删除") + @DeleteMapping("/{id}") + public Response remove(@PathVariable("id") Long id) { + eightworkTaskService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("删除多个") + @DeleteMapping("/ids") + public Response removeBatch(@RequestParam Long[] ids) { + eightworkTaskService.removeBatch(ids); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改") + @PutMapping("/edit") + public SingleResponse edit(@Validated @RequestBody EightworkTaskUpdateCmd eightworkTaskUpdateCmd) { + eightworkTaskService.edit(eightworkTaskUpdateCmd); + return SingleResponse.buildSuccess(); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/eightwork/web/MeasuresController.java b/web-adapter/src/main/java/com/zcloud/eightwork/web/MeasuresController.java new file mode 100644 index 0000000..f1fd7b2 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/eightwork/web/MeasuresController.java @@ -0,0 +1,80 @@ +package com.zcloud.eightwork.web; + + +import com.zcloud.eightwork.api.MeasuresServiceI; +import com.zcloud.eightwork.dto.MeasuresAddCmd; +import com.zcloud.eightwork.dto.MeasuresPageQry; +import com.zcloud.eightwork.dto.MeasuresUpdateCmd; +import com.zcloud.eightwork.dto.clientobject.MeasuresCO; +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 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 fangjiakai +* @Date 2025-11-11 11:30:44 +*/ +@Api(tags = "安全措施") +@RequestMapping("/${application.gateway}/measures") +@RestController +@AllArgsConstructor +public class MeasuresController { + private final MeasuresServiceI measuresService; + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody MeasuresAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + return measuresService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody MeasuresPageQry qry) { + return measuresService.listPage(qry); + } + + @ApiOperation("所有数据") + @PostMapping("/listAll") + public MultiResponse listAll(@RequestBody MeasuresPageQry qry) { + return MultiResponse.of(measuresService.listAll(qry)); + } + + @ApiOperation("详情") + @GetMapping("/{id}") + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(measuresService.queryById(id)); + } + + @ApiOperation("删除") + @DeleteMapping("/{id}") + public Response remove(@PathVariable("id") Long id) { + measuresService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("删除多个") + @DeleteMapping("/ids") + public Response removeBatch(@RequestParam Long[] ids) { + measuresService.removeBatch(ids); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改") + @PutMapping("/edit") + public SingleResponse edit(@Validated @RequestBody MeasuresUpdateCmd measuresUpdateCmd) { + measuresService.edit(measuresUpdateCmd); + return SingleResponse.buildSuccess(); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/eightwork/web/MeasuresLogsController.java b/web-adapter/src/main/java/com/zcloud/eightwork/web/MeasuresLogsController.java new file mode 100644 index 0000000..5c973a4 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/eightwork/web/MeasuresLogsController.java @@ -0,0 +1,80 @@ +package com.zcloud.eightwork.web; + + +import com.zcloud.eightwork.api.MeasuresLogsServiceI; +import com.zcloud.eightwork.dto.MeasuresLogsAddCmd; +import com.zcloud.eightwork.dto.MeasuresLogsPageQry; +import com.zcloud.eightwork.dto.MeasuresLogsUpdateCmd; +import com.zcloud.eightwork.dto.clientobject.MeasuresLogsCO; +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 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 fangjiakai +* @Date 2025-11-11 11:30:49 +*/ +@Api(tags = "安全措施") +@RequestMapping("/${application.gateway}/measuresLogs") +@RestController +@AllArgsConstructor +public class MeasuresLogsController { + private final MeasuresLogsServiceI measuresLogsService; + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody MeasuresLogsAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + return measuresLogsService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody MeasuresLogsPageQry qry) { + return measuresLogsService.listPage(qry); + } + + @ApiOperation("所有数据") + @GetMapping("/listAll/{workId}") + public MultiResponse listAll(@PathVariable("workId") String workId) { + return MultiResponse.of(measuresLogsService.listAll(workId)); + } + + @ApiOperation("详情") + @GetMapping("/{id}") + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(measuresLogsService.queryById(id)); + } + + @ApiOperation("删除") + @DeleteMapping("/{id}") + public Response remove(@PathVariable("id") Long id) { + measuresLogsService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("删除多个") + @DeleteMapping("/ids") + public Response removeBatch(@RequestParam Long[] ids) { + measuresLogsService.removeBatch(ids); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改") + @PutMapping("/edit") + public SingleResponse edit(@Validated @RequestBody MeasuresLogsUpdateCmd measuresLogsUpdateCmd) { + measuresLogsService.edit(measuresLogsUpdateCmd); + return SingleResponse.buildSuccess(); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/eightwork/web/TaskFlowController.java b/web-adapter/src/main/java/com/zcloud/eightwork/web/TaskFlowController.java new file mode 100644 index 0000000..7289ee2 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/eightwork/web/TaskFlowController.java @@ -0,0 +1,87 @@ +package com.zcloud.eightwork.web; + + +import com.zcloud.eightwork.api.TaskFlowServiceI; +import com.zcloud.eightwork.dto.*; +import com.zcloud.eightwork.dto.clientobject.TaskFlowCO; +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.eightwork.dto.clientobject.TaskFlowInitCO; +import com.zcloud.eightwork.dto.clientobject.TaskWorkInitCO; +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 fangjiakai + * @Date 2025-11-05 09:53:50 + */ +@Api(tags = "任务流程") +@RequestMapping("/${application.gateway}/taskFlow") +@RestController +@AllArgsConstructor +public class TaskFlowController { + private final TaskFlowServiceI taskFlowService; + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody TaskFlowAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + return taskFlowService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody TaskFlowPageQry qry) { + return taskFlowService.listPage(qry); + } + + @ApiOperation("作业初始化") + @PostMapping("/getWorkInit") + public SingleResponse getWorkInit(@RequestBody TaskWorkQryCmd qry) { + return SingleResponse.of(taskFlowService.getWorkInit(qry)); + } + @ApiOperation("作业初始化流程") + @PostMapping("/getFlowInit") + public SingleResponse getFlowInit(@RequestBody TaskFlowQryCmd qry) { + return SingleResponse.of(taskFlowService.getFlowInit(qry)); + } + + @ApiOperation("详情") + @GetMapping("/{id}") + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(new TaskFlowCO()); + } + + @ApiOperation("删除") + @DeleteMapping("/{id}") + public Response remove(@PathVariable("id") Long id) { + taskFlowService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("删除多个") + @DeleteMapping("/ids") + public Response removeBatch(@RequestParam Long[] ids) { + taskFlowService.removeBatch(ids); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改") + @PutMapping("/edit") + public SingleResponse edit(@Validated @RequestBody TaskFlowUpdateCmd taskFlowUpdateCmd) { + taskFlowService.edit(taskFlowUpdateCmd); + return SingleResponse.buildSuccess(); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/eightwork/web/TaskLogController.java b/web-adapter/src/main/java/com/zcloud/eightwork/web/TaskLogController.java new file mode 100644 index 0000000..6d12dbf --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/eightwork/web/TaskLogController.java @@ -0,0 +1,107 @@ +package com.zcloud.eightwork.web; + + +import com.zcloud.eightwork.api.TaskLogServiceI; +import com.zcloud.eightwork.dto.TaskLogAddCmd; +import com.zcloud.eightwork.dto.TaskLogNextCmd; +import com.zcloud.eightwork.dto.TaskLogPageQry; +import com.zcloud.eightwork.dto.TaskLogUpdateCmd; +import com.zcloud.eightwork.dto.clientobject.TaskLogCO; +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.eightwork.dto.clientobject.TodoCountCO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.data.annotation.PersistenceCreator; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; + +/** + * web-adapter + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:53 + */ +@Api(tags = "工作流程记录") +@RequestMapping("/${application.gateway}/taskLog") +@RestController +@AllArgsConstructor +public class TaskLogController { + private final TaskLogServiceI taskLogService; + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody TaskLogAddCmd cmd) { + cmd.setDepartmentId(AuthContext.getOrgId()); + return taskLogService.add(cmd); + } + + @ApiOperation("下一步") + @PostMapping("/nextStep") + public Response nextStep(@Validated @RequestBody TaskLogNextCmd cmd) { + taskLogService.nextStep(cmd); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody TaskLogPageQry qry) { + qry.setEqStatus(0); + return taskLogService.listPage(qry,AuthContext.getOrgId(),AuthContext.getUserId()); + } + + + @ApiOperation("所有数据") + @GetMapping("/listAll/{workId}") + public MultiResponse listAll(@PathVariable("workId") String workId) { + return MultiResponse.of(taskLogService.listAll(workId)); + } + + @ApiOperation("详情") + @GetMapping("/{id}") + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return taskLogService.getInfoById(id); + } + + @ApiOperation("删除") + @DeleteMapping("/{id}") + public Response remove(@PathVariable("id") Long id) { + taskLogService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("删除多个") + @DeleteMapping("/ids") + public Response removeBatch(@RequestParam Long[] ids) { + taskLogService.removeBatch(ids); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改") + @PutMapping("/edit") + public SingleResponse edit(@Validated @RequestBody TaskLogUpdateCmd taskLogUpdateCmd) { + taskLogService.edit(taskLogUpdateCmd); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("获取待办数") + @GetMapping("/getTodoCount") + public MultiResponse getTodoCount() { + return MultiResponse.of(taskLogService.getTodoCount(AuthContext.getOrgId(),AuthContext.getUserId())); + } + + @ApiOperation("获取作业内待办数") + @GetMapping("/getTodoCountForWork/{workType}") + public MultiResponse getTodoCountForWork(@PathVariable("workType") String workType) { + return MultiResponse.of(taskLogService.getTodoCountForWork(AuthContext.getOrgId(),AuthContext.getUserId(),workType)); + } +} + diff --git a/web-app/pom.xml b/web-app/pom.xml new file mode 100644 index 0000000..9969201 --- /dev/null +++ b/web-app/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + com.zcloud.eightwork + zcloud-gbs-eightwork + 1.0-SNAPSHOT + ../pom.xml + + + web-app + jar + web-app + + + + com.zcloud.eightwork + web-client + + + com.zcloud.eightwork + web-infrastructure + + + + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/ConfinedSpaceAddExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/ConfinedSpaceAddExe.java new file mode 100644 index 0000000..2cb01b3 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/ConfinedSpaceAddExe.java @@ -0,0 +1,40 @@ +package com.zcloud.eightwork.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.eightwork.domain.gateway.ConfinedSpaceGateway; +import com.zcloud.eightwork.domain.model.ConfinedSpaceE; +import com.zcloud.eightwork.dto.ConfinedSpaceAddCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-27 10:26:33 + */ +@Component +@AllArgsConstructor +public class ConfinedSpaceAddExe { + private final ConfinedSpaceGateway confinedSpaceGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(ConfinedSpaceAddCmd cmd) { + ConfinedSpaceE confinedSpaceE = new ConfinedSpaceE(); + BeanUtils.copyProperties(cmd, confinedSpaceE); + boolean res = false; + try { + res = confinedSpaceGateway.add(confinedSpaceE); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("保存失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/ConfinedSpaceRemoveExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/ConfinedSpaceRemoveExe.java new file mode 100644 index 0000000..bbfffa6 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/ConfinedSpaceRemoveExe.java @@ -0,0 +1,39 @@ +package com.zcloud.eightwork.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.eightwork.domain.gateway.ConfinedSpaceGateway; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-27 10:26:34 + */ +@Component +@AllArgsConstructor +public class ConfinedSpaceRemoveExe { + private final ConfinedSpaceGateway confinedSpaceGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long id) { + boolean res = confinedSpaceGateway.deletedConfinedSpaceById(id); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long[] ids) { + boolean res = confinedSpaceGateway.deletedConfinedSpaceByIds(ids); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/ConfinedSpaceUpdateExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/ConfinedSpaceUpdateExe.java new file mode 100644 index 0000000..f864053 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/ConfinedSpaceUpdateExe.java @@ -0,0 +1,34 @@ +package com.zcloud.eightwork.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.eightwork.domain.gateway.ConfinedSpaceGateway; +import com.zcloud.eightwork.domain.model.ConfinedSpaceE; +import com.zcloud.eightwork.dto.ConfinedSpaceUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-27 10:26:35 + */ +@Component +@AllArgsConstructor +public class ConfinedSpaceUpdateExe { + private final ConfinedSpaceGateway confinedSpaceGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(ConfinedSpaceUpdateCmd confinedSpaceUpdateCmd) { + ConfinedSpaceE confinedSpaceE = new ConfinedSpaceE(); + BeanUtils.copyProperties(confinedSpaceUpdateCmd, confinedSpaceE); + boolean res = confinedSpaceGateway.update(confinedSpaceE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/EightworkInfoAddExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkInfoAddExe.java new file mode 100644 index 0000000..340f205 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkInfoAddExe.java @@ -0,0 +1,40 @@ +package com.zcloud.eightwork.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.eightwork.domain.gateway.EightworkInfoGateway; +import com.zcloud.eightwork.domain.model.EightworkInfoE; +import com.zcloud.eightwork.dto.EightworkInfoAddCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-12 10:58:52 + */ +@Component +@AllArgsConstructor +public class EightworkInfoAddExe { + private final EightworkInfoGateway eightworkInfoGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(EightworkInfoAddCmd cmd) { + EightworkInfoE eightworkInfoE = new EightworkInfoE(); + BeanUtils.copyProperties(cmd, eightworkInfoE); + boolean res = false; + try { + res = eightworkInfoGateway.add(eightworkInfoE); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("保存失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/EightworkInfoRemoveExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkInfoRemoveExe.java new file mode 100644 index 0000000..cd3984f --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkInfoRemoveExe.java @@ -0,0 +1,39 @@ +package com.zcloud.eightwork.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.eightwork.domain.gateway.EightworkInfoGateway; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-12 10:58:53 + */ +@Component +@AllArgsConstructor +public class EightworkInfoRemoveExe { + private final EightworkInfoGateway eightworkInfoGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long id) { + boolean res = eightworkInfoGateway.deletedEightworkInfoById(id); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long[] ids) { + boolean res = eightworkInfoGateway.deletedEightworkInfoByIds(ids); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/EightworkInfoUpdateExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkInfoUpdateExe.java new file mode 100644 index 0000000..6393fbc --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkInfoUpdateExe.java @@ -0,0 +1,34 @@ +package com.zcloud.eightwork.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.eightwork.domain.gateway.EightworkInfoGateway; +import com.zcloud.eightwork.domain.model.EightworkInfoE; +import com.zcloud.eightwork.dto.EightworkInfoUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-12 10:58:54 + */ +@Component +@AllArgsConstructor +public class EightworkInfoUpdateExe { + private final EightworkInfoGateway eightworkInfoGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(EightworkInfoUpdateCmd eightworkInfoUpdateCmd) { + EightworkInfoE eightworkInfoE = new EightworkInfoE(); + BeanUtils.copyProperties(eightworkInfoUpdateCmd, eightworkInfoE); + boolean res = eightworkInfoGateway.update(eightworkInfoE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/EightworkStepAddExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkStepAddExe.java new file mode 100644 index 0000000..d73bd17 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkStepAddExe.java @@ -0,0 +1,40 @@ +package com.zcloud.eightwork.command; + +import com.zcloud.eightwork.domain.gateway.EightworkStepGateway; +import com.zcloud.eightwork.domain.model.EightworkStepE; +import com.zcloud.eightwork.dto.EightworkStepAddCmd; +import com.alibaba.cola.exception.BizException; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:09 + */ +@Component +@AllArgsConstructor +public class EightworkStepAddExe { + private final EightworkStepGateway eightworkStepGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(EightworkStepAddCmd cmd) { + EightworkStepE eightworkStepE = new EightworkStepE(); + BeanUtils.copyProperties(cmd, eightworkStepE); + boolean res = false; + try { + res = eightworkStepGateway.add(eightworkStepE); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("保存失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/EightworkStepRemoveExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkStepRemoveExe.java new file mode 100644 index 0000000..618bc68 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkStepRemoveExe.java @@ -0,0 +1,39 @@ +package com.zcloud.eightwork.command; + +import com.zcloud.eightwork.domain.gateway.EightworkStepGateway; +import com.alibaba.cola.exception.BizException; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:26 + */ +@Component +@AllArgsConstructor +public class EightworkStepRemoveExe { + private final EightworkStepGateway eightworkStepGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long id) { + boolean res = eightworkStepGateway.deletedEightworkStepById(id); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long[] ids) { + boolean res = eightworkStepGateway.deletedEightworkStepByIds(ids); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/EightworkStepUpdateExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkStepUpdateExe.java new file mode 100644 index 0000000..9a82792 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkStepUpdateExe.java @@ -0,0 +1,34 @@ +package com.zcloud.eightwork.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.eightwork.domain.gateway.EightworkStepGateway; +import com.zcloud.eightwork.domain.model.EightworkStepE; +import com.zcloud.eightwork.dto.EightworkStepUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:32 + */ +@Component +@AllArgsConstructor +public class EightworkStepUpdateExe { + private final EightworkStepGateway eightworkStepGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(EightworkStepUpdateCmd eightworkStepUpdateCmd) { + EightworkStepE eightworkStepE = new EightworkStepE(); + BeanUtils.copyProperties(eightworkStepUpdateCmd, eightworkStepE); + boolean res = eightworkStepGateway.update(eightworkStepE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/EightworkSupplementaryInfoAddExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkSupplementaryInfoAddExe.java new file mode 100644 index 0000000..9c1a886 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkSupplementaryInfoAddExe.java @@ -0,0 +1,40 @@ +package com.zcloud.eightwork.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.eightwork.domain.gateway.EightworkSupplementaryInfoGateway; +import com.zcloud.eightwork.domain.model.EightworkSupplementaryInfoE; +import com.zcloud.eightwork.dto.EightworkSupplementaryInfoAddCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-20 10:38:36 + */ +@Component +@AllArgsConstructor +public class EightworkSupplementaryInfoAddExe { + private final EightworkSupplementaryInfoGateway eightworkSupplementaryInfoGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(EightworkSupplementaryInfoAddCmd cmd) { + EightworkSupplementaryInfoE eightworkSupplementaryInfoE = new EightworkSupplementaryInfoE(); + BeanUtils.copyProperties(cmd, eightworkSupplementaryInfoE); + boolean res = false; + try { + res = eightworkSupplementaryInfoGateway.add(eightworkSupplementaryInfoE); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("保存失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/EightworkSupplementaryInfoRemoveExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkSupplementaryInfoRemoveExe.java new file mode 100644 index 0000000..2c2f4e1 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkSupplementaryInfoRemoveExe.java @@ -0,0 +1,39 @@ +package com.zcloud.eightwork.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.eightwork.domain.gateway.EightworkSupplementaryInfoGateway; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-20 10:38:37 + */ +@Component +@AllArgsConstructor +public class EightworkSupplementaryInfoRemoveExe { + private final EightworkSupplementaryInfoGateway eightworkSupplementaryInfoGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long id) { + boolean res = eightworkSupplementaryInfoGateway.deletedEightworkSupplementaryInfoById(id); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long[] ids) { + boolean res = eightworkSupplementaryInfoGateway.deletedEightworkSupplementaryInfoByIds(ids); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/EightworkSupplementaryInfoUpdateExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkSupplementaryInfoUpdateExe.java new file mode 100644 index 0000000..dc27f98 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkSupplementaryInfoUpdateExe.java @@ -0,0 +1,34 @@ +package com.zcloud.eightwork.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.eightwork.domain.gateway.EightworkSupplementaryInfoGateway; +import com.zcloud.eightwork.domain.model.EightworkSupplementaryInfoE; +import com.zcloud.eightwork.dto.EightworkSupplementaryInfoUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-20 10:38:37 + */ +@Component +@AllArgsConstructor +public class EightworkSupplementaryInfoUpdateExe { + private final EightworkSupplementaryInfoGateway eightworkSupplementaryInfoGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(EightworkSupplementaryInfoUpdateCmd eightworkSupplementaryInfoUpdateCmd) { + EightworkSupplementaryInfoE eightworkSupplementaryInfoE = new EightworkSupplementaryInfoE(); + BeanUtils.copyProperties(eightworkSupplementaryInfoUpdateCmd, eightworkSupplementaryInfoE); + boolean res = eightworkSupplementaryInfoGateway.update(eightworkSupplementaryInfoE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/EightworkTaskAddExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkTaskAddExe.java new file mode 100644 index 0000000..faf0d1b --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkTaskAddExe.java @@ -0,0 +1,40 @@ +package com.zcloud.eightwork.command; + +import com.zcloud.eightwork.domain.gateway.EightworkTaskGateway; +import com.zcloud.eightwork.domain.model.EightworkTaskE; +import com.zcloud.eightwork.dto.EightworkTaskAddCmd; +import com.alibaba.cola.exception.BizException; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:37 + */ +@Component +@AllArgsConstructor +public class EightworkTaskAddExe { + private final EightworkTaskGateway eightworkTaskGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(EightworkTaskAddCmd cmd) { + EightworkTaskE eightworkTaskE = new EightworkTaskE(); + BeanUtils.copyProperties(cmd, eightworkTaskE); + boolean res = false; + try { + res = eightworkTaskGateway.add(eightworkTaskE); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("保存失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/EightworkTaskRemoveExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkTaskRemoveExe.java new file mode 100644 index 0000000..e7f52e4 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkTaskRemoveExe.java @@ -0,0 +1,39 @@ +package com.zcloud.eightwork.command; + +import com.zcloud.eightwork.domain.gateway.EightworkTaskGateway; +import com.alibaba.cola.exception.BizException; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:38 + */ +@Component +@AllArgsConstructor +public class EightworkTaskRemoveExe { + private final EightworkTaskGateway eightworkTaskGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long id) { + boolean res = eightworkTaskGateway.deletedEightworkTaskById(id); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long[] ids) { + boolean res = eightworkTaskGateway.deletedEightworkTaskByIds(ids); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/EightworkTaskUpdateExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkTaskUpdateExe.java new file mode 100644 index 0000000..3eb0052 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkTaskUpdateExe.java @@ -0,0 +1,34 @@ +package com.zcloud.eightwork.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.eightwork.domain.gateway.EightworkTaskGateway; +import com.zcloud.eightwork.domain.model.EightworkTaskE; +import com.zcloud.eightwork.dto.EightworkTaskUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:39 + */ +@Component +@AllArgsConstructor +public class EightworkTaskUpdateExe { + private final EightworkTaskGateway eightworkTaskGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(EightworkTaskUpdateCmd eightworkTaskUpdateCmd) { + EightworkTaskE eightworkTaskE = new EightworkTaskE(); + BeanUtils.copyProperties(eightworkTaskUpdateCmd, eightworkTaskE); + boolean res = eightworkTaskGateway.update(eightworkTaskE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/MeasuresAddExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/MeasuresAddExe.java new file mode 100644 index 0000000..e9aadd7 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/MeasuresAddExe.java @@ -0,0 +1,41 @@ +package com.zcloud.eightwork.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.eightwork.domain.gateway.MeasuresGateway; +import com.zcloud.eightwork.domain.model.MeasuresE; +import com.zcloud.eightwork.dto.MeasuresAddCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + + + +/** +* web-app +* @Author fangjiakai +* @Date 2025-11-11 11:30:42 +*/ +@Component +@AllArgsConstructor +public class MeasuresAddExe { + private final MeasuresGateway measuresGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(MeasuresAddCmd cmd) { + MeasuresE measuresE = new MeasuresE(); + BeanUtils.copyProperties(cmd, measuresE); + boolean res = false; + try { + res = measuresGateway.add(measuresE); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("保存失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/MeasuresLogsAddExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/MeasuresLogsAddExe.java new file mode 100644 index 0000000..69635d9 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/MeasuresLogsAddExe.java @@ -0,0 +1,40 @@ +package com.zcloud.eightwork.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.eightwork.domain.gateway.MeasuresLogsGateway; +import com.zcloud.eightwork.domain.model.MeasuresLogsE; +import com.zcloud.eightwork.dto.MeasuresLogsAddCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-11 11:30:49 + */ +@Component +@AllArgsConstructor +public class MeasuresLogsAddExe { + private final MeasuresLogsGateway measuresLogsGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(MeasuresLogsAddCmd cmd) { + MeasuresLogsE measuresLogsE = new MeasuresLogsE(); + BeanUtils.copyProperties(cmd, measuresLogsE); + boolean res = false; + try { + res = measuresLogsGateway.add(measuresLogsE); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("保存失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/MeasuresLogsRemoveExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/MeasuresLogsRemoveExe.java new file mode 100644 index 0000000..1be6c3a --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/MeasuresLogsRemoveExe.java @@ -0,0 +1,40 @@ +package com.zcloud.eightwork.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.eightwork.domain.gateway.MeasuresLogsGateway; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + + + +/** +* web-app +* @Author fangjiakai +* @Date 2025-11-11 11:30:49 +*/ +@Component +@AllArgsConstructor +public class MeasuresLogsRemoveExe { + private final MeasuresLogsGateway measuresLogsGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long id) { + boolean res = measuresLogsGateway.deletedMeasuresLogsById(id); + if(!res){ + throw new BizException("删除失败"); + } + return true; + } + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long[] ids) { + boolean res = measuresLogsGateway.deletedMeasuresLogsByIds(ids); + if(!res){ + throw new BizException("删除失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/MeasuresLogsUpdateExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/MeasuresLogsUpdateExe.java new file mode 100644 index 0000000..9bb24cd --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/MeasuresLogsUpdateExe.java @@ -0,0 +1,34 @@ +package com.zcloud.eightwork.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.eightwork.domain.gateway.MeasuresLogsGateway; +import com.zcloud.eightwork.domain.model.MeasuresLogsE; +import com.zcloud.eightwork.dto.MeasuresLogsUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-11 11:30:49 + */ +@Component +@AllArgsConstructor +public class MeasuresLogsUpdateExe { + private final MeasuresLogsGateway measuresLogsGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(MeasuresLogsUpdateCmd measuresLogsUpdateCmd) { + MeasuresLogsE measuresLogsE = new MeasuresLogsE(); + BeanUtils.copyProperties(measuresLogsUpdateCmd, measuresLogsE); + boolean res = measuresLogsGateway.update(measuresLogsE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/MeasuresRemoveExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/MeasuresRemoveExe.java new file mode 100644 index 0000000..421114b --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/MeasuresRemoveExe.java @@ -0,0 +1,40 @@ +package com.zcloud.eightwork.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.eightwork.domain.gateway.MeasuresGateway; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + + + +/** +* web-app +* @Author fangjiakai +* @Date 2025-11-11 11:30:48 +*/ +@Component +@AllArgsConstructor +public class MeasuresRemoveExe { + private final MeasuresGateway measuresGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long id) { + boolean res = measuresGateway.deletedMeasuresById(id); + if(!res){ + throw new BizException("删除失败"); + } + return true; + } + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long[] ids) { + boolean res = measuresGateway.deletedMeasuresByIds(ids); + if(!res){ + throw new BizException("删除失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/MeasuresUpdateExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/MeasuresUpdateExe.java new file mode 100644 index 0000000..7b11580 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/MeasuresUpdateExe.java @@ -0,0 +1,35 @@ +package com.zcloud.eightwork.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.eightwork.domain.gateway.MeasuresGateway; +import com.zcloud.eightwork.domain.model.MeasuresE; +import com.zcloud.eightwork.dto.MeasuresUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + + + +/** +* web-app +* @Author fangjiakai +* @Date 2025-11-11 11:30:49 +*/ +@Component +@AllArgsConstructor +public class MeasuresUpdateExe { + private final MeasuresGateway measuresGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(MeasuresUpdateCmd measuresUpdateCmd) { + MeasuresE measuresE = new MeasuresE(); + BeanUtils.copyProperties(measuresUpdateCmd, measuresE); + boolean res = measuresGateway.update(measuresE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/TaskFlowAddExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/TaskFlowAddExe.java new file mode 100644 index 0000000..063f190 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/TaskFlowAddExe.java @@ -0,0 +1,40 @@ +package com.zcloud.eightwork.command; + +import com.zcloud.eightwork.domain.gateway.TaskFlowGateway; +import com.zcloud.eightwork.domain.model.TaskFlowE; +import com.zcloud.eightwork.dto.TaskFlowAddCmd; +import com.alibaba.cola.exception.BizException; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:50 + */ +@Component +@AllArgsConstructor +public class TaskFlowAddExe { + private final TaskFlowGateway taskFlowGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(TaskFlowAddCmd cmd) { + TaskFlowE taskFlowE = new TaskFlowE(); + BeanUtils.copyProperties(cmd, taskFlowE); + boolean res = false; + try { + res = taskFlowGateway.add(taskFlowE); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("保存失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/TaskFlowRemoveExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/TaskFlowRemoveExe.java new file mode 100644 index 0000000..4c4d288 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/TaskFlowRemoveExe.java @@ -0,0 +1,39 @@ +package com.zcloud.eightwork.command; + +import com.zcloud.eightwork.domain.gateway.TaskFlowGateway; +import com.alibaba.cola.exception.BizException; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:51 + */ +@Component +@AllArgsConstructor +public class TaskFlowRemoveExe { + private final TaskFlowGateway taskFlowGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long id) { + boolean res = taskFlowGateway.deletedTaskFlowById(id); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long[] ids) { + boolean res = taskFlowGateway.deletedTaskFlowByIds(ids); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/TaskFlowUpdateExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/TaskFlowUpdateExe.java new file mode 100644 index 0000000..ffc784b --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/TaskFlowUpdateExe.java @@ -0,0 +1,34 @@ +package com.zcloud.eightwork.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.eightwork.domain.gateway.TaskFlowGateway; +import com.zcloud.eightwork.domain.model.TaskFlowE; +import com.zcloud.eightwork.dto.TaskFlowUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:51 + */ +@Component +@AllArgsConstructor +public class TaskFlowUpdateExe { + private final TaskFlowGateway taskFlowGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(TaskFlowUpdateCmd taskFlowUpdateCmd) { + TaskFlowE taskFlowE = new TaskFlowE(); + BeanUtils.copyProperties(taskFlowUpdateCmd, taskFlowE); + boolean res = taskFlowGateway.update(taskFlowE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogAddExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogAddExe.java new file mode 100644 index 0000000..d0e92f1 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogAddExe.java @@ -0,0 +1,101 @@ +package com.zcloud.eightwork.command; + +import com.alibaba.cola.exception.BizException; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.eightwork.domain.gateway.TaskFlowGateway; +import com.zcloud.eightwork.domain.gateway.TaskLogGateway; +import com.zcloud.eightwork.domain.model.TaskFlowE; +import com.zcloud.eightwork.domain.model.enums.WorkCodeEnum; +import com.zcloud.eightwork.dto.TaskLogAddCmd; +import com.zcloud.eightwork.dto.TaskSignStepInfoCmd; +import com.zcloud.eightwork.persistence.dataobject.EightworkInfoDO; +import com.zcloud.eightwork.persistence.dataobject.TaskLogDO; +import com.zcloud.eightwork.persistence.repository.EightworkInfoRepository; +import com.zcloud.eightwork.persistence.repository.TaskLogRepository; +import com.zcloud.gbscommon.utils.DateUtil; +import com.zcloud.gbscommon.utils.Tools; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.stream.Collectors; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:53 + */ +@Component +@AllArgsConstructor +public class TaskLogAddExe { + private final TaskLogGateway taskLogGateway; + private final TaskLogRepository taskLogRepository; + private final TaskFlowGateway taskFlowGateway; + private final EightworkInfoRepository eightworkInfoRepository; + + @Transactional(rollbackFor = Exception.class) + public synchronized List execute(TaskLogAddCmd cmd) { + try { + String workId = saveWork(cmd); + List flows = taskFlowGateway.listAllByWorkType(cmd.getWorkType(), cmd.getWorkLevel()); + List taskLogs = flows.stream().map(flow -> { + TaskLogDO taskLogDO = new TaskLogDO(Tools.get32UUID()); + BeanUtils.copyProperties(flow, taskLogDO, "id"); + taskLogDO.setWorkId(workId); + taskLogDO.setStatus(-99); + if (flow.getStepId() == 1) { + taskLogDO.setSign(flow.getActorField(), + AuthContext.getOrgId(), + AuthContext.getCurrentUser().getOrgName(), + AuthContext.getUserId(), + AuthContext.getName()); + } + TaskSignStepInfoCmd taskSignStepInfoCmd = cmd.getSignLogs().stream().filter(info -> info.getStepId().equals(flow.getStepId())).findFirst().orElse(null); + if (taskSignStepInfoCmd != null) { + if (flow.getCanSkip() == 1 && taskSignStepInfoCmd.getActUser() == null) { + taskLogDO.setStatus(-1); // 设置跳过 + } else { + taskLogDO.setSign(taskSignStepInfoCmd.getActorField(), + taskSignStepInfoCmd.getActUserDepartment(), + taskSignStepInfoCmd.getActUserDepartmentName(), + taskSignStepInfoCmd.getActUser(), + taskSignStepInfoCmd.getActUserName()); + taskLogDO.setWorkType(cmd.getWorkType()); + } + } + return taskLogDO; + }).collect(Collectors.toList()); + taskLogRepository.saveBatch(taskLogs); + return taskLogs; + } catch (Exception e) { + e.printStackTrace(); + throw new BizException("保存失败"); + } + } + + private String saveWork(TaskLogAddCmd cmd) { + Long workCountBytype = eightworkInfoRepository.countByWorkType(cmd.getWorkType()); + String nosb = "QG" + + WorkCodeEnum.getCodeByWorkType(cmd.getWorkType()) + + DateUtil.getDays() + + workCountBytype; + EightworkInfoDO eightworkInfo = new EightworkInfoDO(Tools.get32UUID() + , cmd.getWorkType() + , cmd.getWorkLevel() + , cmd.getCorpinfoId() + , cmd.getXgfFlag() + , cmd.getProjectId() + , cmd.getXgfId() + , nosb + , 1 + , cmd.getInfo() + , cmd.getDepartmentId()); + eightworkInfoRepository.save(eightworkInfo); + return eightworkInfo.getWorkId(); + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogRemoveExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogRemoveExe.java new file mode 100644 index 0000000..e6110fb --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogRemoveExe.java @@ -0,0 +1,39 @@ +package com.zcloud.eightwork.command; + +import com.zcloud.eightwork.domain.gateway.TaskLogGateway; +import com.alibaba.cola.exception.BizException; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:53 + */ +@Component +@AllArgsConstructor +public class TaskLogRemoveExe { + private final TaskLogGateway taskLogGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long id) { + boolean res = taskLogGateway.deletedTaskLogById(id); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long[] ids) { + boolean res = taskLogGateway.deletedTaskLogByIds(ids); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogUpdateExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogUpdateExe.java new file mode 100644 index 0000000..59bc1bd --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogUpdateExe.java @@ -0,0 +1,209 @@ +package com.zcloud.eightwork.command; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.json.JSONUtil; +import com.alibaba.cola.exception.BizException; +import com.alibaba.fastjson.JSONArray; +import com.zcloud.eightwork.domain.gateway.TaskLogGateway; +import com.zcloud.eightwork.domain.model.MeasuresLogsE; +import com.zcloud.eightwork.domain.model.TaskLogE; +import com.zcloud.eightwork.dto.TaskLogNextCmd; +import com.zcloud.eightwork.dto.TaskLogUpdateCmd; +import com.zcloud.eightwork.dto.TaskSignStepInfoCmd; +import com.zcloud.eightwork.persistence.dataobject.MeasuresLogsDO; +import com.zcloud.eightwork.persistence.dataobject.TaskLogDO; +import com.zcloud.eightwork.persistence.repository.EightworkInfoRepository; +import com.zcloud.eightwork.persistence.repository.MeasuresLogsRepository; +import com.zcloud.eightwork.persistence.repository.TaskLogRepository; +import lombok.AllArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:54 + */ +@Component +@AllArgsConstructor +public class TaskLogUpdateExe { + private final TaskLogGateway taskLogGateway; + private final TaskLogRepository taskLogRepository; + private final MeasuresLogsRepository measuresLogsRepository; + private final EightworkInfoRepository eightworkInfoRepository; + + @Transactional(rollbackFor = Exception.class) + public void execute(TaskLogUpdateCmd taskLogUpdateCmd) { + TaskLogE taskLogE = new TaskLogE(); + BeanUtils.copyProperties(taskLogUpdateCmd, taskLogE); + boolean res = taskLogGateway.update(taskLogE); + if (!res) { + throw new BizException("修改失败"); + } + } + + @Transactional(rollbackFor = Exception.class) + public void nextStep(TaskLogNextCmd cmd) { + List logs = taskLogGateway.listAllByWorkId(cmd.getWorkId()); + // 待操作logs + List actionLogs = new ArrayList<>(); + logs.forEach(log -> { + // 修改当前步骤状态 + if (log.getId().equals(cmd.getId())) { + log.setStatus(cmd.getStatus()); + if (log.getSignStepFlag() == 1) { + log.setSignPath(cmd.getSignPath()); + } + TaskLogDO logDO = new TaskLogDO(); + BeanUtils.copyProperties(log, logDO); + actionLogs.add(logDO); + // 同意时 + if (cmd.getStatus() == 1) { + // 多人签字步骤时 + boolean canNext = true; + if (log.getMultipleFlag() == 1) { + // 获取多人签字步骤未签字的其他人人数 + long multipleSigns = logs.stream().filter(info -> info.getStepId().equals(log.getStepId()) && log.getStatus() != 1 && !log.getId().equals(cmd.getId())).collect(Collectors.toList()).size(); + canNext = multipleSigns == 0; + } + // 特殊步骤 + if (StringUtils.isNotBlank(log.getSpecialStepCode())) { + canNext = handleSpecialStep(log, cmd, actionLogs); + } + // 其他安全措施步骤 + if (log.getMeasuresStepFlag() != null && 1 == log.getMeasuresStepFlag()) { + MeasuresLogsDO measuresLogsDO = new MeasuresLogsDO( + cmd.getOthers().getString("otherMeasures"), + log.getWorkId(), + log.getWorkType() + ); + measuresLogsRepository.save(measuresLogsDO); + } + if (canNext) { + // 递归 直到找到不跳过的下一步 + handleNextStep(log, actionLogs, logs); + } + + // 如果当前步骤为分支开始步骤 + if (log.getStepType() == 1 && log.getBranchFlag() == 1) { + TaskLogE branchStep = logs.stream().filter(info -> info.getStepId().equals(log.getBranchStep())).findFirst().orElse(null); + if (branchStep != null) { + branchStep.setStatus(0); + TaskLogDO branchLogDO = new TaskLogDO(); + BeanUtils.copyProperties(branchStep, branchLogDO); + actionLogs.add(branchLogDO); + } + } + // 判断是否有当前步骤设置的签字人 + if (cmd.getSignLogs() != null && cmd.getSignLogs().size() > 0) { + cmd.getSignLogs().stream().forEach(info -> { + TaskLogE signStepLog = logs.stream().filter(tempLog -> tempLog.getStepId().equals(info.getStepId())).findFirst().orElse(null); + if (signStepLog != null) { + if (log.getCanSkip() == 1 && signStepLog.getActUser() == null) { + log.setStatus(-1); // 设置跳过 + TaskLogDO skipLogDO = new TaskLogDO(); + BeanUtils.copyProperties(log, skipLogDO); + actionLogs.add(skipLogDO); + } else { + signStepLog.setSign(info.getActorField(), + info.getActUserDepartment(), + info.getActUserDepartmentName(), + info.getActUser(), + info.getActUserName()); + TaskLogDO signLogDO = new TaskLogDO(); + BeanUtils.copyProperties(signStepLog, signLogDO); + actionLogs.add(signLogDO); + } + } + }); + } + } + } + }); + taskLogRepository.updateBatchById(actionLogs); + } + + /** + * 下一步 递归 + * + * @param log 当前步骤 + * @param actionLogs 待修改记录 + * @param logs 所有步骤 + * @return + */ + private void handleNextStep(TaskLogE log, List actionLogs, List logs) { + List nextStep = logs.stream().filter(info -> info.getStepId().equals(log.getNextStep())).collect(Collectors.toList()); + if (!CollectionUtil.isEmpty(nextStep)) { + // 下一步跳过时, 多人签字不存在跳过情况 + TaskLogE nextStepTemp = nextStep.get(0); + if (nextStepTemp.getStatus() == -1) { // 步骤可跳过 并且未设置签字人 则判断为跳过步骤 + handleNextStep(nextStepTemp, actionLogs, logs); + } else { // 非跳过时 + // 可能涉及多人签字 + nextStep.forEach(next -> { + next.setStatus(0); + TaskLogDO nextLogDO = new TaskLogDO(); + BeanUtils.copyProperties(next, nextLogDO); + actionLogs.add(nextLogDO); + }); + eightworkInfoRepository.updateWorkStatus(log.getWorkId(),nextStep.get(0).getStepName() , null); + } + }else{ + // 没有下一步 则设置作业状态为999 验收 + eightworkInfoRepository.updateWorkStatus(log.getWorkId(), "已归档", 999); + } + } + + /** + * 特殊步骤 + * + * @param log 当前步骤 + * @param cmd 特殊步骤参数 + * @param actionLogs 待修改记录 + * @return + */ + private boolean handleSpecialStep(TaskLogE log, TaskLogNextCmd cmd, List actionLogs) { + if ("delay".equals(cmd.getSpecialStepCode())) { // 延时监火转交时, 完成时SpecialStepCode为null走正常下一步 + // 保存下一步转交人记录 + TaskLogE newDelayStep = new TaskLogE(log); + TaskLogDO nextLogDO = new TaskLogDO(); + BeanUtils.copyProperties(newDelayStep, nextLogDO); + nextLogDO.setActUserDepartment(cmd.getOthers().getLong("actUserDepartment")); + nextLogDO.setActUserDepartmentName(cmd.getOthers().getString("actUserDepartmentName")); + taskLogRepository.save(nextLogDO); + + // 修改当前步骤状态为已完成 + log.setStatus(1); + TaskLogDO currentLog = new TaskLogDO(); + BeanUtils.copyProperties(log, currentLog); + actionLogs.add(currentLog); + return false; + }else if("measures".equals(cmd.getSpecialStepCode())){ + List list = new ArrayList<>(); + JSONArray array = cmd.getOthers().getJSONArray("measures"); + if (array != null) { + for (int i = 0; i < array.size(); i++) { + MeasuresLogsE cmdItem = JSONUtil.toBean(array.getJSONObject(i).toJSONString(), MeasuresLogsE.class); + list.add(cmdItem); + } + } + measuresLogsRepository.saveBatch(list.stream().map(item -> { + MeasuresLogsDO d = new MeasuresLogsDO(); + BeanUtils.copyProperties(item, d, "id"); + d.setType(1); + return d; + }).collect(Collectors.toList())); + return true; + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/convertor/ConfinedSpaceCoConvertor.java b/web-app/src/main/java/com/zcloud/eightwork/command/convertor/ConfinedSpaceCoConvertor.java new file mode 100644 index 0000000..2cdcc88 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/convertor/ConfinedSpaceCoConvertor.java @@ -0,0 +1,26 @@ +package com.zcloud.eightwork.command.convertor; + +import com.zcloud.eightwork.dto.clientobject.ConfinedSpaceCO; +import com.zcloud.eightwork.persistence.dataobject.ConfinedSpaceDO; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-27 10:26:33 + */ +@Mapper(componentModel = "spring") +public interface ConfinedSpaceCoConvertor { + /** + * @param confinedSpaceDOs + * @return + */ + List converDOsToCOs(List confinedSpaceDOs); + + ConfinedSpaceCO converDOToCO(ConfinedSpaceDO confinedSpaceDO); +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/convertor/EightworkInfoCoConvertor.java b/web-app/src/main/java/com/zcloud/eightwork/command/convertor/EightworkInfoCoConvertor.java new file mode 100644 index 0000000..e6f5773 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/convertor/EightworkInfoCoConvertor.java @@ -0,0 +1,57 @@ +package com.zcloud.eightwork.command.convertor; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.zcloud.eightwork.dto.clientobject.EightworkInfoCO; +import com.zcloud.eightwork.persistence.dataobject.EightworkInfoDO; +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Named; + +import java.util.List; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-12 10:58:53 + */ +@Mapper(componentModel = "spring") +public interface EightworkInfoCoConvertor { + /** + * @param eightworkInfoDOs + * @return + */ + @Mapping(source = "info", target = "info", qualifiedByName = "stringToJsonObject") + List converDOsToCOs(List eightworkInfoDOs); + + @Mapping(source = "info", target = "info", qualifiedByName = "stringToJsonObject") + EightworkInfoCO converDOToCO(EightworkInfoDO eightworkInfoDO); + + @Named("stringToJsonObject") + default JSONObject stringToJsonObject(String value) { + if (value == null || value.isEmpty()) { + return null; + } + try { + return JSON.parseObject(value); + } catch (Exception e) { + return null; + } + } + + /** + * JSONObject 到 String 的转换方法 + * @param value + * @return + */ + @Named("jsonObjectToString") + default String jsonObjectToString(JSONObject value) { + if (value == null) { + return null; + } + return value.toJSONString(); + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/convertor/EightworkStepCoConvertor.java b/web-app/src/main/java/com/zcloud/eightwork/command/convertor/EightworkStepCoConvertor.java new file mode 100644 index 0000000..503e4f0 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/convertor/EightworkStepCoConvertor.java @@ -0,0 +1,24 @@ +package com.zcloud.eightwork.command.convertor; + +import com.zcloud.eightwork.dto.clientobject.EightworkStepCO; +import com.zcloud.eightwork.persistence.dataobject.EightworkStepDO; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:14 + */ +@Mapper(componentModel = "spring") +public interface EightworkStepCoConvertor { + /** + * @param eightworkStepDOs + * @return + */ + List converDOsToCOs(List eightworkStepDOs); +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/convertor/EightworkSupplementaryInfoCoConvertor.java b/web-app/src/main/java/com/zcloud/eightwork/command/convertor/EightworkSupplementaryInfoCoConvertor.java new file mode 100644 index 0000000..b950751 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/convertor/EightworkSupplementaryInfoCoConvertor.java @@ -0,0 +1,56 @@ +package com.zcloud.eightwork.command.convertor; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.zcloud.eightwork.dto.clientobject.EightworkSupplementaryInfoCO; +import com.zcloud.eightwork.persistence.dataobject.EightworkSupplementaryInfoDO; +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Named; + +import java.util.List; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-20 10:38:36 + */ +@Mapper(componentModel = "spring") +public interface EightworkSupplementaryInfoCoConvertor { + /** + * @param eightworkSupplementaryInfoDOs + * @return + */ + @Mapping(source = "details", target = "details", qualifiedByName = "stringToJsonObject") + List converDOsToCOs(List eightworkSupplementaryInfoDOs); + @Mapping(source = "details", target = "details", qualifiedByName = "stringToJsonObject") + EightworkSupplementaryInfoCO converDOToCO(EightworkSupplementaryInfoDO eightworkSupplementaryInfoDO); + + @Named("stringToJsonObject") + default JSONObject stringToJsonObject(String value) { + if (value == null || value.isEmpty()) { + return null; + } + try { + return JSON.parseObject(value); + } catch (Exception e) { + return null; + } + } + + /** + * JSONObject 到 String 的转换方法 + * @param value + * @return + */ + @Named("jsonObjectToString") + default String jsonObjectToString(JSONObject value) { + if (value == null) { + return null; + } + return value.toJSONString(); + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/convertor/EightworkTaskCoConvertor.java b/web-app/src/main/java/com/zcloud/eightwork/command/convertor/EightworkTaskCoConvertor.java new file mode 100644 index 0000000..397d159 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/convertor/EightworkTaskCoConvertor.java @@ -0,0 +1,24 @@ +package com.zcloud.eightwork.command.convertor; + +import com.zcloud.eightwork.dto.clientobject.EightworkTaskCO; +import com.zcloud.eightwork.persistence.dataobject.EightworkTaskDO; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:37 + */ +@Mapper(componentModel = "spring") +public interface EightworkTaskCoConvertor { + /** + * @param eightworkTaskDOs + * @return + */ + List converDOsToCOs(List eightworkTaskDOs); +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/convertor/MeasuresCoConvertor.java b/web-app/src/main/java/com/zcloud/eightwork/command/convertor/MeasuresCoConvertor.java new file mode 100644 index 0000000..802a134 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/convertor/MeasuresCoConvertor.java @@ -0,0 +1,26 @@ +package com.zcloud.eightwork.command.convertor; + +import com.zcloud.eightwork.dto.clientobject.MeasuresCO; +import com.zcloud.eightwork.persistence.dataobject.MeasuresDO; +import org.mapstruct.Mapper; + +import java.util.List; + + + +/** +* web-app +* @Author fangjiakai +* @Date 2025-11-11 11:30:44 +*/ +@Mapper(componentModel = "spring") +public interface MeasuresCoConvertor { + /** + * @param measuresDOs + * @return + */ + List converDOsToCOs(List measuresDOs); + + MeasuresCO converDOToCO(MeasuresDO measuresDO); +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/convertor/MeasuresLogsCoConvertor.java b/web-app/src/main/java/com/zcloud/eightwork/command/convertor/MeasuresLogsCoConvertor.java new file mode 100644 index 0000000..2146f41 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/convertor/MeasuresLogsCoConvertor.java @@ -0,0 +1,26 @@ +package com.zcloud.eightwork.command.convertor; + +import com.zcloud.eightwork.dto.clientobject.MeasuresLogsCO; +import com.zcloud.eightwork.persistence.dataobject.MeasuresLogsDO; +import org.mapstruct.Mapper; + +import java.util.List; + + + +/** +* web-app +* @Author fangjiakai +* @Date 2025-11-11 11:30:49 +*/ +@Mapper(componentModel = "spring") +public interface MeasuresLogsCoConvertor { + /** + * @param measuresLogsDOs + * @return + */ + List converDOsToCOs(List measuresLogsDOs); + + MeasuresLogsCO converDOToCO(MeasuresLogsDO measuresLogsDO); +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/convertor/TaskFlowCoConvertor.java b/web-app/src/main/java/com/zcloud/eightwork/command/convertor/TaskFlowCoConvertor.java new file mode 100644 index 0000000..f7fad0a --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/convertor/TaskFlowCoConvertor.java @@ -0,0 +1,24 @@ +package com.zcloud.eightwork.command.convertor; + +import com.zcloud.eightwork.dto.clientobject.TaskFlowCO; +import com.zcloud.eightwork.persistence.dataobject.TaskFlowDO; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:50 + */ +@Mapper(componentModel = "spring") +public interface TaskFlowCoConvertor { + /** + * @param taskFlowDOs + * @return + */ + List converDOsToCOs(List taskFlowDOs); +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/convertor/TaskLogCoConvertor.java b/web-app/src/main/java/com/zcloud/eightwork/command/convertor/TaskLogCoConvertor.java new file mode 100644 index 0000000..18d45f6 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/convertor/TaskLogCoConvertor.java @@ -0,0 +1,25 @@ +package com.zcloud.eightwork.command.convertor; + +import com.zcloud.eightwork.dto.clientobject.TaskLogCO; +import com.zcloud.eightwork.persistence.dataobject.TaskLogDO; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:53 + */ +@Mapper(componentModel = "spring") +public interface TaskLogCoConvertor { + /** + * @param taskLogDOs + * @return + */ + List converDOsToCOs(List taskLogDOs); + TaskLogCO converDOToCO(TaskLogDO taskLogDO); +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/query/ConfinedSpaceQueryExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/query/ConfinedSpaceQueryExe.java new file mode 100644 index 0000000..efc5705 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/query/ConfinedSpaceQueryExe.java @@ -0,0 +1,61 @@ +package com.zcloud.eightwork.command.query; + +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zcloud.eightwork.command.convertor.ConfinedSpaceCoConvertor; +import com.zcloud.eightwork.dto.ConfinedSpacePageQry; +import com.zcloud.eightwork.dto.clientobject.ConfinedSpaceCO; +import com.zcloud.eightwork.persistence.dataobject.ConfinedSpaceDO; +import com.zcloud.eightwork.persistence.repository.ConfinedSpaceRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-27 10:26:34 + */ +@Component +@AllArgsConstructor +public class ConfinedSpaceQueryExe { + private final ConfinedSpaceRepository confinedSpaceRepository; + private final ConfinedSpaceCoConvertor confinedSpaceCoConvertor; + + /** + * 根据id查询 + * + * @param id + * @return + */ + public ConfinedSpaceCO queryById(Long id) { + return confinedSpaceCoConvertor.converDOToCO(confinedSpaceRepository.getById(id)); + } + + /** + * 分页 + * + * @param confinedSpacePageQry + * @return + */ + public PageResponse execute(ConfinedSpacePageQry confinedSpacePageQry) { + Map params = PageQueryHelper.toHashMap(confinedSpacePageQry); + PageResponse pageResponse = confinedSpaceRepository.listPage(params); + List examCenterCOS = confinedSpaceCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + + public List listAll(ConfinedSpacePageQry qry) { + return confinedSpaceCoConvertor.converDOsToCOs(confinedSpaceRepository.list( + new LambdaQueryWrapper() + .eq(ConfinedSpaceDO::getCorpinfoId, qry.getEqCorpinfoId()) + .orderByAsc(ConfinedSpaceDO::getCreateTime) + )); + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/query/EightworkInfoQueryExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/query/EightworkInfoQueryExe.java new file mode 100644 index 0000000..211bab1 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/query/EightworkInfoQueryExe.java @@ -0,0 +1,52 @@ +package com.zcloud.eightwork.command.query; + +import com.alibaba.cola.dto.PageResponse; +import com.zcloud.eightwork.command.convertor.EightworkInfoCoConvertor; +import com.zcloud.eightwork.dto.EightworkInfoPageQry; +import com.zcloud.eightwork.dto.clientobject.EightworkInfoCO; +import com.zcloud.eightwork.persistence.dataobject.EightworkInfoDO; +import com.zcloud.eightwork.persistence.repository.EightworkInfoRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-12 10:58:53 + */ +@Component +@AllArgsConstructor +public class EightworkInfoQueryExe { + private final EightworkInfoRepository eightworkInfoRepository; + private final EightworkInfoCoConvertor eightworkInfoCoConvertor; + + /** + * 根据id查询 + * + * @param id + * @return + */ + public EightworkInfoCO queryById(Long id) { + return eightworkInfoCoConvertor.converDOToCO(eightworkInfoRepository.getById(id)); + } + + /** + * 分页 + * + * @param eightworkInfoPageQry + * @return + */ + public PageResponse execute(EightworkInfoPageQry eightworkInfoPageQry) { + Map params = PageQueryHelper.toHashMap(eightworkInfoPageQry); + PageResponse pageResponse = eightworkInfoRepository.listPage(params); + List examCenterCOS = eightworkInfoCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/query/EightworkStepQueryExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/query/EightworkStepQueryExe.java new file mode 100644 index 0000000..5bbf83a --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/query/EightworkStepQueryExe.java @@ -0,0 +1,42 @@ +package com.zcloud.eightwork.command.query; + +import com.zcloud.eightwork.command.convertor.EightworkStepCoConvertor; +import com.zcloud.eightwork.dto.EightworkStepPageQry; +import com.zcloud.eightwork.dto.clientobject.EightworkStepCO; +import com.zcloud.eightwork.persistence.dataobject.EightworkStepDO; +import com.zcloud.eightwork.persistence.repository.EightworkStepRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.alibaba.cola.dto.PageResponse; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:23 + */ +@Component +@AllArgsConstructor +public class EightworkStepQueryExe { + private final EightworkStepRepository eightworkStepRepository; + private final EightworkStepCoConvertor eightworkStepCoConvertor; + + /** + * 分页 + * + * @param eightworkStepPageQry + * @return + */ + public PageResponse execute(EightworkStepPageQry eightworkStepPageQry) { + Map params = PageQueryHelper.toHashMap(eightworkStepPageQry); + PageResponse pageResponse = eightworkStepRepository.listPage(params); + List examCenterCOS = eightworkStepCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/query/EightworkSupplementaryInfoQueryExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/query/EightworkSupplementaryInfoQueryExe.java new file mode 100644 index 0000000..00b15d4 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/query/EightworkSupplementaryInfoQueryExe.java @@ -0,0 +1,56 @@ +package com.zcloud.eightwork.command.query; + +import com.alibaba.cola.dto.PageResponse; +import com.zcloud.eightwork.command.convertor.EightworkSupplementaryInfoCoConvertor; +import com.zcloud.eightwork.dto.EightworkSupplementaryInfoPageQry; +import com.zcloud.eightwork.dto.clientobject.EightworkSupplementaryInfoCO; +import com.zcloud.eightwork.persistence.dataobject.EightworkSupplementaryInfoDO; +import com.zcloud.eightwork.persistence.repository.EightworkSupplementaryInfoRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-20 10:38:37 + */ +@Component +@AllArgsConstructor +public class EightworkSupplementaryInfoQueryExe { + private final EightworkSupplementaryInfoRepository eightworkSupplementaryInfoRepository; + private final EightworkSupplementaryInfoCoConvertor eightworkSupplementaryInfoCoConvertor; + + /** + * 根据id查询 + * + * @param id + * @return + */ + public EightworkSupplementaryInfoCO queryById(Long id) { + return eightworkSupplementaryInfoCoConvertor.converDOToCO(eightworkSupplementaryInfoRepository.getById(id)); + } + + /** + * 分页 + * + * @param eightworkSupplementaryInfoPageQry + * @return + */ + public PageResponse execute(EightworkSupplementaryInfoPageQry eightworkSupplementaryInfoPageQry) { + Map params = PageQueryHelper.toHashMap(eightworkSupplementaryInfoPageQry); + PageResponse pageResponse = eightworkSupplementaryInfoRepository.listPage(params); + List examCenterCOS = eightworkSupplementaryInfoCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + + public List listAll(String workId) { + return eightworkSupplementaryInfoCoConvertor.converDOsToCOs(eightworkSupplementaryInfoRepository.listAll(workId)); + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/query/EightworkTaskQueryExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/query/EightworkTaskQueryExe.java new file mode 100644 index 0000000..ab1efdb --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/query/EightworkTaskQueryExe.java @@ -0,0 +1,42 @@ +package com.zcloud.eightwork.command.query; + +import com.zcloud.eightwork.command.convertor.EightworkTaskCoConvertor; +import com.zcloud.eightwork.dto.EightworkTaskPageQry; +import com.zcloud.eightwork.dto.clientobject.EightworkTaskCO; +import com.zcloud.eightwork.persistence.dataobject.EightworkTaskDO; +import com.zcloud.eightwork.persistence.repository.EightworkTaskRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.alibaba.cola.dto.PageResponse; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:38 + */ +@Component +@AllArgsConstructor +public class EightworkTaskQueryExe { + private final EightworkTaskRepository eightworkTaskRepository; + private final EightworkTaskCoConvertor eightworkTaskCoConvertor; + + /** + * 分页 + * + * @param eightworkTaskPageQry + * @return + */ + public PageResponse execute(EightworkTaskPageQry eightworkTaskPageQry) { + Map params = PageQueryHelper.toHashMap(eightworkTaskPageQry); + PageResponse pageResponse = eightworkTaskRepository.listPage(params); + List examCenterCOS = eightworkTaskCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/query/MeasuresLogsQueryExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/query/MeasuresLogsQueryExe.java new file mode 100644 index 0000000..f52fce5 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/query/MeasuresLogsQueryExe.java @@ -0,0 +1,54 @@ +package com.zcloud.eightwork.command.query; + +import com.alibaba.cola.dto.PageResponse; +import com.zcloud.eightwork.command.convertor.MeasuresLogsCoConvertor; +import com.zcloud.eightwork.dto.MeasuresLogsPageQry; +import com.zcloud.eightwork.dto.clientobject.MeasuresLogsCO; +import com.zcloud.eightwork.persistence.dataobject.MeasuresLogsDO; +import com.zcloud.eightwork.persistence.repository.MeasuresLogsRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + + + +/** +* web-app +* @Author fangjiakai +* @Date 2025-11-11 11:30:49 +*/ +@Component +@AllArgsConstructor +public class MeasuresLogsQueryExe { + private final MeasuresLogsRepository measuresLogsRepository; + private final MeasuresLogsCoConvertor measuresLogsCoConvertor; + + /** + * 根据id查询 + * @param id + * @return + */ + public MeasuresLogsCO queryById(Long id) { + return measuresLogsCoConvertor.converDOToCO(measuresLogsRepository.getById(id)); + } + /** + * 分页 + * + * @param measuresLogsPageQry + * @return + */ + public PageResponse execute(MeasuresLogsPageQry measuresLogsPageQry) { + Map params = PageQueryHelper.toHashMap(measuresLogsPageQry); + PageResponse pageResponse = measuresLogsRepository.listPage(params); + List examCenterCOS = measuresLogsCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + + public List listAll(String workId) { + return measuresLogsCoConvertor.converDOsToCOs(measuresLogsRepository.listAll(workId)); + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/query/MeasuresQueryExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/query/MeasuresQueryExe.java new file mode 100644 index 0000000..2f05503 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/query/MeasuresQueryExe.java @@ -0,0 +1,59 @@ +package com.zcloud.eightwork.command.query; + +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zcloud.eightwork.command.convertor.MeasuresCoConvertor; +import com.zcloud.eightwork.dto.MeasuresPageQry; +import com.zcloud.eightwork.dto.clientobject.MeasuresCO; +import com.zcloud.eightwork.persistence.dataobject.MeasuresDO; +import com.zcloud.eightwork.persistence.repository.MeasuresRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + + + +/** +* web-app +* @Author fangjiakai +* @Date 2025-11-11 11:30:47 +*/ +@Component +@AllArgsConstructor +public class MeasuresQueryExe { + private final MeasuresRepository measuresRepository; + private final MeasuresCoConvertor measuresCoConvertor; + + /** + * 根据id查询 + * @param id + * @return + */ + public MeasuresCO queryById(Long id) { + return measuresCoConvertor.converDOToCO(measuresRepository.getById(id)); + } + /** + * 分页 + * + * @param measuresPageQry + * @return + */ + public PageResponse execute(MeasuresPageQry measuresPageQry) { + Map params = PageQueryHelper.toHashMap(measuresPageQry); + PageResponse pageResponse = measuresRepository.listPage(params); + List examCenterCOS = measuresCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + + public List listAll(MeasuresPageQry qry) { + return measuresCoConvertor.converDOsToCOs(measuresRepository.list( + new LambdaQueryWrapper() + .eq(MeasuresDO::getWorkType, qry.getEqWorkType()) + .orderByAsc(MeasuresDO::getOrderBy) + )); + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/query/TaskFlowQueryExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/query/TaskFlowQueryExe.java new file mode 100644 index 0000000..1a3ecb6 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/query/TaskFlowQueryExe.java @@ -0,0 +1,79 @@ +package com.zcloud.eightwork.command.query; + +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.eightwork.command.convertor.EightworkTaskCoConvertor; +import com.zcloud.eightwork.command.convertor.TaskFlowCoConvertor; +import com.zcloud.eightwork.dto.TaskFlowPageQry; +import com.zcloud.eightwork.dto.TaskFlowQryCmd; +import com.zcloud.eightwork.dto.TaskWorkQryCmd; +import com.zcloud.eightwork.dto.clientobject.TaskFlowCO; +import com.zcloud.eightwork.dto.clientobject.TaskFlowInitCO; +import com.zcloud.eightwork.dto.clientobject.TaskWorkInitCO; +import com.zcloud.eightwork.persistence.dataobject.EightworkTaskDO; +import com.zcloud.eightwork.persistence.dataobject.TaskFlowDO; +import com.zcloud.eightwork.persistence.repository.EightworkTaskRepository; +import com.zcloud.eightwork.persistence.repository.TaskFlowRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:51 + */ +@Component +@AllArgsConstructor +public class TaskFlowQueryExe { + private final TaskFlowRepository taskFlowRepository; + private final TaskFlowCoConvertor taskFlowCoConvertor; + private final EightworkTaskRepository eightworkTaskRepository; + private final EightworkTaskCoConvertor eightworkTaskCoConvertor; + + /** + * 分页 + * + * @param taskFlowPageQry + * @return + */ + public PageResponse execute(TaskFlowPageQry taskFlowPageQry) { + Map params = PageQueryHelper.toHashMap(taskFlowPageQry); + PageResponse pageResponse = taskFlowRepository.listPage(params); + List examCenterCOS = taskFlowCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + + public TaskWorkInitCO getWorkInit(TaskWorkQryCmd qry) { + TaskWorkInitCO taskWorkInitCO = new TaskWorkInitCO(); + taskWorkInitCO.setApplyUser(AuthContext.getCurrentUser().getName()); + taskWorkInitCO.setApplyUnit(AuthContext.getCurrentUser().getTenantName()); + taskWorkInitCO.setTaskWorkLevels(eightworkTaskCoConvertor.converDOsToCOs( + eightworkTaskRepository.list(new LambdaQueryWrapper() + .eq(EightworkTaskDO::getWorkType, qry.getWorkType()) + .orderByAsc(EightworkTaskDO::getWorkLevel)) + )); + return taskWorkInitCO; + } + public TaskFlowInitCO getFlowInit(TaskFlowQryCmd qry) { + List flows = taskFlowRepository.listAllByWorkType(qry.getWorkType(), qry.getWorkLevel()); + TaskFlowInitCO taskFlowInitCO = new TaskFlowInitCO(); + taskFlowInitCO.setSettingSignSteps(taskFlowCoConvertor.converDOsToCOs( + flows.stream() + .filter(flow -> flow.getSelectSignStep() != null && 1 == flow.getSelectSignStep()) + .collect(Collectors.toList()) + )); + + return taskFlowInitCO; + } + + +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/query/TaskLogQueryExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/query/TaskLogQueryExe.java new file mode 100644 index 0000000..3788474 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/command/query/TaskLogQueryExe.java @@ -0,0 +1,102 @@ +package com.zcloud.eightwork.command.query; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zcloud.eightwork.command.convertor.EightworkInfoCoConvertor; +import com.zcloud.eightwork.command.convertor.TaskLogCoConvertor; +import com.zcloud.eightwork.domain.model.TodoCountE; +import com.zcloud.eightwork.dto.TaskLogPageQry; +import com.zcloud.eightwork.dto.clientobject.EightworkInfoCO; +import com.zcloud.eightwork.dto.clientobject.TaskLogCO; +import com.zcloud.eightwork.dto.clientobject.TodoCountCO; +import com.zcloud.eightwork.persistence.dataobject.EightworkInfoDO; +import com.zcloud.eightwork.persistence.dataobject.TaskLogDO; +import com.zcloud.eightwork.persistence.repository.EightworkInfoRepository; +import com.zcloud.eightwork.persistence.repository.TaskLogRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.alibaba.cola.dto.PageResponse; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:53 + */ +@Component +@AllArgsConstructor +public class TaskLogQueryExe { + private final TaskLogRepository taskLogRepository; + private final TaskLogCoConvertor taskLogCoConvertor; + private final EightworkInfoRepository eightworkInfoRepository; + private final EightworkInfoCoConvertor eightworkInfoCoConvertor; + + /** + * 分页 + * + * @param taskLogPageQry + * @return + */ + public PageResponse execute(TaskLogPageQry taskLogPageQry, Long departmentId, Long userId) { + Map params = PageQueryHelper.toHashMap(taskLogPageQry); + params.put("departmentId", departmentId); + params.put("userId", userId); + PageResponse pageResponse = taskLogRepository.listPage(params); + List examCenterCOS = taskLogCoConvertor.converDOsToCOs(pageResponse.getData()); + + if(!CollectionUtils.isEmpty(examCenterCOS)){ + List workIds = examCenterCOS.stream().map(TaskLogCO::getWorkId).collect(Collectors.toList()); + List workInfos = eightworkInfoCoConvertor.converDOsToCOs(eightworkInfoRepository.listAllByWorkIds(workIds)); + examCenterCOS.forEach(item -> { + item.setWorkInfo(workInfos.stream().filter(workInfo -> workInfo.getWorkId().equals(item.getWorkId())).findFirst().orElse(null)); + }); + } + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + + public TaskLogCO getInfoById(Long id) { + TaskLogDO taskLogDO = taskLogRepository.getById(id); + TaskLogCO taskLogCO = taskLogCoConvertor.converDOToCO(taskLogDO); + List settingSignSteps = taskLogRepository.list(new LambdaQueryWrapper() + .eq(TaskLogDO::getWorkId, taskLogDO.getWorkId()) + .eq(TaskLogDO::getSelectSignStep,taskLogDO.getStepId()) + .orderByAsc(TaskLogDO::getStepOrder)); + if(!CollectionUtils.isEmpty(settingSignSteps)){ + taskLogCO.setSettingSignSteps(taskLogCoConvertor.converDOsToCOs(settingSignSteps)); + } + taskLogCO.setWorkInfo(eightworkInfoCoConvertor.converDOToCO(eightworkInfoRepository.getOne( + new LambdaQueryWrapper().eq(EightworkInfoDO::getWorkId, taskLogDO.getWorkId()) + ))); + return taskLogCO; + } + + public List listAll(String workId) { + return taskLogCoConvertor.converDOsToCOs(taskLogRepository.listAllByWorkId(workId)); + } + + public List getTodoCount(Long orgId, Long userId) { + List todoCountE = taskLogRepository.getTodoCount(orgId, userId); + return todoCountE.stream().map(item -> { + TodoCountCO todoCountCO = new TodoCountCO(); + BeanUtils.copyProperties(item, todoCountCO); + return todoCountCO; + }).collect(Collectors.toList()); + } + + public List getTodoCountForWork(Long orgId, Long userId, String workType) { + List todoCountE = taskLogRepository.getTodoCountForWork(orgId, userId, workType); + return todoCountE.stream().map(item -> { + TodoCountCO todoCountCO = new TodoCountCO(); + BeanUtils.copyProperties(item, todoCountCO); + return todoCountCO; + }).collect(Collectors.toList()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/service/ConfinedSpaceServiceImpl.java b/web-app/src/main/java/com/zcloud/eightwork/service/ConfinedSpaceServiceImpl.java new file mode 100644 index 0000000..1245c98 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/service/ConfinedSpaceServiceImpl.java @@ -0,0 +1,71 @@ +package com.zcloud.eightwork.service; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.eightwork.api.ConfinedSpaceServiceI; +import com.zcloud.eightwork.command.ConfinedSpaceAddExe; +import com.zcloud.eightwork.command.ConfinedSpaceRemoveExe; +import com.zcloud.eightwork.command.ConfinedSpaceUpdateExe; +import com.zcloud.eightwork.command.query.ConfinedSpaceQueryExe; +import com.zcloud.eightwork.dto.ConfinedSpaceAddCmd; +import com.zcloud.eightwork.dto.ConfinedSpacePageQry; +import com.zcloud.eightwork.dto.ConfinedSpaceUpdateCmd; +import com.zcloud.eightwork.dto.clientobject.ConfinedSpaceCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-27 10:26:34 + */ +@Service +@AllArgsConstructor +public class ConfinedSpaceServiceImpl implements ConfinedSpaceServiceI { + private final ConfinedSpaceAddExe confinedSpaceAddExe; + private final ConfinedSpaceUpdateExe confinedSpaceUpdateExe; + private final ConfinedSpaceRemoveExe confinedSpaceRemoveExe; + private final ConfinedSpaceQueryExe confinedSpaceQueryExe; + + @Override + public ConfinedSpaceCO queryById(Long id) { + return confinedSpaceQueryExe.queryById(id); + } + + @Override + public PageResponse listPage(ConfinedSpacePageQry qry) { + + return confinedSpaceQueryExe.execute(qry); + } + + @Override + public SingleResponse add(ConfinedSpaceAddCmd cmd) { + + confinedSpaceAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(ConfinedSpaceUpdateCmd confinedSpaceUpdateCmd) { + confinedSpaceUpdateExe.execute(confinedSpaceUpdateCmd); + } + + @Override + public void remove(Long id) { + confinedSpaceRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + confinedSpaceRemoveExe.execute(ids); + } + + @Override + public List listAll(ConfinedSpacePageQry qry){ + return confinedSpaceQueryExe.listAll(qry); + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/service/EightworkInfoServiceImpl.java b/web-app/src/main/java/com/zcloud/eightwork/service/EightworkInfoServiceImpl.java new file mode 100644 index 0000000..bc1f9e2 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/service/EightworkInfoServiceImpl.java @@ -0,0 +1,64 @@ +package com.zcloud.eightwork.service; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.eightwork.api.EightworkInfoServiceI; +import com.zcloud.eightwork.command.EightworkInfoAddExe; +import com.zcloud.eightwork.command.EightworkInfoRemoveExe; +import com.zcloud.eightwork.command.EightworkInfoUpdateExe; +import com.zcloud.eightwork.command.query.EightworkInfoQueryExe; +import com.zcloud.eightwork.dto.EightworkInfoAddCmd; +import com.zcloud.eightwork.dto.EightworkInfoPageQry; +import com.zcloud.eightwork.dto.EightworkInfoUpdateCmd; +import com.zcloud.eightwork.dto.clientobject.EightworkInfoCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-12 10:58:53 + */ +@Service +@AllArgsConstructor +public class EightworkInfoServiceImpl implements EightworkInfoServiceI { + private final EightworkInfoAddExe eightworkInfoAddExe; + private final EightworkInfoUpdateExe eightworkInfoUpdateExe; + private final EightworkInfoRemoveExe eightworkInfoRemoveExe; + private final EightworkInfoQueryExe eightworkInfoQueryExe; + + @Override + public EightworkInfoCO queryById(Long id) { + return eightworkInfoQueryExe.queryById(id); + } + + @Override + public PageResponse listPage(EightworkInfoPageQry qry) { + + return eightworkInfoQueryExe.execute(qry); + } + + @Override + public SingleResponse add(EightworkInfoAddCmd cmd) { + + eightworkInfoAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(EightworkInfoUpdateCmd eightworkInfoUpdateCmd) { + eightworkInfoUpdateExe.execute(eightworkInfoUpdateCmd); + } + + @Override + public void remove(Long id) { + eightworkInfoRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + eightworkInfoRemoveExe.execute(ids); + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/service/EightworkStepServiceImpl.java b/web-app/src/main/java/com/zcloud/eightwork/service/EightworkStepServiceImpl.java new file mode 100644 index 0000000..461b404 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/service/EightworkStepServiceImpl.java @@ -0,0 +1,60 @@ +package com.zcloud.eightwork.service; + +import com.zcloud.eightwork.api.EightworkStepServiceI; +import com.zcloud.eightwork.command.EightworkStepAddExe; +import com.zcloud.eightwork.command.EightworkStepRemoveExe; +import com.zcloud.eightwork.command.EightworkStepUpdateExe; +import com.zcloud.eightwork.command.query.EightworkStepQueryExe; +import com.zcloud.eightwork.dto.EightworkStepAddCmd; +import com.zcloud.eightwork.dto.EightworkStepPageQry; +import com.zcloud.eightwork.dto.EightworkStepUpdateCmd; +import com.zcloud.eightwork.dto.clientobject.EightworkStepCO; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:30 + */ +@Service +@AllArgsConstructor +public class EightworkStepServiceImpl implements EightworkStepServiceI { + private final EightworkStepAddExe eightworkStepAddExe; + private final EightworkStepUpdateExe eightworkStepUpdateExe; + private final EightworkStepRemoveExe eightworkStepRemoveExe; + private final EightworkStepQueryExe eightworkStepQueryExe; + + @Override + public PageResponse listPage(EightworkStepPageQry qry) { + + return eightworkStepQueryExe.execute(qry); + } + + @Override + public SingleResponse add(EightworkStepAddCmd cmd) { + + eightworkStepAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(EightworkStepUpdateCmd eightworkStepUpdateCmd) { + eightworkStepUpdateExe.execute(eightworkStepUpdateCmd); + } + + @Override + public void remove(Long id) { + eightworkStepRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + eightworkStepRemoveExe.execute(ids); + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/service/EightworkSupplementaryInfoServiceImpl.java b/web-app/src/main/java/com/zcloud/eightwork/service/EightworkSupplementaryInfoServiceImpl.java new file mode 100644 index 0000000..21e3a67 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/service/EightworkSupplementaryInfoServiceImpl.java @@ -0,0 +1,71 @@ +package com.zcloud.eightwork.service; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.eightwork.api.EightworkSupplementaryInfoServiceI; +import com.zcloud.eightwork.command.EightworkSupplementaryInfoAddExe; +import com.zcloud.eightwork.command.EightworkSupplementaryInfoRemoveExe; +import com.zcloud.eightwork.command.EightworkSupplementaryInfoUpdateExe; +import com.zcloud.eightwork.command.query.EightworkSupplementaryInfoQueryExe; +import com.zcloud.eightwork.dto.EightworkSupplementaryInfoAddCmd; +import com.zcloud.eightwork.dto.EightworkSupplementaryInfoPageQry; +import com.zcloud.eightwork.dto.EightworkSupplementaryInfoUpdateCmd; +import com.zcloud.eightwork.dto.clientobject.EightworkSupplementaryInfoCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-20 10:38:37 + */ +@Service +@AllArgsConstructor +public class EightworkSupplementaryInfoServiceImpl implements EightworkSupplementaryInfoServiceI { + private final EightworkSupplementaryInfoAddExe eightworkSupplementaryInfoAddExe; + private final EightworkSupplementaryInfoUpdateExe eightworkSupplementaryInfoUpdateExe; + private final EightworkSupplementaryInfoRemoveExe eightworkSupplementaryInfoRemoveExe; + private final EightworkSupplementaryInfoQueryExe eightworkSupplementaryInfoQueryExe; + + @Override + public EightworkSupplementaryInfoCO queryById(Long id) { + return eightworkSupplementaryInfoQueryExe.queryById(id); + } + + @Override + public PageResponse listPage(EightworkSupplementaryInfoPageQry qry) { + + return eightworkSupplementaryInfoQueryExe.execute(qry); + } + + @Override + public SingleResponse add(EightworkSupplementaryInfoAddCmd cmd) { + + eightworkSupplementaryInfoAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(EightworkSupplementaryInfoUpdateCmd eightworkSupplementaryInfoUpdateCmd) { + eightworkSupplementaryInfoUpdateExe.execute(eightworkSupplementaryInfoUpdateCmd); + } + + @Override + public void remove(Long id) { + eightworkSupplementaryInfoRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + eightworkSupplementaryInfoRemoveExe.execute(ids); + } + + @Override + public List listAll(String workId){ + return eightworkSupplementaryInfoQueryExe.listAll(workId); + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/service/EightworkTaskServiceImpl.java b/web-app/src/main/java/com/zcloud/eightwork/service/EightworkTaskServiceImpl.java new file mode 100644 index 0000000..2badda4 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/service/EightworkTaskServiceImpl.java @@ -0,0 +1,60 @@ +package com.zcloud.eightwork.service; + +import com.zcloud.eightwork.api.EightworkTaskServiceI; +import com.zcloud.eightwork.command.EightworkTaskAddExe; +import com.zcloud.eightwork.command.EightworkTaskRemoveExe; +import com.zcloud.eightwork.command.EightworkTaskUpdateExe; +import com.zcloud.eightwork.command.query.EightworkTaskQueryExe; +import com.zcloud.eightwork.dto.EightworkTaskAddCmd; +import com.zcloud.eightwork.dto.EightworkTaskPageQry; +import com.zcloud.eightwork.dto.EightworkTaskUpdateCmd; +import com.zcloud.eightwork.dto.clientobject.EightworkTaskCO; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:39 + */ +@Service +@AllArgsConstructor +public class EightworkTaskServiceImpl implements EightworkTaskServiceI { + private final EightworkTaskAddExe eightworkTaskAddExe; + private final EightworkTaskUpdateExe eightworkTaskUpdateExe; + private final EightworkTaskRemoveExe eightworkTaskRemoveExe; + private final EightworkTaskQueryExe eightworkTaskQueryExe; + + @Override + public PageResponse listPage(EightworkTaskPageQry qry) { + + return eightworkTaskQueryExe.execute(qry); + } + + @Override + public SingleResponse add(EightworkTaskAddCmd cmd) { + + eightworkTaskAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(EightworkTaskUpdateCmd eightworkTaskUpdateCmd) { + eightworkTaskUpdateExe.execute(eightworkTaskUpdateCmd); + } + + @Override + public void remove(Long id) { + eightworkTaskRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + eightworkTaskRemoveExe.execute(ids); + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/service/MeasuresLogsServiceImpl.java b/web-app/src/main/java/com/zcloud/eightwork/service/MeasuresLogsServiceImpl.java new file mode 100644 index 0000000..6e1251e --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/service/MeasuresLogsServiceImpl.java @@ -0,0 +1,70 @@ +package com.zcloud.eightwork.service; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.eightwork.api.MeasuresLogsServiceI; +import com.zcloud.eightwork.command.MeasuresLogsAddExe; +import com.zcloud.eightwork.command.MeasuresLogsRemoveExe; +import com.zcloud.eightwork.command.MeasuresLogsUpdateExe; +import com.zcloud.eightwork.command.query.MeasuresLogsQueryExe; +import com.zcloud.eightwork.dto.MeasuresLogsAddCmd; +import com.zcloud.eightwork.dto.MeasuresLogsPageQry; +import com.zcloud.eightwork.dto.MeasuresLogsUpdateCmd; +import com.zcloud.eightwork.dto.clientobject.MeasuresLogsCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** +* web-app +* @Author fangjiakai +* @Date 2025-11-11 11:30:49 +*/ +@Service +@AllArgsConstructor +public class MeasuresLogsServiceImpl implements MeasuresLogsServiceI { + private final MeasuresLogsAddExe measuresLogsAddExe; + private final MeasuresLogsUpdateExe measuresLogsUpdateExe; + private final MeasuresLogsRemoveExe measuresLogsRemoveExe; + private final MeasuresLogsQueryExe measuresLogsQueryExe; + + @Override + public MeasuresLogsCO queryById(Long id){ + return measuresLogsQueryExe.queryById(id); + } + + @Override + public PageResponse listPage(MeasuresLogsPageQry qry){ + + return measuresLogsQueryExe.execute(qry); + } + + @Override + public SingleResponse add(MeasuresLogsAddCmd cmd) { + + measuresLogsAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(MeasuresLogsUpdateCmd measuresLogsUpdateCmd) { + measuresLogsUpdateExe.execute(measuresLogsUpdateCmd); + } + + @Override + public void remove(Long id) { + measuresLogsRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + measuresLogsRemoveExe.execute(ids); + } + + @Override + public List listAll(String workId){ + return measuresLogsQueryExe.listAll(workId); + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/service/MeasuresServiceImpl.java b/web-app/src/main/java/com/zcloud/eightwork/service/MeasuresServiceImpl.java new file mode 100644 index 0000000..0413d73 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/service/MeasuresServiceImpl.java @@ -0,0 +1,70 @@ +package com.zcloud.eightwork.service; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.eightwork.api.MeasuresServiceI; +import com.zcloud.eightwork.command.MeasuresAddExe; +import com.zcloud.eightwork.command.MeasuresRemoveExe; +import com.zcloud.eightwork.command.MeasuresUpdateExe; +import com.zcloud.eightwork.command.query.MeasuresQueryExe; +import com.zcloud.eightwork.dto.MeasuresAddCmd; +import com.zcloud.eightwork.dto.MeasuresPageQry; +import com.zcloud.eightwork.dto.MeasuresUpdateCmd; +import com.zcloud.eightwork.dto.clientobject.MeasuresCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** +* web-app +* @Author fangjiakai +* @Date 2025-11-11 11:30:48 +*/ +@Service +@AllArgsConstructor +public class MeasuresServiceImpl implements MeasuresServiceI { + private final MeasuresAddExe measuresAddExe; + private final MeasuresUpdateExe measuresUpdateExe; + private final MeasuresRemoveExe measuresRemoveExe; + private final MeasuresQueryExe measuresQueryExe; + + @Override + public MeasuresCO queryById(Long id){ + return measuresQueryExe.queryById(id); + } + + @Override + public PageResponse listPage(MeasuresPageQry qry){ + + return measuresQueryExe.execute(qry); + } + + @Override + public SingleResponse add(MeasuresAddCmd cmd) { + + measuresAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(MeasuresUpdateCmd measuresUpdateCmd) { + measuresUpdateExe.execute(measuresUpdateCmd); + } + + @Override + public void remove(Long id) { + measuresRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + measuresRemoveExe.execute(ids); + } + + @Override + public List listAll(MeasuresPageQry qry){ + return measuresQueryExe.listAll(qry); + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/service/TaskFlowServiceImpl.java b/web-app/src/main/java/com/zcloud/eightwork/service/TaskFlowServiceImpl.java new file mode 100644 index 0000000..8702978 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/service/TaskFlowServiceImpl.java @@ -0,0 +1,69 @@ +package com.zcloud.eightwork.service; + +import com.zcloud.eightwork.api.TaskFlowServiceI; +import com.zcloud.eightwork.command.TaskFlowAddExe; +import com.zcloud.eightwork.command.TaskFlowRemoveExe; +import com.zcloud.eightwork.command.TaskFlowUpdateExe; +import com.zcloud.eightwork.command.query.TaskFlowQueryExe; +import com.zcloud.eightwork.dto.*; +import com.zcloud.eightwork.dto.clientobject.TaskFlowCO; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.eightwork.dto.clientobject.TaskFlowInitCO; +import com.zcloud.eightwork.dto.clientobject.TaskWorkInitCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:51 + */ +@Service +@AllArgsConstructor +public class TaskFlowServiceImpl implements TaskFlowServiceI { + private final TaskFlowAddExe taskFlowAddExe; + private final TaskFlowUpdateExe taskFlowUpdateExe; + private final TaskFlowRemoveExe taskFlowRemoveExe; + private final TaskFlowQueryExe taskFlowQueryExe; + + @Override + public PageResponse listPage(TaskFlowPageQry qry) { + + return taskFlowQueryExe.execute(qry); + } + + @Override + public SingleResponse add(TaskFlowAddCmd cmd) { + + taskFlowAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(TaskFlowUpdateCmd taskFlowUpdateCmd) { + taskFlowUpdateExe.execute(taskFlowUpdateCmd); + } + + @Override + public void remove(Long id) { + taskFlowRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + taskFlowRemoveExe.execute(ids); + } + + @Override + public TaskWorkInitCO getWorkInit(TaskWorkQryCmd qry){ + return taskFlowQueryExe.getWorkInit(qry); + } + @Override + public TaskFlowInitCO getFlowInit(TaskFlowQryCmd qry){ + return taskFlowQueryExe.getFlowInit(qry); + } +} + diff --git a/web-app/src/main/java/com/zcloud/eightwork/service/TaskLogServiceImpl.java b/web-app/src/main/java/com/zcloud/eightwork/service/TaskLogServiceImpl.java new file mode 100644 index 0000000..c859a71 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/eightwork/service/TaskLogServiceImpl.java @@ -0,0 +1,98 @@ +package com.zcloud.eightwork.service; + +import com.zcloud.eightwork.api.TaskLogServiceI; +import com.zcloud.eightwork.command.TaskLogAddExe; +import com.zcloud.eightwork.command.TaskLogRemoveExe; +import com.zcloud.eightwork.command.TaskLogUpdateExe; +import com.zcloud.eightwork.command.query.TaskLogQueryExe; +import com.zcloud.eightwork.dto.TaskLogAddCmd; +import com.zcloud.eightwork.dto.TaskLogNextCmd; +import com.zcloud.eightwork.dto.TaskLogPageQry; +import com.zcloud.eightwork.dto.TaskLogUpdateCmd; +import com.zcloud.eightwork.dto.clientobject.TaskLogCO; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.eightwork.dto.clientobject.TodoCountCO; +import com.zcloud.eightwork.persistence.dataobject.TaskLogDO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * web-app + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:54 + */ +@Service +@AllArgsConstructor +public class TaskLogServiceImpl implements TaskLogServiceI { + private final TaskLogAddExe taskLogAddExe; + private final TaskLogUpdateExe taskLogUpdateExe; + private final TaskLogRemoveExe taskLogRemoveExe; + private final TaskLogQueryExe taskLogQueryExe; + + @Override + public SingleResponse getInfoById(Long id) { + return SingleResponse.of(taskLogQueryExe.getInfoById(id)); + } + @Override + public PageResponse listPage(TaskLogPageQry qry, Long departmentId, Long userId) { + + return taskLogQueryExe.execute(qry, departmentId, userId); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public SingleResponse add(TaskLogAddCmd cmd) { + + List taskLogDOs =taskLogAddExe.execute(cmd); + TaskLogDO commitTaskLogDO = taskLogDOs.get(0); + TaskLogNextCmd taskLogNextCmd = new TaskLogNextCmd(commitTaskLogDO.getId(), + commitTaskLogDO.getWorkId(), + commitTaskLogDO.getStepId(), + 1,null,null,null,null); + + taskLogUpdateExe.nextStep(taskLogNextCmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(TaskLogUpdateCmd taskLogUpdateCmd) { + taskLogUpdateExe.execute(taskLogUpdateCmd); + } + + @Override + public void remove(Long id) { + taskLogRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + taskLogRemoveExe.execute(ids); + } + + @Override + public void nextStep(TaskLogNextCmd cmd){ + taskLogUpdateExe.nextStep(cmd); + } + + @Override + public List listAll(String workId){ + return taskLogQueryExe.listAll(workId); + } + + @Override + public List getTodoCount(Long orgId, Long userId){ + return taskLogQueryExe.getTodoCount(orgId, userId); + } + + @Override + public List getTodoCountForWork(Long orgId, Long userId, String workType){ + return taskLogQueryExe.getTodoCountForWork(orgId, userId, workType); + } +} + diff --git a/web-client/pom.xml b/web-client/pom.xml new file mode 100644 index 0000000..1ed8a3d --- /dev/null +++ b/web-client/pom.xml @@ -0,0 +1,50 @@ + + + 4.0.0 + + com.zcloud.eightwork + zcloud-gbs-eightwork + 1.0-SNAPSHOT + ../pom.xml + + + web-client + jar + web-client + + + + com.zcloud.eightwork + web-domain + + + + com.jjb.saas + jjb-saas-application-client + + + com.jjb.saas + jjb-saas-system-client + + + com.jjb.saas + jjb-saas-framework-enums + + + com.jjb.saas + jjb-saas-open-platform-sdk + + + com.jjb.saas + jjb-saas-framework-client + + + io.swagger + swagger-annotations + + + javax.validation + validation-api + + + diff --git a/web-client/src/main/java/com/zcloud/eightwork/api/ConfinedSpaceServiceI.java b/web-client/src/main/java/com/zcloud/eightwork/api/ConfinedSpaceServiceI.java new file mode 100644 index 0000000..fc68e5a --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/api/ConfinedSpaceServiceI.java @@ -0,0 +1,33 @@ +package com.zcloud.eightwork.api; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.eightwork.dto.ConfinedSpaceAddCmd; +import com.zcloud.eightwork.dto.ConfinedSpacePageQry; +import com.zcloud.eightwork.dto.ConfinedSpaceUpdateCmd; +import com.zcloud.eightwork.dto.clientobject.ConfinedSpaceCO; + +import java.util.List; + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-27 10:26:34 + */ +public interface ConfinedSpaceServiceI { + ConfinedSpaceCO queryById(Long id); + + PageResponse listPage(ConfinedSpacePageQry qry); + + SingleResponse add(ConfinedSpaceAddCmd cmd); + + void edit(ConfinedSpaceUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); + + List listAll(ConfinedSpacePageQry qry); +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/api/EightworkInfoServiceI.java b/web-client/src/main/java/com/zcloud/eightwork/api/EightworkInfoServiceI.java new file mode 100644 index 0000000..c97c278 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/api/EightworkInfoServiceI.java @@ -0,0 +1,29 @@ +package com.zcloud.eightwork.api; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.eightwork.dto.EightworkInfoAddCmd; +import com.zcloud.eightwork.dto.EightworkInfoPageQry; +import com.zcloud.eightwork.dto.EightworkInfoUpdateCmd; +import com.zcloud.eightwork.dto.clientobject.EightworkInfoCO; + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-12 10:58:53 + */ +public interface EightworkInfoServiceI { + EightworkInfoCO queryById(Long id); + + PageResponse listPage(EightworkInfoPageQry qry); + + SingleResponse add(EightworkInfoAddCmd cmd); + + void edit(EightworkInfoUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/api/EightworkStepServiceI.java b/web-client/src/main/java/com/zcloud/eightwork/api/EightworkStepServiceI.java new file mode 100644 index 0000000..3cd0e78 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/api/EightworkStepServiceI.java @@ -0,0 +1,28 @@ +package com.zcloud.eightwork.api; + +import com.zcloud.eightwork.dto.EightworkStepAddCmd; +import com.zcloud.eightwork.dto.EightworkStepPageQry; +import com.zcloud.eightwork.dto.EightworkStepUpdateCmd; +import com.zcloud.eightwork.dto.clientobject.EightworkStepCO; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:30 + */ +public interface EightworkStepServiceI { + PageResponse listPage(EightworkStepPageQry qry); + + SingleResponse add(EightworkStepAddCmd cmd); + + void edit(EightworkStepUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/api/EightworkSupplementaryInfoServiceI.java b/web-client/src/main/java/com/zcloud/eightwork/api/EightworkSupplementaryInfoServiceI.java new file mode 100644 index 0000000..f2013d2 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/api/EightworkSupplementaryInfoServiceI.java @@ -0,0 +1,33 @@ +package com.zcloud.eightwork.api; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.eightwork.dto.EightworkSupplementaryInfoAddCmd; +import com.zcloud.eightwork.dto.EightworkSupplementaryInfoPageQry; +import com.zcloud.eightwork.dto.EightworkSupplementaryInfoUpdateCmd; +import com.zcloud.eightwork.dto.clientobject.EightworkSupplementaryInfoCO; + +import java.util.List; + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-20 10:38:37 + */ +public interface EightworkSupplementaryInfoServiceI { + EightworkSupplementaryInfoCO queryById(Long id); + + PageResponse listPage(EightworkSupplementaryInfoPageQry qry); + + SingleResponse add(EightworkSupplementaryInfoAddCmd cmd); + + void edit(EightworkSupplementaryInfoUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); + + List listAll(String workId); +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/api/EightworkTaskServiceI.java b/web-client/src/main/java/com/zcloud/eightwork/api/EightworkTaskServiceI.java new file mode 100644 index 0000000..6890960 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/api/EightworkTaskServiceI.java @@ -0,0 +1,28 @@ +package com.zcloud.eightwork.api; + +import com.zcloud.eightwork.dto.EightworkTaskAddCmd; +import com.zcloud.eightwork.dto.EightworkTaskPageQry; +import com.zcloud.eightwork.dto.EightworkTaskUpdateCmd; +import com.zcloud.eightwork.dto.clientobject.EightworkTaskCO; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:38 + */ +public interface EightworkTaskServiceI { + PageResponse listPage(EightworkTaskPageQry qry); + + SingleResponse add(EightworkTaskAddCmd cmd); + + void edit(EightworkTaskUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/api/MeasuresLogsServiceI.java b/web-client/src/main/java/com/zcloud/eightwork/api/MeasuresLogsServiceI.java new file mode 100644 index 0000000..fd31020 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/api/MeasuresLogsServiceI.java @@ -0,0 +1,33 @@ +package com.zcloud.eightwork.api; + +import com.zcloud.eightwork.dto.MeasuresLogsAddCmd; +import com.zcloud.eightwork.dto.MeasuresLogsPageQry; +import com.zcloud.eightwork.dto.MeasuresLogsUpdateCmd; +import com.zcloud.eightwork.dto.clientobject.MeasuresLogsCO; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; + +import java.util.List; + +/** +* web-client +* @Author fangjiakai +* @Date 2025-11-11 11:30:49 +*/ +public interface MeasuresLogsServiceI { + MeasuresLogsCO queryById(Long id); + + PageResponse listPage(MeasuresLogsPageQry qry); + + SingleResponse add(MeasuresLogsAddCmd cmd); + + void edit(MeasuresLogsUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); + + List listAll(String workId); +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/api/MeasuresServiceI.java b/web-client/src/main/java/com/zcloud/eightwork/api/MeasuresServiceI.java new file mode 100644 index 0000000..87cc0e8 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/api/MeasuresServiceI.java @@ -0,0 +1,33 @@ +package com.zcloud.eightwork.api; + +import com.zcloud.eightwork.dto.MeasuresAddCmd; +import com.zcloud.eightwork.dto.MeasuresPageQry; +import com.zcloud.eightwork.dto.MeasuresUpdateCmd; +import com.zcloud.eightwork.dto.clientobject.MeasuresCO; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; + +import java.util.List; + +/** +* web-client +* @Author fangjiakai +* @Date 2025-11-11 11:30:48 +*/ +public interface MeasuresServiceI { + MeasuresCO queryById(Long id); + + PageResponse listPage(MeasuresPageQry qry); + + SingleResponse add(MeasuresAddCmd cmd); + + void edit(MeasuresUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); + + List listAll(MeasuresPageQry qry); +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/api/TaskFlowServiceI.java b/web-client/src/main/java/com/zcloud/eightwork/api/TaskFlowServiceI.java new file mode 100644 index 0000000..97dd24c --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/api/TaskFlowServiceI.java @@ -0,0 +1,34 @@ +package com.zcloud.eightwork.api; + +import com.zcloud.eightwork.dto.*; +import com.zcloud.eightwork.dto.clientobject.TaskFlowCO; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.eightwork.dto.clientobject.TaskFlowInitCO; +import com.zcloud.eightwork.dto.clientobject.TaskWorkInitCO; + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:51 + */ +public interface TaskFlowServiceI { + PageResponse listPage(TaskFlowPageQry qry); + + SingleResponse add(TaskFlowAddCmd cmd); + + void edit(TaskFlowUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); + + TaskWorkInitCO getWorkInit(TaskWorkQryCmd qry); + + + TaskFlowInitCO getFlowInit(TaskFlowQryCmd qry); + +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/api/TaskLogServiceI.java b/web-client/src/main/java/com/zcloud/eightwork/api/TaskLogServiceI.java new file mode 100644 index 0000000..62f9846 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/api/TaskLogServiceI.java @@ -0,0 +1,41 @@ +package com.zcloud.eightwork.api; + +import com.zcloud.eightwork.dto.TaskLogAddCmd; +import com.zcloud.eightwork.dto.TaskLogNextCmd; +import com.zcloud.eightwork.dto.TaskLogPageQry; +import com.zcloud.eightwork.dto.TaskLogUpdateCmd; +import com.zcloud.eightwork.dto.clientobject.TaskLogCO; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.eightwork.dto.clientobject.TodoCountCO; + +import java.util.List; + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:53 + */ +public interface TaskLogServiceI { + SingleResponse getInfoById(Long id); + PageResponse listPage(TaskLogPageQry qry, Long departmentId, Long userId); + + SingleResponse add(TaskLogAddCmd cmd); + + void edit(TaskLogUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); + + void nextStep(TaskLogNextCmd cmd); + + List listAll(String workId); + + List getTodoCount(Long orgId, Long userId); + + List getTodoCountForWork(Long orgId, Long userId, String workType); +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/ConfinedSpaceAddCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/ConfinedSpaceAddCmd.java new file mode 100644 index 0000000..f5e046c --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/ConfinedSpaceAddCmd.java @@ -0,0 +1,83 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-27 10:26:33 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ConfinedSpaceAddCmd extends Command { + @ApiModelProperty(value = "企业", name = "corpinfoId", required = true) + private Long corpinfoId; + + @ApiModelProperty(value = "空间名称", name = "name", required = true) + @NotEmpty(message = "空间名称不能为空") + private String name; + + @ApiModelProperty(value = "唯一编号", name = "code", required = true) + @NotEmpty(message = "唯一编号不能为空") + private String code; + + @ApiModelProperty(value = "空间类型", name = "type", required = true) + @NotEmpty(message = "空间类型不能为空") + private String type; + + @ApiModelProperty(value = "空间类型名称", name = "typeName", required = true) + @NotEmpty(message = "空间类型名称不能为空") + private String typeName; + + @ApiModelProperty(value = "主要介质", name = "medium", required = true) + @NotEmpty(message = "主要介质不能为空") + private String medium; + + @ApiModelProperty(value = "危险因素", name = "hazards", required = true) + @NotEmpty(message = "危险因素不能为空") + private String hazards; + + @ApiModelProperty(value = "风险等级", name = "riskLevel", required = true) + @NotEmpty(message = "风险等级不能为空") + private String riskLevel; + + @ApiModelProperty(value = "风险等级名称", name = "riskLevelName", required = true) + @NotEmpty(message = "风险等级名称不能为空") + private String riskLevelName; + + @ApiModelProperty(value = "防护要求", name = "protectionRequirements", required = true) + @NotEmpty(message = "防护要求不能为空") + private String protectionRequirements; + + @ApiModelProperty(value = "隔绝安全措施", name = "separateSafetyMeasures", required = true) + @NotEmpty(message = "隔绝安全措施不能为空") + private String separateSafetyMeasures; + + @ApiModelProperty(value = "最大作业人数", name = "maximumNumber", required = true) + @NotNull(message = "最大作业人数不能为空") + private Integer maximumNumber; + + @ApiModelProperty(value = "是否有应急指导书，0否1是", name = "isEmergencyBook", required = true) + @NotNull(message = "是否有应急指导书，0否1是不能为空") + private Integer isEmergencyBook; + + @ApiModelProperty(value = "位置及范围", name = "position", required = true) + @NotEmpty(message = "位置及范围不能为空") + private String position; + + @ApiModelProperty(value = "所属部门", name = "departmentId", required = true) + private Long departmentId; + +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/ConfinedSpacePageQry.java b/web-client/src/main/java/com/zcloud/eightwork/dto/ConfinedSpacePageQry.java new file mode 100644 index 0000000..5dd4ba7 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/ConfinedSpacePageQry.java @@ -0,0 +1,32 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.PageQuery; +import lombok.Data; + + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-27 10:26:34 + */ +@Data +public class ConfinedSpacePageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private Long eqCorpinfoId; + private String likeName; + private String likeCode; + private String eqType; + private String eqRiskLevel; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/ConfinedSpaceUpdateCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/ConfinedSpaceUpdateCmd.java new file mode 100644 index 0000000..1d2f501 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/ConfinedSpaceUpdateCmd.java @@ -0,0 +1,76 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-27 10:26:34 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ConfinedSpaceUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "企业", name = "corpinfoId", required = true) + @NotNull(message = "企业不能为空") + private Long corpinfoId; + @ApiModelProperty(value = "空间名称", name = "name", required = true) + @NotEmpty(message = "空间名称不能为空") + private String name; + @ApiModelProperty(value = "唯一编号", name = "code", required = true) + @NotEmpty(message = "唯一编号不能为空") + private String code; + @ApiModelProperty(value = "业务主键id", name = "confinedSpaceId", required = true) + @NotEmpty(message = "业务主键id不能为空") + private String confinedSpaceId; + @ApiModelProperty(value = "空间类型", name = "type", required = true) + @NotEmpty(message = "空间类型不能为空") + private String type; + @ApiModelProperty(value = "空间类型名称", name = "typeName", required = true) + @NotEmpty(message = "空间类型名称不能为空") + private String typeName; + @ApiModelProperty(value = "主要介质", name = "medium", required = true) + @NotEmpty(message = "主要介质不能为空") + private String medium; + @ApiModelProperty(value = "危险因素", name = "hazards", required = true) + @NotEmpty(message = "危险因素不能为空") + private String hazards; + @ApiModelProperty(value = "风险等级", name = "riskLevel", required = true) + @NotEmpty(message = "风险等级不能为空") + private String riskLevel; + @ApiModelProperty(value = "风险等级名称", name = "riskLevelName", required = true) + @NotEmpty(message = "风险等级名称不能为空") + private String riskLevelName; + @ApiModelProperty(value = "防护要求", name = "protectionRequirements", required = true) + @NotEmpty(message = "防护要求不能为空") + private String protectionRequirements; + @ApiModelProperty(value = "隔绝安全措施", name = "separateSafetyMeasures", required = true) + @NotEmpty(message = "隔绝安全措施不能为空") + private String separateSafetyMeasures; + @ApiModelProperty(value = "最大作业人数", name = "maximumNumber", required = true) + @NotNull(message = "最大作业人数不能为空") + private Integer maximumNumber; + @ApiModelProperty(value = "是否有应急指导书，0否1是", name = "isEmergencyBook", required = true) + @NotNull(message = "是否有应急指导书，0否1是不能为空") + private Integer isEmergencyBook; + @ApiModelProperty(value = "位置及范围", name = "position", required = true) + @NotEmpty(message = "位置及范围不能为空") + private String position; + @ApiModelProperty(value = "所属部门", name = "departmentId", required = true) + @NotNull(message = "所属部门不能为空") + private Long departmentId; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoAddCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoAddCmd.java new file mode 100644 index 0000000..582444b --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoAddCmd.java @@ -0,0 +1,58 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.Command; +import com.alibaba.fastjson.JSONObject; +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 fangjiakai + * @Date 2025-11-12 10:58:52 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class EightworkInfoAddCmd extends Command { + @ApiModelProperty(value = "企业", name = "corpinfoId", required = true) + @NotNull(message = "企业不能为空") + private Long corpinfoId; + + @ApiModelProperty(value = "是否相关方1是", name = "xgfFlag", required = true) + @NotNull(message = "是否相关方1是不能为空") + private Integer xgfFlag; + + @ApiModelProperty(value = "所属项目", name = "projectId", required = true) + @NotEmpty(message = "所属项目不能为空") + private String projectId; + + @ApiModelProperty(value = "相关方id", name = "xgfId", required = true) + @NotNull(message = "相关方id不能为空") + private Long xgfId; + + @ApiModelProperty(value = "票号", name = "checkNo", required = true) + @NotEmpty(message = "票号不能为空") + private String checkNo; + + @ApiModelProperty(value = "工作类型", name = "workType", required = true) + @NotEmpty(message = "工作类型不能为空") + private String workType; + + @ApiModelProperty(value = "级别", name = "workLevel", required = true) + @NotEmpty(message = "级别不能为空") + private String workLevel; + + @ApiModelProperty(value = "详细信息", name = "info", required = true) + @NotEmpty(message = "详细信息不能为空") + private String info; + +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoPageQry.java b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoPageQry.java new file mode 100644 index 0000000..c5417b7 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoPageQry.java @@ -0,0 +1,31 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.PageQuery; +import lombok.Data; + + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-12 10:58:53 + */ +@Data +public class EightworkInfoPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private String eqWorkType; + private Integer eqStatus; + private Long eqDepartmentId; + private Long eqCreateId; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoUpdateCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoUpdateCmd.java new file mode 100644 index 0000000..9c4d995 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoUpdateCmd.java @@ -0,0 +1,56 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.Command; +import com.alibaba.fastjson.JSONObject; +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 fangjiakai + * @Date 2025-11-12 10:58:53 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class EightworkInfoUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "业务主键id", name = "workId", required = true) + @NotEmpty(message = "业务主键id不能为空") + private String workId; + @ApiModelProperty(value = "企业", name = "corpinfoId", required = true) + @NotNull(message = "企业不能为空") + private Long corpinfoId; + @ApiModelProperty(value = "是否相关方1是", name = "xgfFlag", required = true) + @NotNull(message = "是否相关方1是不能为空") + private Integer xgfFlag; + @ApiModelProperty(value = "所属项目", name = "projectId", required = true) + @NotEmpty(message = "所属项目不能为空") + private String projectId; + @ApiModelProperty(value = "相关方id", name = "xgfId", required = true) + @NotNull(message = "相关方id不能为空") + private Long xgfId; + @ApiModelProperty(value = "票号", name = "checkNo", required = true) + @NotEmpty(message = "票号不能为空") + private String checkNo; + @ApiModelProperty(value = "工作类型", name = "workType", required = true) + @NotEmpty(message = "工作类型不能为空") + private String workType; + @ApiModelProperty(value = "级别", name = "workLevel", required = true) + @NotEmpty(message = "级别不能为空") + private String workLevel; + @ApiModelProperty(value = "详细信息", name = "info", required = true) + @NotEmpty(message = "详细信息不能为空") + private String info; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkStepAddCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkStepAddCmd.java new file mode 100644 index 0000000..f4cada6 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkStepAddCmd.java @@ -0,0 +1,28 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.*; + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:09 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class EightworkStepAddCmd extends Command { + @ApiModelProperty(value = "步骤名称", name = "stepName", required = true) + @NotEmpty(message = "步骤名称不能为空") + private String stepName; + +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkStepPageQry.java b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkStepPageQry.java new file mode 100644 index 0000000..0da4201 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkStepPageQry.java @@ -0,0 +1,29 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:23 + */ +@Data +public class EightworkStepPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private String likeStepName; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkStepUpdateCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkStepUpdateCmd.java new file mode 100644 index 0000000..8fae4d6 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkStepUpdateCmd.java @@ -0,0 +1,30 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.*; + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:32 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class EightworkStepUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "步骤名称", name = "stepName", required = true) + @NotEmpty(message = "步骤名称不能为空") + private String stepName; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkSupplementaryInfoAddCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkSupplementaryInfoAddCmd.java new file mode 100644 index 0000000..1b40346 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkSupplementaryInfoAddCmd.java @@ -0,0 +1,41 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.Command; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-20 13:35:54 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class EightworkSupplementaryInfoAddCmd extends Command { + @ApiModelProperty(value = "流程日志id", name = "taskLogId", required = true) + @NotEmpty(message = "流程日志id不能为空") + private String taskLogId; + + @ApiModelProperty(value = "工作id", name = "workId", required = true) + @NotEmpty(message = "工作id不能为空") + private String workId; + + @ApiModelProperty(value = "信息类型delay,gas", name = "type", required = true) + @NotEmpty(message = "信息类型delay,gas不能为空") + private String type; + + @ApiModelProperty(value = "详情", name = "details", required = true) + @NotEmpty(message = "详情不能为空") + private JSONObject details; + +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkSupplementaryInfoPageQry.java b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkSupplementaryInfoPageQry.java new file mode 100644 index 0000000..d2d9a81 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkSupplementaryInfoPageQry.java @@ -0,0 +1,28 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.PageQuery; +import lombok.Data; + + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-20 10:38:37 + */ +@Data +public class EightworkSupplementaryInfoPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private String likeSupplementaryInfoId; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkSupplementaryInfoUpdateCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkSupplementaryInfoUpdateCmd.java new file mode 100644 index 0000000..931ba2e --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkSupplementaryInfoUpdateCmd.java @@ -0,0 +1,44 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.Command; +import com.alibaba.fastjson.JSONObject; +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 fangjiakai + * @Date 2025-11-20 13:35:55 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class EightworkSupplementaryInfoUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "业务主键id", name = "supplementaryInfoId", required = true) + @NotEmpty(message = "业务主键id不能为空") + private String supplementaryInfoId; + @ApiModelProperty(value = "流程日志id", name = "taskLogId", required = true) + @NotEmpty(message = "流程日志id不能为空") + private String taskLogId; + @ApiModelProperty(value = "工作id", name = "workId", required = true) + @NotEmpty(message = "工作id不能为空") + private String workId; + @ApiModelProperty(value = "信息类型delay,gas", name = "type", required = true) + @NotEmpty(message = "信息类型delay,gas不能为空") + private String type; + @ApiModelProperty(value = "详情", name = "details", required = true) + @NotEmpty(message = "详情不能为空") + private JSONObject details; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkTaskAddCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkTaskAddCmd.java new file mode 100644 index 0000000..c847f61 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkTaskAddCmd.java @@ -0,0 +1,36 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.*; + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:37 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class EightworkTaskAddCmd extends Command { + @ApiModelProperty(value = "任务名称", name = "taskName", required = true) + @NotEmpty(message = "任务名称不能为空") + private String taskName; + + @ApiModelProperty(value = "任务类型", name = "workType", required = true) + @NotEmpty(message = "任务类型不能为空") + private String workType; + + @ApiModelProperty(value = "作业级别", name = "workLevel", required = true) + @NotEmpty(message = "作业级别不能为空") + private String workLevel; + +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkTaskPageQry.java b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkTaskPageQry.java new file mode 100644 index 0000000..0a65bd3 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkTaskPageQry.java @@ -0,0 +1,29 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:38 + */ +@Data +public class EightworkTaskPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private String likeTaskName; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkTaskUpdateCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkTaskUpdateCmd.java new file mode 100644 index 0000000..c8dbf74 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkTaskUpdateCmd.java @@ -0,0 +1,36 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.*; + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:39 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class EightworkTaskUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "任务名称", name = "taskName", required = true) + @NotEmpty(message = "任务名称不能为空") + private String taskName; + @ApiModelProperty(value = "任务类型", name = "workType", required = true) + @NotEmpty(message = "任务类型不能为空") + private String workType; + @ApiModelProperty(value = "作业级别", name = "workLevel", required = true) + @NotEmpty(message = "作业级别不能为空") + private String workLevel; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresAddCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresAddCmd.java new file mode 100644 index 0000000..845d862 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresAddCmd.java @@ -0,0 +1,41 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-11 11:30:39 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class MeasuresAddCmd extends Command { + @ApiModelProperty(value = "作业类型", name = "workType", required = true) + @NotEmpty(message = "作业类型不能为空") + private String workType; + + @ApiModelProperty(value = "防护措施", name = "content", required = true) + @NotEmpty(message = "防护措施不能为空") + private String content; + + @ApiModelProperty(value = "问题 &&分割", name = "questions", required = true) + @NotEmpty(message = "问题 &&分割不能为空") + private String questions; + + @ApiModelProperty(value = "排序", name = "orderBy", required = true) + @NotNull(message = "排序不能为空") + private Integer orderBy; + +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresLogsAddCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresLogsAddCmd.java new file mode 100644 index 0000000..c27fe53 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresLogsAddCmd.java @@ -0,0 +1,49 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-11 11:30:49 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class MeasuresLogsAddCmd extends Command { + @ApiModelProperty(value = "作业类型", name = "workType", required = true) + @NotEmpty(message = "作业类型不能为空") + private String workType; + + @ApiModelProperty(value = "防护措施", name = "content", required = true) + @NotEmpty(message = "防护措施不能为空") + private String content; + + @ApiModelProperty(value = "问题 &&分割", name = "questions", required = true) + @NotEmpty(message = "问题 &&分割不能为空") + private String questions; + + @ApiModelProperty(value = "作业票id", name = "workId", required = true) + @NotEmpty(message = "作业票id不能为空") + private String workId; + + @ApiModelProperty(value = "答案 &&分割", name = "answer", required = true) + @NotEmpty(message = "答案 &&分割不能为空") + private String answer; + + @ApiModelProperty(value = "排序", name = "orderBy", required = true) + @NotNull(message = "排序不能为空") + private Integer orderBy; + +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresLogsPageQry.java b/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresLogsPageQry.java new file mode 100644 index 0000000..89114d2 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresLogsPageQry.java @@ -0,0 +1,28 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.PageQuery; +import lombok.Data; + + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-11 11:30:49 + */ +@Data +public class MeasuresLogsPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private String likeWorkType; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresLogsUpdateCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresLogsUpdateCmd.java new file mode 100644 index 0000000..0d644cc --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresLogsUpdateCmd.java @@ -0,0 +1,46 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-11 11:30:49 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class MeasuresLogsUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "作业类型", name = "workType", required = true) + @NotEmpty(message = "作业类型不能为空") + private String workType; + @ApiModelProperty(value = "防护措施", name = "content", required = true) + @NotEmpty(message = "防护措施不能为空") + private String content; + @ApiModelProperty(value = "问题 &&分割", name = "questions", required = true) + @NotEmpty(message = "问题 &&分割不能为空") + private String questions; + @ApiModelProperty(value = "作业票id", name = "workId", required = true) + @NotEmpty(message = "作业票id不能为空") + private String workId; + @ApiModelProperty(value = "答案 &&分割", name = "answer", required = true) + @NotEmpty(message = "答案 &&分割不能为空") + private String answer; + @ApiModelProperty(value = "排序", name = "orderBy", required = true) + @NotNull(message = "排序不能为空") + private Integer orderBy; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresPageQry.java b/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresPageQry.java new file mode 100644 index 0000000..4b5db19 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresPageQry.java @@ -0,0 +1,28 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.PageQuery; +import lombok.Data; + + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-11 11:30:47 + */ +@Data +public class MeasuresPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private String eqWorkType; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresUpdateCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresUpdateCmd.java new file mode 100644 index 0000000..96a6aba --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresUpdateCmd.java @@ -0,0 +1,40 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-11 11:30:49 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class MeasuresUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "作业类型", name = "workType", required = true) + @NotEmpty(message = "作业类型不能为空") + private String workType; + @ApiModelProperty(value = "防护措施", name = "content", required = true) + @NotEmpty(message = "防护措施不能为空") + private String content; + @ApiModelProperty(value = "问题 &&分割", name = "questions", required = true) + @NotEmpty(message = "问题 &&分割不能为空") + private String questions; + @ApiModelProperty(value = "排序", name = "orderBy", required = true) + @NotNull(message = "排序不能为空") + private Integer orderBy; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/TaskFlowAddCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskFlowAddCmd.java new file mode 100644 index 0000000..d0019e1 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskFlowAddCmd.java @@ -0,0 +1,111 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-05 16:19:37 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TaskFlowAddCmd extends Command { + @ApiModelProperty(value = "任务ID", name = "taskId", required = true) + @NotNull(message = "任务ID不能为空") + private Long taskId; + + @ApiModelProperty(value = "步骤ID", name = "stepId", required = true) + @NotNull(message = "步骤ID不能为空") + private Long stepId; + + @ApiModelProperty(value = "步骤", name = "stepName", required = true) + @NotNull(message = "步骤不能为空") + private String stepName; + + @ApiModelProperty(value = "下一步步骤ID", name = "nextStep", required = true) + @NotNull(message = "下一步步骤ID不能为空") + private Long nextStep; + + @ApiModelProperty(value = "下一步步骤", name = "nextStepName", required = true) + @NotNull(message = "下一步步骤不能为空") + private String nextStepName; + + @ApiModelProperty(value = "操作人编码", name = "actorField", required = true) + @NotEmpty(message = "操作人编码不能为空") + private String actorField; + + @ApiModelProperty(value = "是否多人签字1是") + @NotNull(message = "是否多人签字不能为空") + private Integer multipleFlag; + + @ApiModelProperty(value = "1正常2分支", name = "stepType", required = true) + @NotNull(message = "1正常2分支不能为空") + private Integer stepType; + + @ApiModelProperty(value = "是否签字步骤1是", name = "signStepFlag", required = true) + @NotNull(message = "是否签字步骤1是不能为空") + private Integer signStepFlag; + + @ApiModelProperty(value = "sign_step_flag == 1 选择级别1部门2人员") + private Integer selectLevel; + @ApiModelProperty(value = "sign_step_flag == 1 是否可选相关方0否1是") + private Integer allowXgfFlag; + + @ApiModelProperty(value = "是否上传附件步骤1是", name = "fileStepFlag", required = true) + @NotNull(message = "是否上传附件步骤1是不能为空") + private Integer fileStepFlag; + + @ApiModelProperty(value = "是否定位步骤1是", name = "specialstep_code", required = true) + @NotNull(message = "是否定位步骤不能为空") + private Integer locateStepFlag; + + @ApiModelProperty(value = "特殊步骤编码", name = "specialStepCode") + private String specialStepCode; + + @ApiModelProperty(value = "sign_step_flag == 1 在那个步骤选人", name = "selectSignStep", required = true) + @NotNull(message = "sign_step_flag == 1 在那个步骤选人不能为空") + private Integer selectSignStep; + + @ApiModelProperty(value = "是否可以添加安全措施", name = "selectSignStep", required = true) + @NotNull(message = "是否可以添加安全措施") + private Integer measuresStepFlag; + + + + @ApiModelProperty(value = "0无分支1有分支开始2有分支结束", name = "branchFlag", required = true) + @NotNull(message = "0无分支1有分支开始2有分支结束不能为空") + private Integer branchFlag; + + @ApiModelProperty(value = "branch_flag == 1 分支节点", name = "branchStep", required = true) + @NotNull(message = "branch_flag == 1 分支节点不能为空") + private Integer branchStep; + + @ApiModelProperty(value = "step_type == 2 分支节点合并节点", name = "branchMergeStep", required = true) + @NotNull(message = "step_type == 2 分支节点合并节点不能为空") + private Integer branchMergeStep; + + @ApiModelProperty(value = "分支排序 示例10-1-5", name = "stepOrder", required = true) + @NotEmpty(message = "分支排序 示例10-1-5不能为空") + private Integer stepOrder; + + @ApiModelProperty(value = "是否可跳过1是", name = "canSkip", required = true) + @NotNull(message = "是否可跳过1是不能为空") + private Integer canSkip; + + @ApiModelProperty(value = "can_skip == 1 跳过条件 示例 age == 20", name = "skipCondition", required = true) + @NotEmpty(message = "can_skip == 1 跳过条件 示例 age == 20不能为空") + private String skipCondition; + +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/TaskFlowPageQry.java b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskFlowPageQry.java new file mode 100644 index 0000000..1e608be --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskFlowPageQry.java @@ -0,0 +1,29 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:50 + */ +@Data +public class TaskFlowPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private Long likeTaskId; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/TaskFlowQryCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskFlowQryCmd.java new file mode 100644 index 0000000..40de447 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskFlowQryCmd.java @@ -0,0 +1,28 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; + +/** + * @author fangjiakai + * @date 2025/11/10 14:08 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TaskFlowQryCmd extends Command { + @ApiModelProperty(value = "任务类型", name = "workType", required = true) + @NotEmpty(message = "任务类型不能为空") + private String workType; + + @ApiModelProperty(value = "作业级别", name = "workLevel", required = true) + @NotEmpty(message = "作业级别不能为空") + private String workLevel; +} diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/TaskFlowUpdateCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskFlowUpdateCmd.java new file mode 100644 index 0000000..3eaff81 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskFlowUpdateCmd.java @@ -0,0 +1,94 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-05 16:19:46 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TaskFlowUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "任务ID", name = "taskId", required = true) + @NotNull(message = "任务ID不能为空") + private Long taskId; + @ApiModelProperty(value = "步骤ID", name = "stepId", required = true) + @NotNull(message = "步骤ID不能为空") + private Long stepId; + + @ApiModelProperty(value = "步骤", name = "stepName", required = true) + @NotNull(message = "步骤不能为空") + private String stepName; + + @ApiModelProperty(value = "下一步步骤ID", name = "nextStep", required = true) + @NotNull(message = "下一步步骤ID不能为空") + private Long nextStep; + + @ApiModelProperty(value = "下一步步骤", name = "nextStepName", required = true) + @NotNull(message = "下一步步骤不能为空") + private String nextStepName; + @ApiModelProperty(value = "操作人编码", name = "actorField", required = true) + @NotEmpty(message = "操作人编码不能为空") + private String actorField; + @ApiModelProperty(value = "是否多人签字1是") + @NotNull(message = "是否多人签字不能为空") + private Integer multipleFlag; + @ApiModelProperty(value = "1正常2分支", name = "stepType", required = true) + @NotNull(message = "1正常2分支不能为空") + private Integer stepType; + @ApiModelProperty(value = "是否签字步骤1是", name = "signStepFlag", required = true) + @NotNull(message = "是否签字步骤1是不能为空") + private Integer signStepFlag; + @ApiModelProperty(value = "sign_step_flag == 1 选择级别1部门2人员") + private Integer selectLevel; + @ApiModelProperty(value = "sign_step_flag == 1 是否可选相关方0否1是") + private Integer allowXgfFlag; + @ApiModelProperty(value = "是否上传附件步骤1是", name = "fileStepFlag", required = true) + @NotNull(message = "是否上传附件步骤1是不能为空") + private Integer fileStepFlag; + @ApiModelProperty(value = "是否定位步骤1是", name = "locateStepFlag", required = true) + @NotNull(message = "是否定位步骤不能为空") + private Integer locateStepFlag; + @ApiModelProperty(value = "特殊步骤编码", name = "specialStepCode") + private String specialStepCode; + @ApiModelProperty(value = "sign_step_flag == 1 在那个步骤选人", name = "selectSignStep", required = true) + @NotNull(message = "sign_step_flag == 1 在那个步骤选人不能为空") + private Integer selectSignStep; + @ApiModelProperty(value = "是否可以添加安全措施", name = "selectSignStep", required = true) + @NotNull(message = "是否可以添加安全措施") + private Integer measuresStepFlag; + @ApiModelProperty(value = "0无分支1有分支开始2有分支结束", name = "branchFlag", required = true) + @NotNull(message = "0无分支1有分支开始2有分支结束不能为空") + private Integer branchFlag; + @ApiModelProperty(value = "branch_flag == 1 分支节点", name = "branchStep", required = true) + @NotNull(message = "branch_flag == 1 分支节点不能为空") + private Integer branchStep; + @ApiModelProperty(value = "step_type == 2 分支节点合并节点", name = "branchMergeStep", required = true) + @NotNull(message = "step_type == 2 分支节点合并节点不能为空") + private Integer branchMergeStep; + @ApiModelProperty(value = "分支排序 示例10-1-5", name = "stepOrder", required = true) + @NotEmpty(message = "分支排序 示例10-1-5不能为空") + private Integer stepOrder; + @ApiModelProperty(value = "是否可跳过1是", name = "canSkip", required = true) + @NotNull(message = "是否可跳过1是不能为空") + private Integer canSkip; + @ApiModelProperty(value = "can_skip == 1 跳过条件 示例 age == 20", name = "skipCondition", required = true) + @NotEmpty(message = "can_skip == 1 跳过条件 示例 age == 20不能为空") + private String skipCondition; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogAddCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogAddCmd.java new file mode 100644 index 0000000..3b5ada5 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogAddCmd.java @@ -0,0 +1,53 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.Command; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.*; +import java.util.List; + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:52 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TaskLogAddCmd extends Command { + @ApiModelProperty(value = "任务类型", name = "workType",required = true) + @NotBlank + private String workType; + @ApiModelProperty(value = "任务级别", name = "workLevel",required = true) + @NotBlank + private String workLevel; + @ApiModelProperty(value = "企业", name = "corpinfoId", required = true) + private Long corpinfoId; + + @ApiModelProperty(value = "是否相关方1是", name = "xgfFlag", required = true) + @NotNull(message = "是否相关方1是不能为空") + private Integer xgfFlag; + + @ApiModelProperty(value = "所属项目", name = "projectId", required = true) + private String projectId; + + @ApiModelProperty(value = "相关方id", name = "xgfId", required = true) + private Long xgfId; + @ApiModelProperty(value = "票号", name = "checkNo",required = true) + private String checkNo; + @ApiModelProperty(value = "任务信息", name = "info") + private JSONObject info; + @ApiModelProperty(value = "签字步骤",name = "signLogs") + private List signLogs; + + @ApiModelProperty(value = "部门id", name = "departmentId") + private Long departmentId; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogNextCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogNextCmd.java new file mode 100644 index 0000000..d47cee8 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogNextCmd.java @@ -0,0 +1,49 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.Command; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.*; +import java.util.List; + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:52 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TaskLogNextCmd extends Command { + @ApiModelProperty(value = "ID", name = "id", required = true) + @NotNull(message = "ID不能为空") + private Long id; + @ApiModelProperty(value = "工作ID", name = "workId", required = true) + @NotEmpty(message = "工作ID不能为空") + private String workId; + //步骤ID + @ApiModelProperty(value = "步骤ID") + @NotNull(message = "步骤ID不能为空") + private Long stepId; + //-99未开始0进行中1通过2打回 + @ApiModelProperty(value = "-99未开始0进行中1通过2打回") + private Integer status; + @ApiModelProperty(value = "特殊步骤编码gas气体检测measures安全措施确认delay延时监火") + private String specialStepCode; + //签字图片路径 + @ApiModelProperty(value = "签字图片路径") + @NotEmpty(message = "签字图片路径不能为空") + private String signPath; + @ApiModelProperty(value = "签字步骤", name = "signLogs") + private List signLogs; + @ApiModelProperty(value = "其他参数", name = "others") + private JSONObject others; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogPageQry.java b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogPageQry.java new file mode 100644 index 0000000..335b738 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogPageQry.java @@ -0,0 +1,30 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:53 + */ +@Data +public class TaskLogPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private String eqWorkType; + private int eqStatus; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogUpdateCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogUpdateCmd.java new file mode 100644 index 0000000..6bb6332 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogUpdateCmd.java @@ -0,0 +1,115 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.*; + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:54 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TaskLogUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String taskLogId; + @ApiModelProperty(value = "工作ID", name = "workId", required = true) + @NotEmpty(message = "工作ID不能为空") + private String workId; + @ApiModelProperty(value = "任务ID", name = "taskId", required = true) + @NotNull(message = "任务ID不能为空") + private Long taskId; + @ApiModelProperty(value = "步骤ID", name = "stepId", required = true) + @NotNull(message = "步骤ID不能为空") + private Long stepId; + + @ApiModelProperty(value = "步骤", name = "stepName", required = true) + @NotNull(message = "步骤不能为空") + private String stepName; + + @ApiModelProperty(value = "下一步步骤ID", name = "nextStep", required = true) + @NotNull(message = "下一步步骤ID不能为空") + private Long nextStep; + + @ApiModelProperty(value = "下一步步骤", name = "nextStepName", required = true) + @NotNull(message = "下一步步骤不能为空") + private String nextStepName; + @ApiModelProperty(value = "操作人部门", name = "actUserDepartment", required = true) + @NotNull(message = "操作人部门不能为空") + private Long actUserDepartment; + @ApiModelProperty(value = "操作人部门") + @NotEmpty(message = "操作人部门不能为空") + private String actUserDepartmentName; + @ApiModelProperty(value = "操作人") + @NotNull(message = "操作人不能为空") + private Long actUser; + @ApiModelProperty(value = "操作人") + @NotEmpty(message = "操作人不能为空") + private String actUserName; + @ApiModelProperty(value = "-99未开始0进行中1通过2打回-2气体检测打回", name = "status", required = true) + @NotNull(message = "-99未开始0进行中1通过2打回-2气体检测打回不能为空") + private Integer status; + @ApiModelProperty(value = "签字图片路径", name = "signPath", required = true) + @NotEmpty(message = "签字图片路径不能为空") + private String signPath; + @ApiModelProperty(value = "任务类型", name = "workType", required = true) + @NotEmpty(message = "任务类型不能为空") + private String workType; + @ApiModelProperty(value = "企业ID", name = "corpinfoId", required = true) + @NotNull(message = "企业ID不能为空") + private Long corpinfoId; + @ApiModelProperty(value = "工作票编号", name = "checkNo", required = true) + @NotEmpty(message = "工作票编号不能为空") + private String checkNo; + @ApiModelProperty(value = "操作人编码", name = "actorField", required = true) + @NotEmpty(message = "操作人编码不能为空") + private String actorField; + @ApiModelProperty(value = "是否多人签字1是") + @NotNull(message = "是否多人签字不能为空") + private Integer multipleFlag; + @ApiModelProperty(value = "1正常2分支", name = "stepType", required = true) + @NotNull(message = "1正常2分支不能为空") + private Integer stepType; + @ApiModelProperty(value = "是否签字步骤1是", name = "signStepFlag", required = true) + @NotNull(message = "是否签字步骤1是不能为空") + private Integer signStepFlag; + @ApiModelProperty(value = "sign_step_flag == 1 选择级别1部门2人员") + private Integer selectLevel; + @ApiModelProperty(value = "sign_step_flag == 1 是否可选相关方0否1是") + private Integer allowXgfFlag; + @ApiModelProperty(value = "是否上传附件步骤1是", name = "fileStepFlag", required = true) + @NotNull(message = "是否上传附件步骤1是不能为空") + private Integer fileStepFlag; + @ApiModelProperty(value = "是否定位步骤1是", name = "locateStepFlag", required = true) + @NotNull(message = "是否定位步骤不能为空") + private Integer locateStepFlag; + @ApiModelProperty(value = "0无分支1有分支开始2有分支结束", name = "branchFlag", required = true) + @NotNull(message = "0无分支1有分支开始2有分支结束不能为空") + private Integer branchFlag; + @ApiModelProperty(value = "branch_flag == 1 分支节点", name = "branchStep", required = true) + @NotNull(message = "branch_flag == 1 分支节点不能为空") + private Integer branchStep; + @ApiModelProperty(value = "step_type == 2 分支节点合并节点", name = "branchMergeStep", required = true) + @NotNull(message = "step_type == 2 分支节点合并节点不能为空") + private Integer branchMergeStep; + @ApiModelProperty(value = "分支排序 示例10-1-5", name = "stepOrder", required = true) + @NotEmpty(message = "分支排序 示例10-1-5不能为空") + private Integer stepOrder; + @ApiModelProperty(value = "是否可跳过1是", name = "canSkip", required = true) + @NotNull(message = "是否可跳过1是不能为空") + private Integer canSkip; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/TaskSignStepInfoCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskSignStepInfoCmd.java new file mode 100644 index 0000000..c2001e8 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskSignStepInfoCmd.java @@ -0,0 +1,36 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotNull; + +/** + * @author fangjiakai + * @date 2025/11/05 16:09 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TaskSignStepInfoCmd extends Command { + //步骤ID + @ApiModelProperty(value = "步骤ID") + private Long stepId; + //操作人 + @ApiModelProperty(value = "操作人编码") + private String actorField; + //操作人部门 + @ApiModelProperty(value = "操作人部门") + private Long actUserDepartment; + @ApiModelProperty(value = "操作人部门") + private String actUserDepartmentName; + @ApiModelProperty(value = "操作人") + private Long actUser; + @ApiModelProperty(value = "操作人") + private String actUserName; +} diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/TaskWorkQryCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskWorkQryCmd.java new file mode 100644 index 0000000..6746b16 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskWorkQryCmd.java @@ -0,0 +1,24 @@ +package com.zcloud.eightwork.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; + +/** + * @author fangjiakai + * @date 2025/11/10 14:08 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TaskWorkQryCmd extends Command { + @ApiModelProperty(value = "任务类型", name = "workType", required = true) + @NotEmpty(message = "任务类型不能为空") + private String workType; +} diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/ConfinedSpaceCO.java b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/ConfinedSpaceCO.java new file mode 100644 index 0000000..6b43765 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/ConfinedSpaceCO.java @@ -0,0 +1,102 @@ +package com.zcloud.eightwork.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-27 10:26:33 + */ +@Data +public class ConfinedSpaceCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //企业 + @ApiModelProperty(value = "企业") + private Long corpinfoId; + //空间名称 + @ApiModelProperty(value = "空间名称") + private String name; + //唯一编号 + @ApiModelProperty(value = "唯一编号") + private String code; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String confinedSpaceId; + //空间类型 + @ApiModelProperty(value = "空间类型") + private String type; + //空间类型名称 + @ApiModelProperty(value = "空间类型名称") + private String typeName; + //主要介质 + @ApiModelProperty(value = "主要介质") + private String medium; + //危险因素 + @ApiModelProperty(value = "危险因素") + private String hazards; + //风险等级 + @ApiModelProperty(value = "风险等级") + private String riskLevel; + //风险等级名称 + @ApiModelProperty(value = "风险等级名称") + private String riskLevelName; + //防护要求 + @ApiModelProperty(value = "防护要求") + private String protectionRequirements; + //隔绝安全措施 + @ApiModelProperty(value = "隔绝安全措施") + private String separateSafetyMeasures; + //最大作业人数 + @ApiModelProperty(value = "最大作业人数") + private Integer maximumNumber; + //是否有应急指导书，0否1是 + @ApiModelProperty(value = "是否有应急指导书，0否1是") + private Integer isEmergencyBook; + //位置及范围 + @ApiModelProperty(value = "位置及范围") + private String position; + //所属部门 + @ApiModelProperty(value = "所属部门") + private Long departmentId; + //删除标识true false + @ApiModelProperty(value = "删除标识true false") + private String deleteEnum; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户id + @ApiModelProperty(value = "租户id") + private Long tenantId; + //单位id + @ApiModelProperty(value = "单位id") + private Long orgId; + //版本 + @ApiModelProperty(value = "版本") + private String version; + //创建时间 + @ApiModelProperty(value = "创建时间") + private String createTime; + //修改时间 + @ApiModelProperty(value = "修改时间") + private String updateTime; + //创建人id + @ApiModelProperty(value = "创建人id") + private Long createId; + //修改人id + @ApiModelProperty(value = "修改人id") + private Long updateId; + private String env; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/EightworkInfoCO.java b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/EightworkInfoCO.java new file mode 100644 index 0000000..939733f --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/EightworkInfoCO.java @@ -0,0 +1,88 @@ +package com.zcloud.eightwork.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-12 10:58:53 + */ +@Data +public class EightworkInfoCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String workId; + //企业 + @ApiModelProperty(value = "企业") + private Long corpinfoId; + //是否相关方1是 + @ApiModelProperty(value = "是否相关方1是") + private Integer xgfFlag; + //所属项目 + @ApiModelProperty(value = "所属项目") + private String projectId; + //相关方id + @ApiModelProperty(value = "相关方id") + private Long xgfId; + //票号 + @ApiModelProperty(value = "票号") + private String checkNo; + //工作类型 + @ApiModelProperty(value = "工作类型") + private String workType; + //级别 + @ApiModelProperty(value = "级别") + private String workLevel; + //当前步骤 + @ApiModelProperty(value = "当前步骤") + private String currentStep; + //状态 + @ApiModelProperty(value = "状态") + private Integer status; + //详细信息 + @ApiModelProperty(value = "详细信息") + private JSONObject info; + //删除标识true false + @ApiModelProperty(value = "删除标识true false") + private String deleteEnum; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户id + @ApiModelProperty(value = "租户id") + private Long tenantId; + //单位id + @ApiModelProperty(value = "单位id") + private Long orgId; + //版本 + @ApiModelProperty(value = "版本") + private String version; + //创建时间 + @ApiModelProperty(value = "创建时间") + private String createTime; + //修改时间 + @ApiModelProperty(value = "修改时间") + private String updateTime; + //创建人id + @ApiModelProperty(value = "创建人id") + private Long createId; + //修改人id + @ApiModelProperty(value = "修改人id") + private Long updateId; + private String env; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/EightworkStepCO.java b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/EightworkStepCO.java new file mode 100644 index 0000000..446fb12 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/EightworkStepCO.java @@ -0,0 +1,57 @@ +package com.zcloud.eightwork.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:12 + */ +@Data +public class EightworkStepCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //步骤名称 + @ApiModelProperty(value = "步骤名称") + private String stepName; + //删除标识true false + @ApiModelProperty(value = "删除标识true false") + private String deleteEnum; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户id + @ApiModelProperty(value = "租户id") + private Long tenantId; + //单位id + @ApiModelProperty(value = "单位id") + private Long orgId; + //版本 + @ApiModelProperty(value = "版本") + private String version; + //创建时间 + @ApiModelProperty(value = "创建时间") + private String createTime; + //修改时间 + @ApiModelProperty(value = "修改时间") + private String updateTime; + //创建人id + @ApiModelProperty(value = "创建人id") + private Long createId; + //修改人id + @ApiModelProperty(value = "修改人id") + private Long updateId; + private String env; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/EightworkSupplementaryInfoCO.java b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/EightworkSupplementaryInfoCO.java new file mode 100644 index 0000000..f8934ee --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/EightworkSupplementaryInfoCO.java @@ -0,0 +1,70 @@ +package com.zcloud.eightwork.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-20 13:35:54 + */ +@Data +public class EightworkSupplementaryInfoCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String supplementaryInfoId; + //流程日志id + @ApiModelProperty(value = "流程日志id") + private String taskLogId; + //工作id + @ApiModelProperty(value = "工作id") + private String workId; + //信息类型delay,gas + @ApiModelProperty(value = "信息类型delay,gas") + private String type; + //详情 + @ApiModelProperty(value = "详情") + private JSONObject details; + //删除标识true false + @ApiModelProperty(value = "删除标识true false") + private String deleteEnum; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户id + @ApiModelProperty(value = "租户id") + private Long tenantId; + //单位id + @ApiModelProperty(value = "单位id") + private Long orgId; + //版本 + @ApiModelProperty(value = "版本") + private String version; + //创建时间 + @ApiModelProperty(value = "创建时间") + private String createTime; + //修改时间 + @ApiModelProperty(value = "修改时间") + private String updateTime; + //创建人id + @ApiModelProperty(value = "创建人id") + private Long createId; + //修改人id + @ApiModelProperty(value = "修改人id") + private Long updateId; + private String env; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/EightworkTaskCO.java b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/EightworkTaskCO.java new file mode 100644 index 0000000..41f963c --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/EightworkTaskCO.java @@ -0,0 +1,63 @@ +package com.zcloud.eightwork.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:37 + */ +@Data +public class EightworkTaskCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //任务名称 + @ApiModelProperty(value = "任务名称") + private String taskName; + //任务类型 + @ApiModelProperty(value = "任务类型") + private String workType; + //作业级别 + @ApiModelProperty(value = "作业级别") + private String workLevel; + //删除标识true false + @ApiModelProperty(value = "删除标识true false") + private String deleteEnum; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户id + @ApiModelProperty(value = "租户id") + private Long tenantId; + //单位id + @ApiModelProperty(value = "单位id") + private Long orgId; + //版本 + @ApiModelProperty(value = "版本") + private String version; + //创建时间 + @ApiModelProperty(value = "创建时间") + private String createTime; + //修改时间 + @ApiModelProperty(value = "修改时间") + private String updateTime; + //创建人id + @ApiModelProperty(value = "创建人id") + private Long createId; + //修改人id + @ApiModelProperty(value = "修改人id") + private Long updateId; + private String env; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/MeasuresCO.java b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/MeasuresCO.java new file mode 100644 index 0000000..6296050 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/MeasuresCO.java @@ -0,0 +1,66 @@ +package com.zcloud.eightwork.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-11 11:30:43 + */ +@Data +public class MeasuresCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //作业类型 + @ApiModelProperty(value = "作业类型") + private String workType; + //防护措施 + @ApiModelProperty(value = "防护措施") + private String content; + //问题 &&分割 + @ApiModelProperty(value = "问题 &&分割") + private String questions; + //排序 + @ApiModelProperty(value = "排序") + private Integer orderBy; + //删除标识true false + @ApiModelProperty(value = "删除标识true false") + private String deleteEnum; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户id + @ApiModelProperty(value = "租户id") + private Long tenantId; + //单位id + @ApiModelProperty(value = "单位id") + private Long orgId; + //版本 + @ApiModelProperty(value = "版本") + private String version; + //创建时间 + @ApiModelProperty(value = "创建时间") + private String createTime; + //修改时间 + @ApiModelProperty(value = "修改时间") + private String updateTime; + //创建人id + @ApiModelProperty(value = "创建人id") + private Long createId; + //修改人id + @ApiModelProperty(value = "修改人id") + private Long updateId; + private String env; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/MeasuresLogsCO.java b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/MeasuresLogsCO.java new file mode 100644 index 0000000..9d17265 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/MeasuresLogsCO.java @@ -0,0 +1,72 @@ +package com.zcloud.eightwork.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-11 11:30:49 + */ +@Data +public class MeasuresLogsCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //作业类型 + @ApiModelProperty(value = "作业类型") + private String workType; + //防护措施 + @ApiModelProperty(value = "防护措施") + private String content; + //问题 &&分割 + @ApiModelProperty(value = "问题 &&分割") + private String questions; + //作业票id + @ApiModelProperty(value = "作业票id") + private String workId; + //答案 &&分割 + @ApiModelProperty(value = "答案 &&分割") + private String answer; + //排序 + @ApiModelProperty(value = "排序") + private Integer orderBy; + //删除标识true false + @ApiModelProperty(value = "删除标识true false") + private String deleteEnum; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户id + @ApiModelProperty(value = "租户id") + private Long tenantId; + //单位id + @ApiModelProperty(value = "单位id") + private Long orgId; + //版本 + @ApiModelProperty(value = "版本") + private String version; + //创建时间 + @ApiModelProperty(value = "创建时间") + private String createTime; + //修改时间 + @ApiModelProperty(value = "修改时间") + private String updateTime; + //创建人id + @ApiModelProperty(value = "创建人id") + private Long createId; + //修改人id + @ApiModelProperty(value = "修改人id") + private Long updateId; + private String env; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/TaskFlowCO.java b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/TaskFlowCO.java new file mode 100644 index 0000000..927bf75 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/TaskFlowCO.java @@ -0,0 +1,77 @@ +package com.zcloud.eightwork.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-05 16:19:39 + */ +@Data +public class TaskFlowCO extends ClientObject { + //任务ID + @ApiModelProperty(value = "任务ID") + private Long taskId; + //步骤ID + @ApiModelProperty(value = "步骤ID", name = "stepId", required = true) + private Long stepId; + + @ApiModelProperty(value = "步骤", name = "stepName", required = true) + private String stepName; + + @ApiModelProperty(value = "下一步步骤ID", name = "nextStep", required = true) + private Long nextStep; + + @ApiModelProperty(value = "下一步步骤", name = "nextStepName", required = true) + private String nextStepName; + //操作人 + @ApiModelProperty(value = "操作人") + private String actorField; + @ApiModelProperty(value = "是否多人签字1是") + private Integer multipleFlag; + //1正常2分支 + @ApiModelProperty(value = "1正常2分支") + private Integer stepType; + //是否签字步骤1是 + @ApiModelProperty(value = "是否签字步骤1是") + private Integer signStepFlag; + @ApiModelProperty(value = "sign_step_flag == 1 选择级别1部门2人员") + private Integer selectLevel; + @ApiModelProperty(value = "sign_step_flag == 1 是否可选相关方0否1是") + private Integer allowXgfFlag; + @ApiModelProperty(value = "是否上传附件步骤1是") + private Integer fileStepFlag; + @ApiModelProperty(value = "是否定位步骤1是", name = "locateStepFlag", required = true) + private Integer locateStepFlag; + @ApiModelProperty(value = "特殊步骤编码", name = "specialStepCode") + private String specialStepCode; + //sign_step_flag == 1 在那个步骤选人 + @ApiModelProperty(value = "sign_step_flag == 1 在那个步骤选人") + private Integer selectSignStep; + @ApiModelProperty(value = "是否可以添加安全措施") + private Integer measuresStepFlag; + //0无分支1有分支开始2有分支结束 + @ApiModelProperty(value = "0无分支1有分支开始2有分支结束") + private Integer branchFlag; + //branch_flag == 1 分支节点 + @ApiModelProperty(value = "branch_flag == 1 分支节点") + private Integer branchStep; + //step_type == 2 分支节点合并节点 + @ApiModelProperty(value = "step_type == 2 分支节点合并节点") + private Integer branchMergeStep; + //分支排序 示例10-1-5 + @ApiModelProperty(value = "分支排序 示例10-1-5") + private Integer stepOrder; + //是否可跳过1是 + @ApiModelProperty(value = "是否可跳过1是") + private Integer canSkip; + //can_skip == 1 跳过条件 示例 age == 20 + @ApiModelProperty(value = "can_skip == 1 跳过条件 示例 age == 20") + private String skipCondition; +} diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/TaskFlowInitCO.java b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/TaskFlowInitCO.java new file mode 100644 index 0000000..a1a710b --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/TaskFlowInitCO.java @@ -0,0 +1,17 @@ +package com.zcloud.eightwork.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author fangjiakai + * @date 2025/11/11 13:44 + */ +@Data +public class TaskFlowInitCO extends ClientObject { + @ApiModelProperty(value = "需设置签字人的步骤") + private List settingSignSteps; +} diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/TaskLogCO.java b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/TaskLogCO.java new file mode 100644 index 0000000..e703219 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/TaskLogCO.java @@ -0,0 +1,128 @@ +package com.zcloud.eightwork.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + + +/** + * web-client + * + * @Author fangjiakai + * @Date 2025-11-08 09:21:58 + */ +@Data +public class TaskLogCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String taskLogId; + //工作ID + @ApiModelProperty(value = "工作ID") + private String workId; + //任务ID + @ApiModelProperty(value = "任务ID") + private Long taskId; + //步骤ID + @ApiModelProperty(value = "步骤ID") + private Long stepId; + //步骤名称 + @ApiModelProperty(value = "步骤名称") + private String stepName; + //下一步 + @ApiModelProperty(value = "下一步") + private Long nextStep; + //下一步名称 + @ApiModelProperty(value = "下一步名称") + private String nextStepName; + //操作人部门 + @ApiModelProperty(value = "操作人部门") + private Long actUserDepartment; + //操作人部门 + @ApiModelProperty(value = "操作人部门") + private String actUserDepartmentName; + //操作人 + @ApiModelProperty(value = "操作人") + private Long actUser; + //操作人 + @ApiModelProperty(value = "操作人") + private String actUserName; + //-99未开始0进行中1通过2打回 + @ApiModelProperty(value = "-99未开始0进行中1通过2打回") + private Integer status; + //签字图片路径 + @ApiModelProperty(value = "签字图片路径") + private String signPath; + // 签字时间 + @ApiModelProperty(value = "签字时间") + private String updateTime; + //任务类型 + @ApiModelProperty(value = "任务类型") + private String workType; + //企业ID + @ApiModelProperty(value = "企业ID") + private Long corpinfoId; + //工作票编号 + @ApiModelProperty(value = "工作票编号") + private String checkNo; + //操作人编码 + @ApiModelProperty(value = "操作人编码") + private String actorField; + //是否多人签字1是 + @ApiModelProperty(value = "是否多人签字1是") + private Integer multipleFlag; + //1正常2分支 + @ApiModelProperty(value = "1正常2分支") + private Integer stepType; + //是否签字步骤1是 + @ApiModelProperty(value = "是否签字步骤1是") + private Integer signStepFlag; + @ApiModelProperty(value = "sign_step_flag == 1 选择级别1部门2人员") + private Integer selectLevel; + @ApiModelProperty(value = "sign_step_flag == 1 是否可选相关方0否1是") + private Integer allowXgfFlag; + //是否上传附件 + @ApiModelProperty(value = "是否上传附件") + private Integer fileStepFlag; + //是否定位步骤 + @ApiModelProperty(value = "是否定位步骤") + private Integer locateStepFlag; + //特殊步骤编码gas气体检测measures安全措施确认delay延时监火 + @ApiModelProperty(value = "特殊步骤编码gas气体检测measures安全措施确认delay延时监火") + private String specialStepCode; + //sign_step_flag == 1 在那个步骤选人 + @ApiModelProperty(value = "sign_step_flag == 1 在那个步骤选人") + private Integer selectSignStep; + @ApiModelProperty(value = "是否可以添加安全措施") + private Integer measuresStepFlag; + //0无分支1有分支开始2有分支结束 + @ApiModelProperty(value = "0无分支1有分支开始2有分支结束") + private Integer branchFlag; + //branch_flag == 1 分支节点 + @ApiModelProperty(value = "branch_flag == 1 分支节点") + private Integer branchStep; + //step_type == 2 分支节点合并节点 + @ApiModelProperty(value = "step_type == 2 分支节点合并节点") + private Integer branchMergeStep; + //分支排序 示例10-1-5 + @ApiModelProperty(value = "分支排序 示例10-1-5") + private Integer stepOrder; + //是否可跳过1是 + @ApiModelProperty(value = "是否可跳过1是") + private Integer canSkip; + //can_skip == 1 跳过条件 示例 age == 20 + @ApiModelProperty(value = "can_skip == 1 跳过条件 示例 age == 20") + private String skipCondition; + + @ApiModelProperty(value = "当前步骤需设置的签字人") + List settingSignSteps; + + @ApiModelProperty(value = "工作票信息") + private EightworkInfoCO workInfo; +} + diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/TaskWorkInitCO.java b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/TaskWorkInitCO.java new file mode 100644 index 0000000..a415e60 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/TaskWorkInitCO.java @@ -0,0 +1,23 @@ +package com.zcloud.eightwork.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author fangjiakai + * @date 2025/11/11 13:44 + */ +@Data +public class TaskWorkInitCO extends ClientObject { + @ApiModelProperty(value = "申请单位") + private String applyUnit; + @ApiModelProperty(value = "申请人") + private String applyUser; + @ApiModelProperty(value = "票号") + private String checkNo; + @ApiModelProperty(value = "任务级别列表") + private List taskWorkLevels; +} diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/TodoCountCO.java b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/TodoCountCO.java new file mode 100644 index 0000000..0f9fb5a --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/TodoCountCO.java @@ -0,0 +1,19 @@ +package com.zcloud.eightwork.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author fangjiakai + * @date 2025/11/20 9:49 + */ +@Data +public class TodoCountCO extends ClientObject { + @ApiModelProperty(value = "任务类型") + private String workType; + @ApiModelProperty(value = "步骤ID") + private Integer stepId; + @ApiModelProperty(value = "待处理数量") + private Long todoCount; +} diff --git a/web-domain/pom.xml b/web-domain/pom.xml new file mode 100644 index 0000000..254901a --- /dev/null +++ b/web-domain/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + com.zcloud.eightwork + zcloud-gbs-eightwork + 1.0-SNAPSHOT + ../pom.xml + + + web-domain + jar + web-domain + + + + + com.jjb.saas + jjb-saas-framework-domain + + + com.jjb.saas + jjb-saas-base-starter + + + diff --git a/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/ConfinedSpaceGateway.java b/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/ConfinedSpaceGateway.java new file mode 100644 index 0000000..0411170 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/ConfinedSpaceGateway.java @@ -0,0 +1,30 @@ +package com.zcloud.eightwork.domain.gateway; + +import com.zcloud.eightwork.domain.model.ConfinedSpaceE; + +/** + * web-domain + * + * @Author fangjiakai + * @Date 2025-11-27 10:26:34 + */ +public interface ConfinedSpaceGateway { + + /** + * 新增 + */ + Boolean add(ConfinedSpaceE confinedSpaceE); + + /** + * 修改 + */ + Boolean update(ConfinedSpaceE confinedSpaceE); + + /** + * 删除 + */ + Boolean deletedConfinedSpaceById(Long id); + + Boolean deletedConfinedSpaceByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/EightworkInfoGateway.java b/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/EightworkInfoGateway.java new file mode 100644 index 0000000..550f1d2 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/EightworkInfoGateway.java @@ -0,0 +1,30 @@ +package com.zcloud.eightwork.domain.gateway; + +import com.zcloud.eightwork.domain.model.EightworkInfoE; + +/** + * web-domain + * + * @Author fangjiakai + * @Date 2025-11-12 10:58:53 + */ +public interface EightworkInfoGateway { + + /** + * 新增 + */ + Boolean add(EightworkInfoE eightworkInfoE); + + /** + * 修改 + */ + Boolean update(EightworkInfoE eightworkInfoE); + + /** + * 删除 + */ + Boolean deletedEightworkInfoById(Long id); + + Boolean deletedEightworkInfoByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/EightworkStepGateway.java b/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/EightworkStepGateway.java new file mode 100644 index 0000000..db61762 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/EightworkStepGateway.java @@ -0,0 +1,30 @@ +package com.zcloud.eightwork.domain.gateway; + +import com.zcloud.eightwork.domain.model.EightworkStepE; + +/** + * web-domain + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:19 + */ +public interface EightworkStepGateway { + + /** + * 新增 + */ + Boolean add(EightworkStepE eightworkStepE); + + /** + * 修改 + */ + Boolean update(EightworkStepE eightworkStepE); + + /** + * 删除 + */ + Boolean deletedEightworkStepById(Long id); + + Boolean deletedEightworkStepByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/EightworkSupplementaryInfoGateway.java b/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/EightworkSupplementaryInfoGateway.java new file mode 100644 index 0000000..fde0f99 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/EightworkSupplementaryInfoGateway.java @@ -0,0 +1,30 @@ +package com.zcloud.eightwork.domain.gateway; + +import com.zcloud.eightwork.domain.model.EightworkSupplementaryInfoE; + +/** + * web-domain + * + * @Author fangjiakai + * @Date 2025-11-20 10:38:36 + */ +public interface EightworkSupplementaryInfoGateway { + + /** + * 新增 + */ + Boolean add(EightworkSupplementaryInfoE eightworkSupplementaryInfoE); + + /** + * 修改 + */ + Boolean update(EightworkSupplementaryInfoE eightworkSupplementaryInfoE); + + /** + * 删除 + */ + Boolean deletedEightworkSupplementaryInfoById(Long id); + + Boolean deletedEightworkSupplementaryInfoByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/EightworkTaskGateway.java b/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/EightworkTaskGateway.java new file mode 100644 index 0000000..dd41eca --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/EightworkTaskGateway.java @@ -0,0 +1,30 @@ +package com.zcloud.eightwork.domain.gateway; + +import com.zcloud.eightwork.domain.model.EightworkTaskE; + +/** + * web-domain + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:38 + */ +public interface EightworkTaskGateway { + + /** + * 新增 + */ + Boolean add(EightworkTaskE eightworkTaskE); + + /** + * 修改 + */ + Boolean update(EightworkTaskE eightworkTaskE); + + /** + * 删除 + */ + Boolean deletedEightworkTaskById(Long id); + + Boolean deletedEightworkTaskByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/MeasuresGateway.java b/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/MeasuresGateway.java new file mode 100644 index 0000000..cf27b0b --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/MeasuresGateway.java @@ -0,0 +1,28 @@ +package com.zcloud.eightwork.domain.gateway; + +import com.zcloud.eightwork.domain.model.MeasuresE; + +/** +* web-domain +* @Author fangjiakai +* @Date 2025-11-11 11:30:46 +*/ +public interface MeasuresGateway { + + /** + * 新增 + */ + Boolean add(MeasuresE measuresE) ; + + /** + * 修改 + */ + Boolean update(MeasuresE measuresE); + + /** + * 删除 + */ + Boolean deletedMeasuresById(Long id); + Boolean deletedMeasuresByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/MeasuresLogsGateway.java b/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/MeasuresLogsGateway.java new file mode 100644 index 0000000..6c7a017 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/MeasuresLogsGateway.java @@ -0,0 +1,28 @@ +package com.zcloud.eightwork.domain.gateway; + +import com.zcloud.eightwork.domain.model.MeasuresLogsE; + +/** +* web-domain +* @Author fangjiakai +* @Date 2025-11-11 11:30:49 +*/ +public interface MeasuresLogsGateway { + + /** + * 新增 + */ + Boolean add(MeasuresLogsE measuresLogsE) ; + + /** + * 修改 + */ + Boolean update(MeasuresLogsE measuresLogsE); + + /** + * 删除 + */ + Boolean deletedMeasuresLogsById(Long id); + Boolean deletedMeasuresLogsByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/TaskFlowGateway.java b/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/TaskFlowGateway.java new file mode 100644 index 0000000..1bc7412 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/TaskFlowGateway.java @@ -0,0 +1,35 @@ +package com.zcloud.eightwork.domain.gateway; + +import com.zcloud.eightwork.domain.model.TaskFlowE; + +import java.util.List; + +/** + * web-domain + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:50 + */ +public interface TaskFlowGateway { + + /** + * 新增 + */ + Boolean add(TaskFlowE taskFlowE); + + /** + * 修改 + */ + Boolean update(TaskFlowE taskFlowE); + + /** + * 删除 + */ + Boolean deletedTaskFlowById(Long id); + + Boolean deletedTaskFlowByIds(Long[] id); + + List listAllByWorkType(String workType,String workLevel); + +} + diff --git a/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/TaskLogGateway.java b/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/TaskLogGateway.java new file mode 100644 index 0000000..f511f65 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/eightwork/domain/gateway/TaskLogGateway.java @@ -0,0 +1,35 @@ +package com.zcloud.eightwork.domain.gateway; + +import com.zcloud.eightwork.domain.model.TaskFlowE; +import com.zcloud.eightwork.domain.model.TaskLogE; + +import java.util.List; + +/** + * web-domain + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:53 + */ +public interface TaskLogGateway { + + /** + * 新增 + */ + Boolean add(TaskLogE taskLogE); + Boolean addBatch(List taskLogE); + /** + * 修改 + */ + Boolean update(TaskLogE taskLogE); + + /** + * 删除 + */ + Boolean deletedTaskLogById(Long id); + + Boolean deletedTaskLogByIds(Long[] id); + + List listAllByWorkId(String workId); +} + diff --git a/web-domain/src/main/java/com/zcloud/eightwork/domain/model/ConfinedSpaceE.java b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/ConfinedSpaceE.java new file mode 100644 index 0000000..9affb06 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/ConfinedSpaceE.java @@ -0,0 +1,47 @@ +package com.zcloud.eightwork.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.Data; + +/** + * web-domain + * + * @Author fangjiakai + * @Date 2025-11-27 10:26:33 + */ +@Data +public class ConfinedSpaceE extends BaseE { + //企业 + private Long corpinfoId; + //空间名称 + private String name; + //唯一编号 + private String code; + //业务主键id + private String confinedSpaceId; + //空间类型 + private String type; + //空间类型名称 + private String typeName; + //主要介质 + private String medium; + //危险因素 + private String hazards; + //风险等级 + private String riskLevel; + //风险等级名称 + private String riskLevelName; + //防护要求 + private String protectionRequirements; + //隔绝安全措施 + private String separateSafetyMeasures; + //最大作业人数 + private Integer maximumNumber; + //是否有应急指导书，0否1是 + private Integer isEmergencyBook; + //位置及范围 + private String position; + //所属部门 + private Long departmentId; +} + diff --git a/web-domain/src/main/java/com/zcloud/eightwork/domain/model/EightworkInfoE.java b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/EightworkInfoE.java new file mode 100644 index 0000000..348a2dc --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/EightworkInfoE.java @@ -0,0 +1,39 @@ +package com.zcloud.eightwork.domain.model; + +import com.alibaba.fastjson.JSONObject; +import com.jjb.saas.framework.domain.model.BaseE; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * web-domain + * + * @Author fangjiakai + * @Date 2025-11-12 10:58:53 + */ +@Data +public class EightworkInfoE extends BaseE { + //业务主键id + private String workId; + //企业 + private Long corpinfoId; + //是否相关方1是 + private Integer xgfFlag; + //所属项目 + private String projectId; + //相关方id + private Long xgfId; + //票号 + private String checkNo; + //工作类型 + private String workType; + //级别 + private String workLevel; + //当前步骤 + private String currentStep; + //状态 + private Integer status; + //详细信息 + private String info; +} + diff --git a/web-domain/src/main/java/com/zcloud/eightwork/domain/model/EightworkStepE.java b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/EightworkStepE.java new file mode 100644 index 0000000..3f542cd --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/EightworkStepE.java @@ -0,0 +1,19 @@ +package com.zcloud.eightwork.domain.model; + +import com.alibaba.cola.domain.Entity; +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * web-domain + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:16 + */ +@Data +public class EightworkStepE extends BaseE { + //步骤名称 + private String stepName; +} + diff --git a/web-domain/src/main/java/com/zcloud/eightwork/domain/model/EightworkSupplementaryInfoE.java b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/EightworkSupplementaryInfoE.java new file mode 100644 index 0000000..ad0c4d5 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/EightworkSupplementaryInfoE.java @@ -0,0 +1,26 @@ +package com.zcloud.eightwork.domain.model; + +import com.alibaba.fastjson.JSONObject; +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.Data; + +/** + * web-domain + * + * @Author fangjiakai + * @Date 2025-11-20 13:35:54 + */ +@Data +public class EightworkSupplementaryInfoE extends BaseE { + //业务主键id + private String supplementaryInfoId; + //流程日志id + private String taskLogId; + //工作id + private String workId; + //信息类型delay,gas + private String type; + //详情 + private JSONObject details; +} + diff --git a/web-domain/src/main/java/com/zcloud/eightwork/domain/model/EightworkTaskE.java b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/EightworkTaskE.java new file mode 100644 index 0000000..5c67ce6 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/EightworkTaskE.java @@ -0,0 +1,23 @@ +package com.zcloud.eightwork.domain.model; + +import com.alibaba.cola.domain.Entity; +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * web-domain + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:38 + */ +@Data +public class EightworkTaskE extends BaseE { + //任务名称 + private String taskName; + //任务类型 + private String workType; + //作业级别 + private String workLevel; +} + diff --git a/web-domain/src/main/java/com/zcloud/eightwork/domain/model/MeasuresE.java b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/MeasuresE.java new file mode 100644 index 0000000..97943d4 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/MeasuresE.java @@ -0,0 +1,23 @@ +package com.zcloud.eightwork.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.Data; + +/** + * web-domain + * + * @Author fangjiakai + * @Date 2025-11-11 11:30:44 + */ +@Data +public class MeasuresE extends BaseE { + //作业类型 + private String workType; + //防护措施 + private String content; + //问题 &&分割 + private String questions; + //排序 + private Integer orderBy; +} + diff --git a/web-domain/src/main/java/com/zcloud/eightwork/domain/model/MeasuresLogsE.java b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/MeasuresLogsE.java new file mode 100644 index 0000000..1b30d1d --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/MeasuresLogsE.java @@ -0,0 +1,27 @@ +package com.zcloud.eightwork.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.Data; + +/** + * web-domain + * + * @Author fangjiakai + * @Date 2025-11-11 11:30:49 + */ +@Data +public class MeasuresLogsE extends BaseE { + //作业类型 + private String workType; + //防护措施 + private String content; + //问题 &&分割 + private String questions; + //作业票id + private String workId; + //答案 &&分割 + private String answer; + //排序 + private Integer orderBy; +} + diff --git a/web-domain/src/main/java/com/zcloud/eightwork/domain/model/TaskFlowE.java b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/TaskFlowE.java new file mode 100644 index 0000000..e23e51f --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/TaskFlowE.java @@ -0,0 +1,60 @@ +package com.zcloud.eightwork.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** +* web-domain +* @Author fangjiakai +* @Date 2025-11-05 16:19:41 +*/ +@Data +public class TaskFlowE extends BaseE { + //任务ID + private Long taskId; + //步骤ID + private Long stepId; + //步骤 + private String stepName; + //下一步步骤ID + private Long nextStep; + //下一步步骤 + private String nextStepName; + //操作人 + private String actorField; + private Integer multipleFlag; + //1正常2分支 + private Integer stepType; + //是否签字步骤1是 + private Integer signStepFlag; + //选择级别1部门2人员 + private Integer selectLevel; + //是否可选相关方0否1是 + private Integer allowXgfFlag; + // 是否上传附件步骤1是 + private Integer fileStepFlag; + //是否定位步骤不能为空 + private Integer locateStepFlag; + //特殊步骤编码 + private String specialStepCode; + //sign_step_flag == 1 在那个步骤选人 + private Integer selectSignStep; + //是否可以添加安全措施 + private Integer measuresStepFlag; + //0无分支1有分支开始2有分支结束 + private Integer branchFlag; + //branch_flag == 1 分支节点 + private Integer branchStep; + //step_type == 2 分支节点合并节点 + private Integer branchMergeStep; + //分支排序 示例10-1-5 + private Integer stepOrder; + //是否可跳过1是 + private Integer canSkip; + //can_skip == 1 跳过条件 示例 age == 20 + private String skipCondition; +} + diff --git a/web-domain/src/main/java/com/zcloud/eightwork/domain/model/TaskLogE.java b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/TaskLogE.java new file mode 100644 index 0000000..d085ccf --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/TaskLogE.java @@ -0,0 +1,124 @@ +package com.zcloud.eightwork.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotNull; + +/** +* web-domain +* @Author fangjiakai +* @Date 2025-11-08 09:22:01 +*/ +@Data +@NoArgsConstructor +public class TaskLogE extends BaseE { + //业务主键id + private String taskLogId; + //工作ID + private String workId; + //任务ID + private Long taskId; + //步骤ID + private Long stepId; + //步骤名称 + private String stepName; + //下一步 + private Long nextStep; + //下一步名称 + private String nextStepName; + //操作人部门 + private Long actUserDepartment; + //操作人部门 + private String actUserDepartmentName; + //操作人 + private Long actUser; + //操作人 + private String actUserName; + //-99未开始0进行中1通过2打回 + private Integer status; + //签字图片路径 + private String signPath; + //任务类型 + private String workType; + //企业ID + private Long corpinfoId; + //工作票编号 + private String checkNo; + //操作人编码 + private String actorField; + //是否多人签字1是 + private Integer multipleFlag; + //1正常2分支 + private Integer stepType; + //是否签字步骤1是 + private Integer signStepFlag; + //选择级别1部门2人员 + private Integer selectLevel; + //是否可选相关方0否1是 + private Integer allowXgfFlag; + //是否上传附件 + private Integer fileStepFlag; + //是否定位步骤 + private Integer locateStepFlag; + //特殊步骤编码gas气体检测measures安全措施确认delay延时监火 + private String specialStepCode; + //sign_step_flag == 1 在那个步骤选人 + private Integer selectSignStep; + //是否可以添加安全措施 + private Integer measuresStepFlag; + //0无分支1有分支开始2有分支结束 + private Integer branchFlag; + //branch_flag == 1 分支节点 + private Integer branchStep; + //step_type == 2 分支节点合并节点 + private Integer branchMergeStep; + //分支排序 示例10-1-5 + private Integer stepOrder; + //是否可跳过1是 + private Integer canSkip; + //can_skip == 1 跳过条件 示例 age == 20 + private String skipCondition; + + public TaskLogE(TaskLogE log) { + this.taskLogId = log.getTaskLogId(); + this.workId = log.getWorkId(); + this.taskId = log.getTaskId(); + this.stepId = log.getStepId(); + this.stepName = log.getStepName(); + this.nextStep = log.getNextStep(); + this.nextStepName = log.getNextStepName(); + this.status = log.getStatus(); + this.signPath = log.getSignPath(); + this.workType = log.getWorkType(); + this.corpinfoId = log.getCorpinfoId(); + this.checkNo = log.getCheckNo(); + this.actorField = log.getActorField(); + this.multipleFlag = log.getMultipleFlag(); + this.stepType = log.getStepType(); + this.signStepFlag = log.getSignStepFlag(); + this.fileStepFlag = log.getFileStepFlag(); + this.locateStepFlag = log.getLocateStepFlag(); + this.specialStepCode = log.getSpecialStepCode(); + this.selectSignStep = log.getSelectSignStep(); + this.measuresStepFlag = log.getMeasuresStepFlag(); + this.branchFlag = log.getBranchFlag(); + this.branchStep = log.getBranchStep(); + this.branchMergeStep = log.getBranchMergeStep(); + this.stepOrder = log.getStepOrder(); + this.canSkip = log.getCanSkip(); + this.skipCondition = log.getSkipCondition(); + + } + + public void setSign(String actorField,Long actUserDepartment,String actUserDepartmentName,Long actUser,String createName){ + this.actorField = actorField; + this.actUserDepartment = actUserDepartment; + this.actUserDepartmentName = actUserDepartmentName; + this.actUser = actUser; + this.actUserName = createName; + } +} + diff --git a/web-domain/src/main/java/com/zcloud/eightwork/domain/model/TodoCountE.java b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/TodoCountE.java new file mode 100644 index 0000000..8245728 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/TodoCountE.java @@ -0,0 +1,16 @@ +package com.zcloud.eightwork.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author fangjiakai + * @date 2025/11/20 9:51 + */ +@Data +public class TodoCountE extends BaseE { + private String workType; + private Integer stepId; + private Long todoCount; +} diff --git a/web-domain/src/main/java/com/zcloud/eightwork/domain/model/enums/MenuEnum.java b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/enums/MenuEnum.java new file mode 100644 index 0000000..8ac4761 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/enums/MenuEnum.java @@ -0,0 +1,58 @@ +package com.zcloud.eightwork.domain.model.enums; + +import lombok.Getter; + +import java.util.Arrays; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * @author zhangyue + * @date 2025/12/6 13:48 + */ +@Getter +public enum MenuEnum { + + FIREWORK_LIST("/hidden/container/branchCompany/average/ledger/list", "hidden-tz-fgs"), + SPACEWORK_LIST("/hidden/container/branchCompany/average/ignore/list", "hidden-hl-fgs"), + HIDDEN_QR_FGS("/hidden/container/branchCompany/average/confirm/list", "hidden-qr-fgs"), + HIDDEN_YS_FGS("/hidden/container/branchCompany/average/acceptance/list", "hidden-ys-fgs"), + HIDDEN_YQ_FGS("/hidden/container/branchCompany/average/postponement/list", "hidden-yq-fgs"), + HIDDEN_ZG_FGS("/hidden/container/branchCompany/average/rectification/list", "hidden-zg-fgs"), + HIDDEN_TSCZ_FGS("/hidden/container/branchCompany/average/specialDisposal/list", "hidden-tscz-fgs"), + HIDDEN_YHQRR_FGS("/hidden/container/branchCompany/average/confirmUser", "hidden-yhqrr-fgs") + ; + + private final String path; + private final String menuKey; + + private static final Map PATH_MAP = + Arrays.stream(values()) + .collect(Collectors.toMap(MenuEnum::getPath, Function.identity())); + + MenuEnum(String path, String menuKey) { + this.path = path; + this.menuKey = menuKey; + } + + public String getPath() { + return path; + } + + public String getMenuKey() { + return menuKey; + } + + // 通过name获取枚举 + public static MenuEnum getByPath(String path) { + return PATH_MAP.get(path); + } + + // 通过path获取age + public static String getMenuKeyByPath(String path) { + MenuEnum entry = PATH_MAP.get(path); + return entry != null ? entry.getMenuKey() : null; + } + +} diff --git a/web-domain/src/main/java/com/zcloud/eightwork/domain/model/enums/WorkCodeEnum.java b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/enums/WorkCodeEnum.java new file mode 100644 index 0000000..37ff8a7 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/eightwork/domain/model/enums/WorkCodeEnum.java @@ -0,0 +1,48 @@ +package com.zcloud.eightwork.domain.model.enums; + +import lombok.Getter; + +import java.util.Arrays; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * @author fangjiakai + * @date 2026/03/09 15:24 + */ +@Getter +public enum WorkCodeEnum { + HOT_WORK("hot_work", "DH"), + BLINDBOARD_WORK("blindboard_work", "MBCD"), + BREAKGROUND_WORK("breakground_work", "DT"), + CONFINEDSPACE_WORK("confinedspace_work", "SXKJ"), + CUTROAD_WORK("cutroad_work", "DL"), + ELECTRICITY_WORK("electricity_work", "LSYD"), + HIGH_WORK("high_work", "GC"), + HOISTING("hoisting_work", "DZ"); + private final String workType; + private final String code; + + private static final Map CODE_MAP = + Arrays.stream(values()) + .collect(Collectors.toMap(WorkCodeEnum::getWorkType, Function.identity())); + + WorkCodeEnum(String workType, String code) { + this.workType = workType; + this.code = code; + } + + public String getWorkType() { + return workType; + } + + public String getCode() { + return code; + } + + public static String getCodeByWorkType(String workType) { + WorkCodeEnum entry = CODE_MAP.get(workType); + return entry != null ? entry.getCode() : null; + } +} diff --git a/web-infrastructure/pom.xml b/web-infrastructure/pom.xml new file mode 100644 index 0000000..d826943 --- /dev/null +++ b/web-infrastructure/pom.xml @@ -0,0 +1,44 @@ + + + 4.0.0 + + com.zcloud.eightwork + zcloud-gbs-eightwork + 1.0-SNAPSHOT + ../pom.xml + + + + 1.0.0-SNAPSHOT + + + web-infrastructure + jar + web-infrastructure + + + + + com.zcloud.eightwork + web-domain + 1.0-SNAPSHOT + + + + com.jjb.saas + jjb-saas-application-client + + + com.jjb.saas + jjb-saas-system-client + + + com.jjb.saas + jjb-saas-auth-client + + + com.jjb.saas + jjb-saas-framework-facade + + + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/ConfinedSpaceGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/ConfinedSpaceGatewayImpl.java new file mode 100644 index 0000000..b56bea5 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/ConfinedSpaceGatewayImpl.java @@ -0,0 +1,51 @@ +package com.zcloud.eightwork.gatewayimpl; + +import com.zcloud.eightwork.domain.gateway.ConfinedSpaceGateway; +import com.zcloud.eightwork.domain.model.ConfinedSpaceE; +import com.zcloud.eightwork.persistence.dataobject.ConfinedSpaceDO; +import com.zcloud.eightwork.persistence.repository.ConfinedSpaceRepository; +import com.zcloud.gbscommon.utils.Tools; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-27 10:26:34 + */ +@Service +@AllArgsConstructor +public class ConfinedSpaceGatewayImpl implements ConfinedSpaceGateway { + private final ConfinedSpaceRepository confinedSpaceRepository; + + @Override + public Boolean add(ConfinedSpaceE confinedSpaceE) { + ConfinedSpaceDO d = new ConfinedSpaceDO(Tools.get32UUID()); + BeanUtils.copyProperties(confinedSpaceE, d, "confinedSpaceId"); + confinedSpaceRepository.save(d); + return true; + } + + @Override + public Boolean update(ConfinedSpaceE confinedSpaceE) { + ConfinedSpaceDO d = new ConfinedSpaceDO(); + BeanUtils.copyProperties(confinedSpaceE, d); + confinedSpaceRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedConfinedSpaceById(Long id) { + return confinedSpaceRepository.removeById(id); + } + + @Override + public Boolean deletedConfinedSpaceByIds(Long[] ids) { + return confinedSpaceRepository.removeByIds(Collections.singletonList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/EightworkInfoGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/EightworkInfoGatewayImpl.java new file mode 100644 index 0000000..27535f8 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/EightworkInfoGatewayImpl.java @@ -0,0 +1,51 @@ +package com.zcloud.eightwork.gatewayimpl; + +import com.zcloud.eightwork.domain.gateway.EightworkInfoGateway; +import com.zcloud.eightwork.domain.model.EightworkInfoE; +import com.zcloud.eightwork.persistence.dataobject.EightworkInfoDO; +import com.zcloud.eightwork.persistence.repository.EightworkInfoRepository; +import com.zcloud.gbscommon.utils.Tools; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-12 10:58:53 + */ +@Service +@AllArgsConstructor +public class EightworkInfoGatewayImpl implements EightworkInfoGateway { + private final EightworkInfoRepository eightworkInfoRepository; + + @Override + public Boolean add(EightworkInfoE eightworkInfoE) { + EightworkInfoDO d = new EightworkInfoDO(Tools.get32UUID()); + BeanUtils.copyProperties(eightworkInfoE, d, "workId"); + eightworkInfoRepository.save(d); + return true; + } + + @Override + public Boolean update(EightworkInfoE eightworkInfoE) { + EightworkInfoDO d = new EightworkInfoDO(); + BeanUtils.copyProperties(eightworkInfoE, d); + eightworkInfoRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedEightworkInfoById(Long id) { + return eightworkInfoRepository.removeById(id); + } + + @Override + public Boolean deletedEightworkInfoByIds(Long[] ids) { + return eightworkInfoRepository.removeByIds(Collections.singletonList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/EightworkStepGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/EightworkStepGatewayImpl.java new file mode 100644 index 0000000..b5f67fb --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/EightworkStepGatewayImpl.java @@ -0,0 +1,51 @@ +package com.zcloud.eightwork.gatewayimpl; + +import com.zcloud.eightwork.domain.gateway.EightworkStepGateway; +import com.zcloud.eightwork.domain.model.EightworkStepE; +import com.zcloud.eightwork.persistence.dataobject.EightworkStepDO; +import com.zcloud.eightwork.persistence.repository.EightworkStepRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.Collections; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:20 + */ +@Service +@AllArgsConstructor +public class EightworkStepGatewayImpl implements EightworkStepGateway { + private final EightworkStepRepository eightworkStepRepository; + + @Override + public Boolean add(EightworkStepE eightworkStepE) { + EightworkStepDO d = new EightworkStepDO(); + BeanUtils.copyProperties(eightworkStepE, d); + eightworkStepRepository.save(d); + return true; + } + + @Override + public Boolean update(EightworkStepE eightworkStepE) { + EightworkStepDO d = new EightworkStepDO(); + BeanUtils.copyProperties(eightworkStepE, d); + eightworkStepRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedEightworkStepById(Long id) { + return eightworkStepRepository.removeById(id); + } + + @Override + public Boolean deletedEightworkStepByIds(Long[] ids) { + return eightworkStepRepository.removeByIds(Collections.singletonList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/EightworkSupplementaryInfoGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/EightworkSupplementaryInfoGatewayImpl.java new file mode 100644 index 0000000..d9d9f5b --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/EightworkSupplementaryInfoGatewayImpl.java @@ -0,0 +1,52 @@ +package com.zcloud.eightwork.gatewayimpl; + +import com.zcloud.eightwork.domain.gateway.EightworkSupplementaryInfoGateway; +import com.zcloud.eightwork.domain.model.EightworkSupplementaryInfoE; +import com.zcloud.eightwork.persistence.dataobject.EightworkSupplementaryInfoDO; +import com.zcloud.eightwork.persistence.repository.EightworkSupplementaryInfoRepository; +import com.zcloud.gbscommon.utils.Tools; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-20 10:38:36 + */ +@Service +@AllArgsConstructor +public class EightworkSupplementaryInfoGatewayImpl implements EightworkSupplementaryInfoGateway { + private final EightworkSupplementaryInfoRepository eightworkSupplementaryInfoRepository; + + @Override + public Boolean add(EightworkSupplementaryInfoE eightworkSupplementaryInfoE) { + EightworkSupplementaryInfoDO d = new EightworkSupplementaryInfoDO(Tools.get32UUID()); + BeanUtils.copyProperties(eightworkSupplementaryInfoE, d, "supplementaryInfoId","details"); + d.setDetails(eightworkSupplementaryInfoE.getDetails().toJSONString()); + eightworkSupplementaryInfoRepository.save(d); + return true; + } + + @Override + public Boolean update(EightworkSupplementaryInfoE eightworkSupplementaryInfoE) { + EightworkSupplementaryInfoDO d = new EightworkSupplementaryInfoDO(); + BeanUtils.copyProperties(eightworkSupplementaryInfoE, d); + eightworkSupplementaryInfoRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedEightworkSupplementaryInfoById(Long id) { + return eightworkSupplementaryInfoRepository.removeById(id); + } + + @Override + public Boolean deletedEightworkSupplementaryInfoByIds(Long[] ids) { + return eightworkSupplementaryInfoRepository.removeByIds(Collections.singletonList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/EightworkTaskGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/EightworkTaskGatewayImpl.java new file mode 100644 index 0000000..df06351 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/EightworkTaskGatewayImpl.java @@ -0,0 +1,51 @@ +package com.zcloud.eightwork.gatewayimpl; + +import com.zcloud.eightwork.domain.gateway.EightworkTaskGateway; +import com.zcloud.eightwork.domain.model.EightworkTaskE; +import com.zcloud.eightwork.persistence.dataobject.EightworkTaskDO; +import com.zcloud.eightwork.persistence.repository.EightworkTaskRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.Collections; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:38 + */ +@Service +@AllArgsConstructor +public class EightworkTaskGatewayImpl implements EightworkTaskGateway { + private final EightworkTaskRepository eightworkTaskRepository; + + @Override + public Boolean add(EightworkTaskE eightworkTaskE) { + EightworkTaskDO d = new EightworkTaskDO(); + BeanUtils.copyProperties(eightworkTaskE, d); + eightworkTaskRepository.save(d); + return true; + } + + @Override + public Boolean update(EightworkTaskE eightworkTaskE) { + EightworkTaskDO d = new EightworkTaskDO(); + BeanUtils.copyProperties(eightworkTaskE, d); + eightworkTaskRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedEightworkTaskById(Long id) { + return eightworkTaskRepository.removeById(id); + } + + @Override + public Boolean deletedEightworkTaskByIds(Long[] ids) { + return eightworkTaskRepository.removeByIds(Collections.singletonList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/MeasuresGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/MeasuresGatewayImpl.java new file mode 100644 index 0000000..b431bd1 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/MeasuresGatewayImpl.java @@ -0,0 +1,50 @@ +package com.zcloud.eightwork.gatewayimpl; + +import com.zcloud.eightwork.domain.gateway.MeasuresGateway; +import com.zcloud.eightwork.domain.model.MeasuresE; +import com.zcloud.eightwork.persistence.dataobject.MeasuresDO; +import com.zcloud.eightwork.persistence.repository.MeasuresRepository; +import com.zcloud.gbscommon.utils.Tools; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Arrays; + +/** +* web-infrastructure +* @Author fangjiakai +* @Date 2025-11-11 11:30:46 +*/ +@Service +@AllArgsConstructor +public class MeasuresGatewayImpl implements MeasuresGateway { + private final MeasuresRepository measuresRepository; + + @Override + public Boolean add(MeasuresE measuresE) { + MeasuresDO d = new MeasuresDO(); + BeanUtils.copyProperties(measuresE, d); + measuresRepository.save(d); + return true; + } + + @Override + public Boolean update(MeasuresE measuresE) { + MeasuresDO d = new MeasuresDO(); + BeanUtils.copyProperties(measuresE, d); + measuresRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedMeasuresById(Long id) { + return measuresRepository.removeById(id); + } + + @Override + public Boolean deletedMeasuresByIds(Long[] ids) { + return measuresRepository.removeByIds(Arrays.asList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/MeasuresLogsGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/MeasuresLogsGatewayImpl.java new file mode 100644 index 0000000..3c93fb5 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/MeasuresLogsGatewayImpl.java @@ -0,0 +1,50 @@ +package com.zcloud.eightwork.gatewayimpl; + +import com.zcloud.eightwork.domain.gateway.MeasuresLogsGateway; +import com.zcloud.eightwork.domain.model.MeasuresLogsE; +import com.zcloud.eightwork.persistence.dataobject.MeasuresLogsDO; +import com.zcloud.eightwork.persistence.repository.MeasuresLogsRepository; +import com.zcloud.gbscommon.utils.Tools; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Arrays; + +/** +* web-infrastructure +* @Author fangjiakai +* @Date 2025-11-11 11:30:49 +*/ +@Service +@AllArgsConstructor +public class MeasuresLogsGatewayImpl implements MeasuresLogsGateway { + private final MeasuresLogsRepository measuresLogsRepository; + + @Override + public Boolean add(MeasuresLogsE measuresLogsE) { + MeasuresLogsDO d = new MeasuresLogsDO(); + BeanUtils.copyProperties(measuresLogsE, d); + measuresLogsRepository.save(d); + return true; + } + + @Override + public Boolean update(MeasuresLogsE measuresLogsE) { + MeasuresLogsDO d = new MeasuresLogsDO(); + BeanUtils.copyProperties(measuresLogsE, d); + measuresLogsRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedMeasuresLogsById(Long id) { + return measuresLogsRepository.removeById(id); + } + + @Override + public Boolean deletedMeasuresLogsByIds(Long[] ids) { + return measuresLogsRepository.removeByIds(Arrays.asList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/TaskFlowGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/TaskFlowGatewayImpl.java new file mode 100644 index 0000000..4c6b041 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/TaskFlowGatewayImpl.java @@ -0,0 +1,63 @@ +package com.zcloud.eightwork.gatewayimpl; + +import com.zcloud.eightwork.domain.gateway.TaskFlowGateway; +import com.zcloud.eightwork.domain.model.TaskFlowE; +import com.zcloud.eightwork.persistence.dataobject.TaskFlowDO; +import com.zcloud.eightwork.persistence.repository.TaskFlowRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:50 + */ +@Service +@AllArgsConstructor +public class TaskFlowGatewayImpl implements TaskFlowGateway { + private final TaskFlowRepository taskFlowRepository; + + @Override + public Boolean add(TaskFlowE taskFlowE) { + TaskFlowDO d = new TaskFlowDO(); + BeanUtils.copyProperties(taskFlowE, d); + taskFlowRepository.save(d); + return true; + } + + @Override + public Boolean update(TaskFlowE taskFlowE) { + TaskFlowDO d = new TaskFlowDO(); + BeanUtils.copyProperties(taskFlowE, d); + taskFlowRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedTaskFlowById(Long id) { + return taskFlowRepository.removeById(id); + } + + @Override + public Boolean deletedTaskFlowByIds(Long[] ids) { + return taskFlowRepository.removeByIds(Collections.singletonList(ids)); + } + + @Override + public List listAllByWorkType(String workType, String workLevel){ + List list = taskFlowRepository.listAllByWorkType(workType, workLevel); + return list.stream().map(d -> { + TaskFlowE taskFlowE = new TaskFlowE(); + BeanUtils.copyProperties(d, taskFlowE); + return taskFlowE; + }).collect(Collectors.toList()); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/TaskLogGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/TaskLogGatewayImpl.java new file mode 100644 index 0000000..70094ff --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/gatewayimpl/TaskLogGatewayImpl.java @@ -0,0 +1,75 @@ +package com.zcloud.eightwork.gatewayimpl; + +import com.zcloud.eightwork.domain.gateway.TaskLogGateway; +import com.zcloud.eightwork.domain.model.TaskFlowE; +import com.zcloud.eightwork.domain.model.TaskLogE; +import com.zcloud.eightwork.persistence.dataobject.TaskFlowDO; +import com.zcloud.eightwork.persistence.dataobject.TaskLogDO; +import com.zcloud.eightwork.persistence.repository.TaskLogRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:53 + */ +@Service +@AllArgsConstructor +public class TaskLogGatewayImpl implements TaskLogGateway { + private final TaskLogRepository taskLogRepository; + + @Override + public Boolean add(TaskLogE taskLogE) { + TaskLogDO d = new TaskLogDO(); + BeanUtils.copyProperties(taskLogE, d); + taskLogRepository.save(d); + return true; + } + + @Override + public Boolean addBatch(List taskLogE) { + taskLogRepository.saveBatch(taskLogE.stream().map(taskLogE1 -> { + TaskLogDO d = new TaskLogDO(); + BeanUtils.copyProperties(taskLogE1, d); + return d; + }).collect(Collectors.toList())); + return true; + } + + @Override + public Boolean update(TaskLogE taskLogE) { + TaskLogDO d = new TaskLogDO(); + BeanUtils.copyProperties(taskLogE, d); + taskLogRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedTaskLogById(Long id) { + return taskLogRepository.removeById(id); + } + + @Override + public Boolean deletedTaskLogByIds(Long[] ids) { + return taskLogRepository.removeByIds(Collections.singletonList(ids)); + } + + @Override + public List listAllByWorkId(String workId){ + List list = taskLogRepository.listAllByWorkId(workId); + return list.stream().map(d -> { + TaskLogE taskLog = new TaskLogE(); + BeanUtils.copyProperties(d, taskLog); + return taskLog; + }).collect(Collectors.toList()); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/ConfinedSpaceDO.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/ConfinedSpaceDO.java new file mode 100644 index 0000000..1527179 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/ConfinedSpaceDO.java @@ -0,0 +1,75 @@ +package com.zcloud.eightwork.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-27 10:26:34 + */ +@Data +@TableName("confined_space") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class ConfinedSpaceDO extends BaseDO { + //企业 + @ApiModelProperty(value = "企业") + private Long corpinfoId; + //空间名称 + @ApiModelProperty(value = "空间名称") + private String name; + //唯一编号 + @ApiModelProperty(value = "唯一编号") + private String code; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String confinedSpaceId; + //空间类型 + @ApiModelProperty(value = "空间类型") + private String type; + //空间类型名称 + @ApiModelProperty(value = "空间类型名称") + private String typeName; + //主要介质 + @ApiModelProperty(value = "主要介质") + private String medium; + //危险因素 + @ApiModelProperty(value = "危险因素") + private String hazards; + //风险等级 + @ApiModelProperty(value = "风险等级") + private String riskLevel; + //风险等级名称 + @ApiModelProperty(value = "风险等级名称") + private String riskLevelName; + //防护要求 + @ApiModelProperty(value = "防护要求") + private String protectionRequirements; + //隔绝安全措施 + @ApiModelProperty(value = "隔绝安全措施") + private String separateSafetyMeasures; + //最大作业人数 + @ApiModelProperty(value = "最大作业人数") + private Integer maximumNumber; + //是否有应急指导书，0否1是 + @ApiModelProperty(value = "是否有应急指导书，0否1是") + private Integer isEmergencyBook; + //位置及范围 + @ApiModelProperty(value = "位置及范围") + private String position; + //所属部门 + @ApiModelProperty(value = "所属部门") + private Long departmentId; + + public ConfinedSpaceDO(String confinedSpaceId) { + this.confinedSpaceId = confinedSpaceId; + } + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/ConfinedSpaceMapper.xml b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/ConfinedSpaceMapper.xml new file mode 100644 index 0000000..6fe9f7c --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/ConfinedSpaceMapper.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/EightworkInfoDO.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/EightworkInfoDO.java new file mode 100644 index 0000000..c2c12da --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/EightworkInfoDO.java @@ -0,0 +1,82 @@ +package com.zcloud.eightwork.persistence.dataobject; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.auth.utils.AuthContext; +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 fangjiakai + * @Date 2025-11-12 10:58:53 + */ +@Data +@TableName("eightwork_info") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class EightworkInfoDO extends BaseDO { + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String workId; + //企业 + @ApiModelProperty(value = "企业") + private Long corpinfoId; + //是否相关方1是 + @ApiModelProperty(value = "是否相关方1是") + private Integer xgfFlag; + //所属项目 + @ApiModelProperty(value = "所属项目") + private String projectId; + //相关方id + @ApiModelProperty(value = "相关方id") + private Long xgfId; + //票号 + @ApiModelProperty(value = "票号") + private String checkNo; + //工作类型 + @ApiModelProperty(value = "工作类型") + private String workType; + //级别 + @ApiModelProperty(value = "级别") + private String workLevel; + //当前步骤 + @ApiModelProperty(value = "当前步骤") + private String currentStep; + //状态 + @ApiModelProperty(value = "状态") + private Integer status; + //详细信息 + @ApiModelProperty(value = "详细信息") + private String info; + + @ApiModelProperty(value = "部门id", name = "departmentId") + private Long departmentId; + + public EightworkInfoDO(String workId) { + this.workId = workId; + } + + public EightworkInfoDO(String uuid, String workType, String workLevel, Long corpinfoId, Integer xgfFlag, String projectId, Long xgfId, String checkNo, Integer status, JSONObject info,Long departmentId) { + this.workId = uuid; + this.workType = workType; + this.workLevel = workLevel; + if (corpinfoId != null) { + this.corpinfoId = corpinfoId; + } else { + this.corpinfoId = AuthContext.getCompanyId(); + } + this.xgfFlag = xgfFlag; + this.projectId = projectId; + this.xgfId = xgfId; + this.checkNo = checkNo; + this.status = status; + this.info = info.toJSONString(); + this.departmentId = departmentId; + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/EightworkStepDO.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/EightworkStepDO.java new file mode 100644 index 0000000..bacd81c --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/EightworkStepDO.java @@ -0,0 +1,26 @@ +package com.zcloud.eightwork.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.*; +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 fangjiakai + * @Date 2025-11-05 09:53:17 + */ +@Data +@TableName("eightwork_step") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class EightworkStepDO extends BaseDO { + //步骤名称 + @ApiModelProperty(value = "步骤名称") + private String stepName; + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/EightworkSupplementaryInfoDO.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/EightworkSupplementaryInfoDO.java new file mode 100644 index 0000000..1dacf8f --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/EightworkSupplementaryInfoDO.java @@ -0,0 +1,43 @@ +package com.zcloud.eightwork.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-20 13:35:55 + */ +@Data +@TableName("eightwork_supplementary_info") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class EightworkSupplementaryInfoDO extends BaseDO { + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String supplementaryInfoId; + //流程日志id + @ApiModelProperty(value = "流程日志id") + private String taskLogId; + //工作id + @ApiModelProperty(value = "工作id") + private String workId; + //信息类型delay,gas + @ApiModelProperty(value = "信息类型delay,gas") + private String type; + //详情 + @ApiModelProperty(value = "详情") + private String details; + + + public EightworkSupplementaryInfoDO(String supplementaryInfoId) { + this.supplementaryInfoId = supplementaryInfoId; + } + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/EightworkTaskDO.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/EightworkTaskDO.java new file mode 100644 index 0000000..3273382 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/EightworkTaskDO.java @@ -0,0 +1,33 @@ +package com.zcloud.eightwork.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.*; +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 fangjiakai + * @Date 2025-11-05 09:53:38 + */ +@Data +@TableName("eightwork_task") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class EightworkTaskDO extends BaseDO { + //任务名称 + @ApiModelProperty(value = "任务名称") + private String taskName; + //任务类型 + @ApiModelProperty(value = "任务类型") + private String workType; + //作业级别 + @ApiModelProperty(value = "作业级别") + private String workLevel; + + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/MeasuresDO.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/MeasuresDO.java new file mode 100644 index 0000000..9cc28b9 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/MeasuresDO.java @@ -0,0 +1,34 @@ +package com.zcloud.eightwork.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-11 11:30:45 + */ +@Data +@TableName("measures") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class MeasuresDO extends BaseDO { + //作业类型 + @ApiModelProperty(value = "作业类型") + private String workType; + //防护措施 + @ApiModelProperty(value = "防护措施") + private String content; + //问题 &&分割 + @ApiModelProperty(value = "问题 &&分割") + private String questions; + //排序 + @ApiModelProperty(value = "排序") + private Integer orderBy; +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/MeasuresLogsDO.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/MeasuresLogsDO.java new file mode 100644 index 0000000..184010f --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/MeasuresLogsDO.java @@ -0,0 +1,51 @@ +package com.zcloud.eightwork.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import com.zcloud.eightwork.domain.model.TaskLogE; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-11 11:30:49 + */ +@Data +@TableName("measures_logs") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class MeasuresLogsDO extends BaseDO { + //作业类型 + @ApiModelProperty(value = "作业类型") + private String workType; + //防护措施 + @ApiModelProperty(value = "防护措施") + private String content; + //问题 &&分割 + @ApiModelProperty(value = "问题 &&分割") + private String questions; + //作业票id + @ApiModelProperty(value = "作业票id") + private String workId; + //答案 &&分割 + @ApiModelProperty(value = "答案 &&分割") + private String answer; + //类型1主要2其他 + @ApiModelProperty(value = "类型1主要2其他") + private Integer type; + //排序 + @ApiModelProperty(value = "排序") + private Integer orderBy; + + public MeasuresLogsDO(String measures, String workId, String workType) { + this.content = measures; + this.workId = workId; + this.workType = workType; + this.type = 2; + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/TaskFlowDO.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/TaskFlowDO.java new file mode 100644 index 0000000..129ee65 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/TaskFlowDO.java @@ -0,0 +1,83 @@ +package com.zcloud.eightwork.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotNull; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-05 16:19:44 + */ +@Data +@TableName("task_flow") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class TaskFlowDO extends BaseDO { + //任务ID + @ApiModelProperty(value = "任务ID") + private Long taskId; + //步骤ID + @ApiModelProperty(value = "步骤ID", name = "stepId", required = true) + private Long stepId; + @ApiModelProperty(value = "步骤", name = "stepName", required = true) + private String stepName; + @ApiModelProperty(value = "下一步步骤ID", name = "nextStep", required = true) + private Long nextStep; + @ApiModelProperty(value = "下一步步骤", name = "nextStepName", required = true) + private String nextStepName; + //操作人 + @ApiModelProperty(value = "操作人") + private String actorField; + // 是否多人签字1是 + @ApiModelProperty(value = "是否多人签字1是") + private Integer multipleFlag; + //1正常2分支 + @ApiModelProperty(value = "1正常2分支") + private Integer stepType; + //是否签字步骤1是 + @ApiModelProperty(value = "是否签字步骤1是") + private Integer signStepFlag; + @ApiModelProperty(value = "sign_step_flag == 1 选择级别1部门2人员") + private Integer selectLevel; + @ApiModelProperty(value = "sign_step_flag == 1 是否可选相关方0否1是") + private Integer allowXgfFlag; + @ApiModelProperty(value = "是否上传附件步骤1是") + private Integer fileStepFlag; + @ApiModelProperty(value = "是否定位步骤1是") + private Integer locateStepFlag; + @ApiModelProperty(value = "特殊步骤编码", name = "specialStepCode") + private String specialStepCode; + //sign_step_flag == 1 在那个步骤选人 + @ApiModelProperty(value = "sign_step_flag == 1 在那个步骤选人") + private Integer selectSignStep; + @ApiModelProperty(value = "是否可以添加安全措施") + private Integer measuresStepFlag; + //0无分支1有分支开始2有分支结束 + @ApiModelProperty(value = "0无分支1有分支开始2有分支结束") + private Integer branchFlag; + //branch_flag == 1 分支节点 + @ApiModelProperty(value = "branch_flag == 1 分支节点") + private Integer branchStep; + //step_type == 2 分支节点合并节点 + @ApiModelProperty(value = "step_type == 2 分支节点合并节点") + private Integer branchMergeStep; + //分支排序 示例10-1-5 + @ApiModelProperty(value = "分支排序 示例10-1-5") + private Integer stepOrder; + //是否可跳过1是 + @ApiModelProperty(value = "是否可跳过1是") + private Integer canSkip; + //can_skip == 1 跳过条件 示例 age == 20 + @ApiModelProperty(value = "can_skip == 1 跳过条件 示例 age == 20") + private String skipCondition; + + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/TaskLogDO.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/TaskLogDO.java new file mode 100644 index 0000000..a5f3fa0 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/TaskLogDO.java @@ -0,0 +1,132 @@ +package com.zcloud.eightwork.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotNull; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-08 09:22:01 + */ +@Data +@TableName("task_log") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class TaskLogDO extends BaseDO { + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String taskLogId; + //工作ID + @ApiModelProperty(value = "工作ID") + private String workId; + //任务ID + @ApiModelProperty(value = "任务ID") + private Long taskId; + //步骤ID + @ApiModelProperty(value = "步骤ID") + private Long stepId; + //步骤名称 + @ApiModelProperty(value = "步骤名称") + private String stepName; + //下一步 + @ApiModelProperty(value = "下一步") + private Long nextStep; + //下一步名称 + @ApiModelProperty(value = "下一步名称") + private String nextStepName; + //操作人部门 + @ApiModelProperty(value = "操作人部门") + private Long actUserDepartment; + //操作人部门 + @ApiModelProperty(value = "操作人部门") + private String actUserDepartmentName; + //操作人 + @ApiModelProperty(value = "操作人") + private Long actUser; + //操作人 + @ApiModelProperty(value = "操作人") + private String actUserName; + //-99未开始0进行中1通过2打回 + @ApiModelProperty(value = "-99未开始0进行中1通过2打回") + private Integer status; + //签字图片路径 + @ApiModelProperty(value = "签字图片路径") + private String signPath; + //任务类型 + @ApiModelProperty(value = "任务类型") + private String workType; + //企业ID + @ApiModelProperty(value = "企业ID") + private Long corpinfoId; + //工作票编号 + @ApiModelProperty(value = "工作票编号") + private String checkNo; + //操作人编码 + @ApiModelProperty(value = "操作人编码") + private String actorField; + //是否多人签字1是 + @ApiModelProperty(value = "是否多人签字1是") + private Integer multipleFlag; + //1正常2分支 + @ApiModelProperty(value = "1正常2分支") + private Integer stepType; + //是否签字步骤1是 + @ApiModelProperty(value = "是否签字步骤1是") + private Integer signStepFlag; + @ApiModelProperty(value = "sign_step_flag == 1 选择级别1部门2人员") + private Integer selectLevel; + @ApiModelProperty(value = "sign_step_flag == 1 是否可选相关方0否1是") + private Integer allowXgfFlag; + //是否上传附件 + @ApiModelProperty(value = "是否上传附件") + private Integer fileStepFlag; + //是否定位步骤 + @ApiModelProperty(value = "是否定位步骤") + private Integer locateStepFlag; + //特殊步骤编码gas气体检测measures安全措施确认delay延时监火 + @ApiModelProperty(value = "特殊步骤编码gas气体检测measures安全措施确认delay延时监火") + private String specialStepCode; + //sign_step_flag == 1 在那个步骤选人 + @ApiModelProperty(value = "sign_step_flag == 1 在那个步骤选人") + private Integer selectSignStep; + @ApiModelProperty(value = "是否可以添加安全措施") + private Integer measuresStepFlag; + //0无分支1有分支开始2有分支结束 + @ApiModelProperty(value = "0无分支1有分支开始2有分支结束") + private Integer branchFlag; + //branch_flag == 1 分支节点 + @ApiModelProperty(value = "branch_flag == 1 分支节点") + private Integer branchStep; + //step_type == 2 分支节点合并节点 + @ApiModelProperty(value = "step_type == 2 分支节点合并节点") + private Integer branchMergeStep; + //分支排序 示例10-1-5 + @ApiModelProperty(value = "分支排序 示例10-1-5") + private Integer stepOrder; + //是否可跳过1是 + @ApiModelProperty(value = "是否可跳过1是") + private Integer canSkip; + //can_skip == 1 跳过条件 示例 age == 20 + @ApiModelProperty(value = "can_skip == 1 跳过条件 示例 age == 20") + private String skipCondition; + + public TaskLogDO(String taskLogId) { + this.taskLogId = taskLogId; + } + + public void setSign(String actorField,Long actUserDepartment,String actUserDepartmentName,Long actUser,String createName){ + this.actorField = actorField; + this.actUserDepartment = actUserDepartment; + this.actUserDepartmentName = actUserDepartmentName; + this.actUser = actUser; + this.actUserName = createName; + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/ConfinedSpaceMapper.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/ConfinedSpaceMapper.java new file mode 100644 index 0000000..44e991f --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/ConfinedSpaceMapper.java @@ -0,0 +1,17 @@ +package com.zcloud.eightwork.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.eightwork.persistence.dataobject.ConfinedSpaceDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-27 10:26:34 + */ +@Mapper +public interface ConfinedSpaceMapper extends BaseMapper { + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/EightworkInfoMapper.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/EightworkInfoMapper.java new file mode 100644 index 0000000..57d15c9 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/EightworkInfoMapper.java @@ -0,0 +1,28 @@ +package com.zcloud.eightwork.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jjb.saas.framework.datascope.annotation.DataScope; +import com.jjb.saas.framework.datascope.annotation.DataScopes; +import com.zcloud.eightwork.persistence.dataobject.EightworkInfoDO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-12 10:58:53 + */ +@Mapper +@DataScopes({ + @DataScope(method = "listPage", menuPerms = ""), +}) +public interface EightworkInfoMapper extends BaseMapper { + + IPage listPage(Page> page, @Param("params") Map parmas, String menuPerms); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/EightworkStepMapper.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/EightworkStepMapper.java new file mode 100644 index 0000000..7b5eb44 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/EightworkStepMapper.java @@ -0,0 +1,17 @@ +package com.zcloud.eightwork.persistence.mapper; + +import com.zcloud.eightwork.persistence.dataobject.EightworkStepDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:22 + */ +@Mapper +public interface EightworkStepMapper extends BaseMapper { + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/EightworkSupplementaryInfoMapper.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/EightworkSupplementaryInfoMapper.java new file mode 100644 index 0000000..c79daed --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/EightworkSupplementaryInfoMapper.java @@ -0,0 +1,17 @@ +package com.zcloud.eightwork.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.eightwork.persistence.dataobject.EightworkSupplementaryInfoDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-20 10:38:37 + */ +@Mapper +public interface EightworkSupplementaryInfoMapper extends BaseMapper { + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/EightworkTaskMapper.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/EightworkTaskMapper.java new file mode 100644 index 0000000..e99ea7a --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/EightworkTaskMapper.java @@ -0,0 +1,17 @@ +package com.zcloud.eightwork.persistence.mapper; + +import com.zcloud.eightwork.persistence.dataobject.EightworkTaskDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:38 + */ +@Mapper +public interface EightworkTaskMapper extends BaseMapper { + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/MeasuresLogsMapper.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/MeasuresLogsMapper.java new file mode 100644 index 0000000..1fe943b --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/MeasuresLogsMapper.java @@ -0,0 +1,16 @@ +package com.zcloud.eightwork.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.eightwork.persistence.dataobject.MeasuresLogsDO; +import org.apache.ibatis.annotations.Mapper; + +/** +* web-infrastructure +* @Author fangjiakai +* @Date 2025-11-11 11:30:49 +*/ +@Mapper +public interface MeasuresLogsMapper extends BaseMapper { + + } + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/MeasuresMapper.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/MeasuresMapper.java new file mode 100644 index 0000000..b93cb5d --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/MeasuresMapper.java @@ -0,0 +1,16 @@ +package com.zcloud.eightwork.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.eightwork.persistence.dataobject.MeasuresDO; +import org.apache.ibatis.annotations.Mapper; + +/** +* web-infrastructure +* @Author fangjiakai +* @Date 2025-11-11 11:30:47 +*/ +@Mapper +public interface MeasuresMapper extends BaseMapper { + + } + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/TaskFlowMapper.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/TaskFlowMapper.java new file mode 100644 index 0000000..f554355 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/TaskFlowMapper.java @@ -0,0 +1,21 @@ +package com.zcloud.eightwork.persistence.mapper; + +import com.zcloud.eightwork.persistence.dataobject.TaskFlowDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:50 + */ +@Mapper +public interface TaskFlowMapper extends BaseMapper { + + List listAllByWorkType(@Param("workType") String workType, @Param("workLevel") String workLevel); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/TaskLogMapper.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/TaskLogMapper.java new file mode 100644 index 0000000..383d840 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/TaskLogMapper.java @@ -0,0 +1,24 @@ +package com.zcloud.eightwork.persistence.mapper; + +import com.zcloud.eightwork.domain.model.TodoCountE; +import com.zcloud.eightwork.persistence.dataobject.TaskLogDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:53 + */ +@Mapper +public interface TaskLogMapper extends BaseMapper { + + List getTodoCount(@Param("orgId") Long orgId,@Param("userId") Long userId); + + List getTodoCountForWork(@Param("orgId") Long orgId,@Param("userId") Long userId,@Param("workType") String workType); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/ConfinedSpaceRepository.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/ConfinedSpaceRepository.java new file mode 100644 index 0000000..bf53d97 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/ConfinedSpaceRepository.java @@ -0,0 +1,18 @@ +package com.zcloud.eightwork.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.eightwork.persistence.dataobject.ConfinedSpaceDO; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-27 10:26:34 + */ +public interface ConfinedSpaceRepository extends BaseRepository { + PageResponse listPage(Map params); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/EightworkInfoRepository.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/EightworkInfoRepository.java new file mode 100644 index 0000000..ce233b1 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/EightworkInfoRepository.java @@ -0,0 +1,25 @@ +package com.zcloud.eightwork.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.eightwork.persistence.dataobject.EightworkInfoDO; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-12 10:58:53 + */ +public interface EightworkInfoRepository extends BaseRepository { + PageResponse listPage(Map params); + + void updateWorkStatus(String workId,String currentStep, Integer status); + + List listAllByWorkIds(List workIds); + + Long countByWorkType(String workType); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/EightworkStepRepository.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/EightworkStepRepository.java new file mode 100644 index 0000000..d99e603 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/EightworkStepRepository.java @@ -0,0 +1,19 @@ +package com.zcloud.eightwork.persistence.repository; + +import com.zcloud.eightwork.persistence.dataobject.EightworkStepDO; +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.repository.repo.BaseRepository; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:26 + */ +public interface EightworkStepRepository extends BaseRepository { + PageResponse listPage(Map params); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/EightworkSupplementaryInfoRepository.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/EightworkSupplementaryInfoRepository.java new file mode 100644 index 0000000..c5294b9 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/EightworkSupplementaryInfoRepository.java @@ -0,0 +1,21 @@ +package com.zcloud.eightwork.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.eightwork.persistence.dataobject.EightworkSupplementaryInfoDO; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-20 10:38:37 + */ +public interface EightworkSupplementaryInfoRepository extends BaseRepository { + PageResponse listPage(Map params); + + List listAll(String workId); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/EightworkTaskRepository.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/EightworkTaskRepository.java new file mode 100644 index 0000000..3f536e6 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/EightworkTaskRepository.java @@ -0,0 +1,19 @@ +package com.zcloud.eightwork.persistence.repository; + +import com.zcloud.eightwork.persistence.dataobject.EightworkTaskDO; +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.repository.repo.BaseRepository; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:38 + */ +public interface EightworkTaskRepository extends BaseRepository { + PageResponse listPage(Map params); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/MeasuresLogsRepository.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/MeasuresLogsRepository.java new file mode 100644 index 0000000..9061214 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/MeasuresLogsRepository.java @@ -0,0 +1,20 @@ +package com.zcloud.eightwork.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.eightwork.persistence.dataobject.MeasuresLogsDO; + +import java.util.List; +import java.util.Map; + +/** +* web-infrastructure +* @Author fangjiakai +* @Date 2025-11-11 11:30:49 +*/ +public interface MeasuresLogsRepository extends BaseRepository { + PageResponse listPage(Map params); + + List listAll(String workId); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/MeasuresRepository.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/MeasuresRepository.java new file mode 100644 index 0000000..f31d432 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/MeasuresRepository.java @@ -0,0 +1,19 @@ +package com.zcloud.eightwork.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.eightwork.persistence.dataobject.MeasuresDO; + +import java.util.List; +import java.util.Map; + +/** +* web-infrastructure +* @Author fangjiakai +* @Date 2025-11-11 11:30:48 +*/ +public interface MeasuresRepository extends BaseRepository { + PageResponse listPage(Map params); + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/TaskFlowRepository.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/TaskFlowRepository.java new file mode 100644 index 0000000..973e50f --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/TaskFlowRepository.java @@ -0,0 +1,23 @@ +package com.zcloud.eightwork.persistence.repository; + +import com.zcloud.eightwork.persistence.dataobject.TaskFlowDO; +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.repository.repo.BaseRepository; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:51 + */ +public interface TaskFlowRepository extends BaseRepository { + PageResponse listPage(Map params); + + List listAllByWorkType(String workType, String workLevel); + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/TaskLogRepository.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/TaskLogRepository.java new file mode 100644 index 0000000..ffbacf6 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/TaskLogRepository.java @@ -0,0 +1,28 @@ +package com.zcloud.eightwork.persistence.repository; + +import com.zcloud.eightwork.domain.model.TodoCountE; +import com.zcloud.eightwork.persistence.dataobject.TaskFlowDO; +import com.zcloud.eightwork.persistence.dataobject.TaskLogDO; +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.repository.repo.BaseRepository; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:53 + */ +public interface TaskLogRepository extends BaseRepository { + PageResponse listPage(Map params); + + List listAllByWorkId(String workId); + + List getTodoCount(Long orgId, Long userId); + + List getTodoCountForWork(Long orgId, Long userId, String workType); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/ConfinedSpaceRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/ConfinedSpaceRepositoryImpl.java new file mode 100644 index 0000000..4717452 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/ConfinedSpaceRepositoryImpl.java @@ -0,0 +1,39 @@ +package com.zcloud.eightwork.persistence.repository.impl; + +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.repository.common.PageHelper; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.eightwork.persistence.dataobject.ConfinedSpaceDO; +import com.zcloud.eightwork.persistence.mapper.ConfinedSpaceMapper; +import com.zcloud.eightwork.persistence.repository.ConfinedSpaceRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-27 10:26:34 + */ +@Service +@RequiredArgsConstructor +public class ConfinedSpaceRepositoryImpl extends BaseRepositoryImpl implements ConfinedSpaceRepository { + private final ConfinedSpaceMapper confinedSpaceMapper; + + @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 = confinedSpaceMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/EightworkInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/EightworkInfoRepositoryImpl.java new file mode 100644 index 0000000..6d4bb84 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/EightworkInfoRepositoryImpl.java @@ -0,0 +1,69 @@ +package com.zcloud.eightwork.persistence.repository.impl; + +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jjb.saas.framework.repository.common.PageHelper; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.eightwork.domain.model.enums.MenuEnum; +import com.zcloud.eightwork.persistence.dataobject.EightworkInfoDO; +import com.zcloud.eightwork.persistence.mapper.EightworkInfoMapper; +import com.zcloud.eightwork.persistence.repository.EightworkInfoRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-12 10:58:53 + */ +@Service +@RequiredArgsConstructor +public class EightworkInfoRepositoryImpl extends BaseRepositoryImpl implements EightworkInfoRepository { + private final EightworkInfoMapper eightworkInfoMapper; + + @Override + public PageResponse listPage(Map parmas) { + Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()),Integer.parseInt(parmas.get("pageSize").toString())); + String menuPerms = ""; + if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))){ + menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString()); + } + IPage iPage = eightworkInfoMapper.listPage(page, parmas,menuPerms); + return PageHelper.pageToResponse(iPage, iPage.getRecords()); + } + + @Override + public void updateWorkStatus(String workId, String currentStep, Integer status){ + LambdaUpdateWrapper queryWrapper = new LambdaUpdateWrapper<>(); + queryWrapper.eq(EightworkInfoDO::getWorkId, workId); + if(status != null) { + queryWrapper.set(EightworkInfoDO::getStatus, status); + } + queryWrapper.set(EightworkInfoDO::getCurrentStep, currentStep); + update(queryWrapper); + } + + @Override + public List listAllByWorkIds(List workIds){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(EightworkInfoDO::getWorkId, workIds); + return list(queryWrapper); + } + + @Override + public Long countByWorkType(String workType){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(EightworkInfoDO::getWorkType, workType); + return count(queryWrapper); + } +} diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/EightworkStepRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/EightworkStepRepositoryImpl.java new file mode 100644 index 0000000..d7afad2 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/EightworkStepRepositoryImpl.java @@ -0,0 +1,39 @@ +package com.zcloud.eightwork.persistence.repository.impl; + +import com.jjb.saas.framework.repository.common.PageHelper; +import com.jjb.saas.system.client.user.facade.UserFacade; +import com.zcloud.eightwork.persistence.dataobject.EightworkStepDO; +import com.zcloud.eightwork.persistence.mapper.EightworkStepMapper; +import com.zcloud.eightwork.persistence.repository.EightworkStepRepository; +import com.alibaba.cola.dto.PageResponse; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:28 + */ +@Service +@RequiredArgsConstructor +public class EightworkStepRepositoryImpl extends BaseRepositoryImpl implements EightworkStepRepository { + private final EightworkStepMapper eightworkStepMapper; + + @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 = eightworkStepMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } +} diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/EightworkSupplementaryInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/EightworkSupplementaryInfoRepositoryImpl.java new file mode 100644 index 0000000..a4372d2 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/EightworkSupplementaryInfoRepositoryImpl.java @@ -0,0 +1,48 @@ +package com.zcloud.eightwork.persistence.repository.impl; + +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.eightwork.persistence.dataobject.EightworkSupplementaryInfoDO; +import com.zcloud.eightwork.persistence.mapper.EightworkSupplementaryInfoMapper; +import com.zcloud.eightwork.persistence.repository.EightworkSupplementaryInfoRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-20 10:38:37 + */ +@Service +@RequiredArgsConstructor +public class EightworkSupplementaryInfoRepositoryImpl extends BaseRepositoryImpl implements EightworkSupplementaryInfoRepository { + private final EightworkSupplementaryInfoMapper eightworkSupplementaryInfoMapper; + + @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 = eightworkSupplementaryInfoMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public List listAll(String workId){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(EightworkSupplementaryInfoDO::getWorkId, workId); + return list(queryWrapper); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/EightworkTaskRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/EightworkTaskRepositoryImpl.java new file mode 100644 index 0000000..eb83e31 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/EightworkTaskRepositoryImpl.java @@ -0,0 +1,39 @@ +package com.zcloud.eightwork.persistence.repository.impl; + +import com.jjb.saas.framework.repository.common.PageHelper; +import com.zcloud.eightwork.persistence.dataobject.EightworkTaskDO; +import com.zcloud.eightwork.persistence.mapper.EightworkTaskMapper; +import com.zcloud.eightwork.persistence.repository.EightworkTaskRepository; +import com.alibaba.cola.dto.PageResponse; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:38 + */ +@Service +@RequiredArgsConstructor +public class EightworkTaskRepositoryImpl extends BaseRepositoryImpl implements EightworkTaskRepository { + private final EightworkTaskMapper eightworkTaskMapper; + + @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 = eightworkTaskMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/MeasuresLogsRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/MeasuresLogsRepositoryImpl.java new file mode 100644 index 0000000..f1dcc56 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/MeasuresLogsRepositoryImpl.java @@ -0,0 +1,49 @@ +package com.zcloud.eightwork.persistence.repository.impl; + +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.eightwork.persistence.dataobject.MeasuresLogsDO; +import com.zcloud.eightwork.persistence.mapper.MeasuresLogsMapper; +import com.zcloud.eightwork.persistence.repository.MeasuresLogsRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** +* web-infrastructure +* @Author fangjiakai +* @Date 2025-11-11 11:30:49 +*/ +@Service +@RequiredArgsConstructor +public class MeasuresLogsRepositoryImpl extends BaseRepositoryImpl implements MeasuresLogsRepository { + private final MeasuresLogsMapper measuresLogsMapper; + + @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 = measuresLogsMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public List listAll(String workId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(MeasuresLogsDO::getWorkId, workId); + queryWrapper.orderByAsc(MeasuresLogsDO::getType); + queryWrapper.orderByAsc(MeasuresLogsDO::getOrderBy); + return list(queryWrapper); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/MeasuresRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/MeasuresRepositoryImpl.java new file mode 100644 index 0000000..be02e86 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/MeasuresRepositoryImpl.java @@ -0,0 +1,38 @@ +package com.zcloud.eightwork.persistence.repository.impl; + +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.repository.common.PageHelper; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.eightwork.persistence.dataobject.MeasuresDO; +import com.zcloud.eightwork.persistence.mapper.MeasuresMapper; +import com.zcloud.eightwork.persistence.repository.MeasuresRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** +* web-infrastructure +* @Author fangjiakai +* @Date 2025-11-11 11:30:48 +*/ +@Service +@RequiredArgsConstructor +public class MeasuresRepositoryImpl extends BaseRepositoryImpl implements MeasuresRepository { + private final MeasuresMapper measuresMapper; + + @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 = measuresMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/TaskFlowRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/TaskFlowRepositoryImpl.java new file mode 100644 index 0000000..6c434e5 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/TaskFlowRepositoryImpl.java @@ -0,0 +1,46 @@ +package com.zcloud.eightwork.persistence.repository.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jjb.saas.framework.repository.common.PageHelper; +import com.zcloud.eightwork.persistence.dataobject.TaskFlowDO; +import com.zcloud.eightwork.persistence.mapper.TaskFlowMapper; +import com.zcloud.eightwork.persistence.repository.TaskFlowRepository; +import com.alibaba.cola.dto.PageResponse; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:51 + */ +@Service +@RequiredArgsConstructor +public class TaskFlowRepositoryImpl extends BaseRepositoryImpl implements TaskFlowRepository { + private final TaskFlowMapper taskFlowMapper; + + @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 = taskFlowMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public List listAllByWorkType(String workType, String workLevel){ + return taskFlowMapper.listAllByWorkType(workType, workLevel); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/TaskLogRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/TaskLogRepositoryImpl.java new file mode 100644 index 0000000..54e77e8 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/TaskLogRepositoryImpl.java @@ -0,0 +1,63 @@ +package com.zcloud.eightwork.persistence.repository.impl; + +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.eightwork.domain.model.TodoCountE; +import com.zcloud.eightwork.persistence.dataobject.TaskLogDO; +import com.zcloud.eightwork.persistence.mapper.TaskLogMapper; +import com.zcloud.eightwork.persistence.repository.TaskLogRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author fangjiakai + * @Date 2025-11-05 09:53:53 + */ +@Service +@RequiredArgsConstructor +public class TaskLogRepositoryImpl extends BaseRepositoryImpl implements TaskLogRepository { + private final TaskLogMapper taskLogMapper; + + @Override + public PageResponse listPage(Map params) { + IPage iPage = new Query().getPage(params); + QueryWrapper queryWrapper = new QueryWrapper<>(); + PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + queryWrapper.and(wrapper -> wrapper.eq("act_user", params.get("userId")) + .or(wrapper1 -> wrapper1.isNull("act_user").eq("act_user_department", params.get("departmentId")))); + queryWrapper.orderByDesc("create_time"); + IPage result = taskLogMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public List listAllByWorkId(String workId) { + return list(new LambdaQueryWrapper() + .eq(TaskLogDO::getWorkId, workId) + .ne(TaskLogDO::getStatus,-1) + .orderByAsc(TaskLogDO::getStepOrder) + .orderByAsc(TaskLogDO::getCreateTime)); + } + + @Override + public List getTodoCount(Long orgId, Long userId){ + return taskLogMapper.getTodoCount(orgId, userId); + } + + @Override + public List getTodoCountForWork(Long orgId, Long userId, String workType){ + return taskLogMapper.getTodoCountForWork(orgId, userId, workType); + } +} + diff --git a/web-infrastructure/src/main/resources/mapper/EightworkInfoMapper.xml b/web-infrastructure/src/main/resources/mapper/EightworkInfoMapper.xml new file mode 100644 index 0000000..064a307 --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/EightworkInfoMapper.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/EightworkStepMapper.xml b/web-infrastructure/src/main/resources/mapper/EightworkStepMapper.xml new file mode 100644 index 0000000..697db00 --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/EightworkStepMapper.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/EightworkSupplementaryInfoMapper.xml b/web-infrastructure/src/main/resources/mapper/EightworkSupplementaryInfoMapper.xml new file mode 100644 index 0000000..6024035 --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/EightworkSupplementaryInfoMapper.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/EightworkTaskMapper.xml b/web-infrastructure/src/main/resources/mapper/EightworkTaskMapper.xml new file mode 100644 index 0000000..e9d7f64 --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/EightworkTaskMapper.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/MeasuresLogsMapper.xml b/web-infrastructure/src/main/resources/mapper/MeasuresLogsMapper.xml new file mode 100644 index 0000000..235a6f8 --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/MeasuresLogsMapper.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/MeasuresMapper.xml b/web-infrastructure/src/main/resources/mapper/MeasuresMapper.xml new file mode 100644 index 0000000..cb900e9 --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/MeasuresMapper.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/TaskFlowMapper.xml b/web-infrastructure/src/main/resources/mapper/TaskFlowMapper.xml new file mode 100644 index 0000000..8966041 --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/TaskFlowMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/TaskLogMapper.xml b/web-infrastructure/src/main/resources/mapper/TaskLogMapper.xml new file mode 100644 index 0000000..d7799f0 --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/TaskLogMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + diff --git a/web-infrastructure/src/main/resources/mybatis/mybatis-config.xml b/web-infrastructure/src/main/resources/mybatis/mybatis-config.xml new file mode 100644 index 0000000..f7c8d88 --- /dev/null +++ b/web-infrastructure/src/main/resources/mybatis/mybatis-config.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file