From 34c34f4b29f731ba9bf28557f03134c0166135d2 Mon Sep 17 00:00:00 2001 From: fangjiakai <450850793@qq.com> Date: Thu, 12 Mar 2026 10:27:13 +0800 Subject: [PATCH] =?UTF-8?q?feat(taskflow):=20=E6=B7=BB=E5=8A=A0=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E6=AD=A5=E9=AA=A4=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=B9=B6=E6=9B=B4=E6=96=B0=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增getFlowByWorkType接口用于获取指定作业类型的步骤信息 - 在TaskFlowController中添加/getFlowByWorkType/{workType} REST端点 - 实现TaskFlowQueryExe中的getFlowByWorkType业务逻辑 - 更新nacos.yml配置文件，设置环境为prod并添加用户名密码认证 - 修改sdk.yml中的app-key和uri配置，将负载均衡改为直连模式 - 在EightworkInfo相关DTO和实体类中新增gasFlag字段支持气体检测标识 - 在MeasuresLogs相关DTO和实体类中新增signPath字段支持签字功能 - 在TaskLogPageQry中新增eqCurrentStep字段用于当前步骤查询 - 更新.gitignore文件，忽略nacos和templates目录 --- .gitignore | 4 +++- start/src/main/resources/nacos.yml | 6 +++++- start/src/main/resources/sdk.yml | 6 +++--- .../eightwork/web/TaskFlowController.java | 7 +++++++ .../command/query/TaskFlowQueryExe.java | 18 +++++++++++++++++- .../eightwork/service/TaskFlowServiceImpl.java | 5 +++++ .../zcloud/eightwork/api/TaskFlowServiceI.java | 2 ++ .../eightwork/dto/EightworkInfoAddCmd.java | 3 +++ .../eightwork/dto/EightworkInfoUpdateCmd.java | 2 ++ .../eightwork/dto/MeasuresLogsAddCmd.java | 3 +++ .../eightwork/dto/MeasuresLogsUpdateCmd.java | 2 ++ .../zcloud/eightwork/dto/TaskLogPageQry.java | 1 + .../dto/clientobject/EightworkInfoCO.java | 3 +++ .../dto/clientobject/MeasuresLogsCO.java | 3 +++ .../eightwork/domain/model/EightworkInfoE.java | 2 ++ .../eightwork/domain/model/MeasuresLogsE.java | 2 ++ .../dataobject/EightworkInfoDO.java | 3 +++ .../persistence/dataobject/MeasuresLogsDO.java | 3 +++ 18 files changed, 69 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5ff6309..b57974e 100644 --- a/.gitignore +++ b/.gitignore @@ -35,4 +35,6 @@ build/ .vscode/ ### Mac OS ### -.DS_Store \ No newline at end of file +.DS_Store +/start/src/main/resources/templates/ +/start/src/main/resources/nacos/ diff --git a/start/src/main/resources/nacos.yml b/start/src/main/resources/nacos.yml index ed7e421..f4b9628 100644 --- a/start/src/main/resources/nacos.yml +++ b/start/src/main/resources/nacos.yml @@ -11,12 +11,14 @@ spring: name: ${application.name}${application.version} profiles: # 环境配置 - active: test + active: prod cloud: nacos: config: namespace: ${nacos.namespace} server-addr: ${nacos.url} + username: nacos + password: u9Hc7tLFBY file-extension: yml shared-configs: - config-common.yml @@ -36,3 +38,5 @@ spring: discovery: server-addr: ${spring.cloud.nacos.config.server-addr} namespace: ${spring.cloud.nacos.config.namespace} + username: nacos + password: u9Hc7tLFBY diff --git a/start/src/main/resources/sdk.yml b/start/src/main/resources/sdk.yml index cffc4f1..4aad6d5 100644 --- a/start/src/main/resources/sdk.yml +++ b/start/src/main/resources/sdk.yml @@ -1,6 +1,6 @@ sdk: server: - app-key: 722091ff53dd4abba078c2a00efd4a42 + app-key: 2b6c5d517947438bab66b8da0daf68a4 client: gateway: url: ${common.gateway.network.http.external} @@ -14,7 +14,7 @@ sdk: name: ${application.cn-name}-后端 group-code: public_api strip-prefix: 0 - uri: lb://${application.name} + uri: http://${application.name} path: /${application.gateway}/** - client: system-code: ${application.name}-container @@ -25,7 +25,7 @@ sdk: name: ${application.cn-name}-前端 group-code: public_api strip-prefix: 0 - uri: lb://jjb-saas-base + uri: http://jjb-saas-base path: /${application.gateway}/container/** order: -2 openapi: 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 index 7289ee2..6517d5d 100644 --- a/web-adapter/src/main/java/com/zcloud/eightwork/web/TaskFlowController.java +++ b/web-adapter/src/main/java/com/zcloud/eightwork/web/TaskFlowController.java @@ -57,12 +57,19 @@ public class TaskFlowController { return SingleResponse.of(taskFlowService.getFlowInit(qry)); } + @ApiOperation("获取作业步骤") + @GetMapping("/getFlowByWorkType/{workType}") + public MultiResponse getFlowByWorkType(@PathVariable("workType") String workType) { + return MultiResponse.of(taskFlowService.getFlowByWorkType(workType)); + } + @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) { 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 index 2edcec5..396ead9 100644 --- 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 @@ -2,6 +2,7 @@ package com.zcloud.eightwork.command.query; import com.alibaba.cola.dto.PageResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.eightwork.command.convertor.EightworkTaskCoConvertor; import com.zcloud.eightwork.command.convertor.TaskFlowCoConvertor; @@ -36,7 +37,7 @@ public class TaskFlowQueryExe { private final TaskFlowRepository taskFlowRepository; private final TaskFlowCoConvertor taskFlowCoConvertor; private final EightworkTaskRepository eightworkTaskRepository; - private final EightworkTaskCoConvertor eightworkTaskCoConvertor; + private final EightworkTaskCoConvertor eightworkTaskCoConvertor; /** * 分页 @@ -62,6 +63,7 @@ public class TaskFlowQueryExe { )); return taskWorkInitCO; } + public TaskFlowInitCO getFlowInit(TaskFlowQryCmd qry) { List flows = taskFlowRepository.listAllByWorkType(qry.getWorkType(), qry.getWorkLevel()); TaskFlowInitCO taskFlowInitCO = new TaskFlowInitCO(); @@ -73,5 +75,19 @@ public class TaskFlowQueryExe { return taskFlowInitCO; } + + public List getFlowByWorkType(String workType) { + List taskDOs = eightworkTaskRepository.list(new LambdaQueryWrapper().eq(EightworkTaskDO::getWorkType, workType)); + List taskIds = taskDOs.stream().map(EightworkTaskDO::getId).collect(Collectors.toList()); + + List flows = taskFlowRepository.list(new QueryWrapper() + .select("DISTINCT step_id") + .select("step_name") + .in("task_id", taskIds) + .ne("step_id", 1) + .orderByAsc("step_order")); + + return taskFlowCoConvertor.converDOsToCOs(flows); + } } 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 index 9089123..7534896 100644 --- a/web-app/src/main/java/com/zcloud/eightwork/service/TaskFlowServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/eightwork/service/TaskFlowServiceImpl.java @@ -67,5 +67,10 @@ public class TaskFlowServiceImpl implements TaskFlowServiceI { public TaskFlowInitCO getFlowInit(TaskFlowQryCmd qry){ return taskFlowQueryExe.getFlowInit(qry); } + + @Override + public List getFlowByWorkType(String workType){ + return taskFlowQueryExe.getFlowByWorkType(workType); + } } 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 index df6cffc..7064ba9 100644 --- a/web-client/src/main/java/com/zcloud/eightwork/api/TaskFlowServiceI.java +++ b/web-client/src/main/java/com/zcloud/eightwork/api/TaskFlowServiceI.java @@ -31,5 +31,7 @@ public interface TaskFlowServiceI { TaskFlowInitCO getFlowInit(TaskFlowQryCmd qry); + + List getFlowByWorkType(String workType); } 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 index 032374f..9a48796 100644 --- a/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoAddCmd.java +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoAddCmd.java @@ -41,6 +41,9 @@ public class EightworkInfoAddCmd extends Command { @NotNull(message = "相关方id不能为空") private Long xgfId; + @ApiModelProperty(value = "是否需要气体检测1是2否", name = "gasFlag") + private Integer gasFlag; + @ApiModelProperty(value = "票号", name = "checkNo", required = true) @NotEmpty(message = "票号不能为空") private String checkNo; 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 index 0084499..057a731 100644 --- a/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoUpdateCmd.java @@ -42,6 +42,8 @@ public class EightworkInfoUpdateCmd extends Command { @ApiModelProperty(value = "相关方id", name = "xgfId", required = true) @NotNull(message = "相关方id不能为空") private Long xgfId; + @ApiModelProperty(value = "是否需要气体检测1是2否", name = "gasFlag") + private Integer gasFlag; @ApiModelProperty(value = "票号", name = "checkNo", required = true) @NotEmpty(message = "票号不能为空") private String checkNo; 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 index c27fe53..cdb313f 100644 --- a/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresLogsAddCmd.java +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresLogsAddCmd.java @@ -41,6 +41,9 @@ public class MeasuresLogsAddCmd extends Command { @NotEmpty(message = "答案 &&分割不能为空") private String answer; + @ApiModelProperty(value = "签字", name = "signPath") + private String signPath; + @ApiModelProperty(value = "排序", name = "orderBy", required = true) @NotNull(message = "排序不能为空") private Integer orderBy; 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 index 0d644cc..170edea 100644 --- a/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresLogsUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresLogsUpdateCmd.java @@ -39,6 +39,8 @@ public class MeasuresLogsUpdateCmd extends Command { @ApiModelProperty(value = "答案 &&分割", name = "answer", required = true) @NotEmpty(message = "答案 &&分割不能为空") private String answer; + @ApiModelProperty(value = "签字", name = "signPath") + private String signPath; @ApiModelProperty(value = "排序", name = "orderBy", required = true) @NotNull(message = "排序不能为空") private Integer orderBy; 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 index 335b738..f0903be 100644 --- a/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogPageQry.java +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogPageQry.java @@ -26,5 +26,6 @@ public class TaskLogPageQry extends PageQuery { */ private String eqWorkType; private int eqStatus; + private int eqCurrentStep; } 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 index fb2fa89..88c6822 100644 --- 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 @@ -35,6 +35,9 @@ public class EightworkInfoCO extends ClientObject { //相关方id @ApiModelProperty(value = "相关方id") private Long xgfId; + //是否需要气体检测1是2否 + @ApiModelProperty(value = "是否需要气体检测1是2否") + private Integer gasFlag; //票号 @ApiModelProperty(value = "票号") private String checkNo; 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 index 9d17265..2cb4d5f 100644 --- 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 @@ -31,6 +31,9 @@ public class MeasuresLogsCO extends ClientObject { //答案 &&分割 @ApiModelProperty(value = "答案 &&分割") private String answer; + //签字 + @ApiModelProperty(value = "签字") + private String signPath; //排序 @ApiModelProperty(value = "排序") private Integer orderBy; 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 index dd8179f..c42d230 100644 --- 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 @@ -25,6 +25,8 @@ public class EightworkInfoE extends BaseE { private String projectId; //相关方id private Long xgfId; + //是否需要气体检测1是2否 + private Integer gasFlag; //票号 private String checkNo; //工作类型 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 index 1b30d1d..9103a87 100644 --- 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 @@ -21,6 +21,8 @@ public class MeasuresLogsE extends BaseE { private String workId; //答案 &&分割 private String answer; + //签字 + private String signPath; //排序 private Integer orderBy; } 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 index 25eadfa..437f4bf 100644 --- 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 @@ -38,6 +38,9 @@ public class EightworkInfoDO extends BaseDO { //相关方id @ApiModelProperty(value = "相关方id") private Long xgfId; + //是否需要气体检测1是2否 + @ApiModelProperty(value = "是否需要气体检测1是2否") + private Integer gasFlag; //票号 @ApiModelProperty(value = "票号") private String checkNo; 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 index 184010f..18ddd7a 100644 --- 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 @@ -34,6 +34,9 @@ public class MeasuresLogsDO extends BaseDO { //答案 &&分割 @ApiModelProperty(value = "答案 &&分割") private String answer; + //签字 + @ApiModelProperty(value = "签字") + private String signPath; //类型1主要2其他 @ApiModelProperty(value = "类型1主要2其他") private Integer type;