From 8d041cda2d0185607d794f65ac34f21504a8ba22 Mon Sep 17 00:00:00 2001 From: tianxinlei Date: Mon, 25 May 2026 11:15:33 +0800 Subject: [PATCH] 5-25 fix --- start/src/main/resources/sdk.yml | 2 +- .../web/tasklist/FeedbackController.java | 8 ++++++- .../web/tasklist/TaskDetailController.java | 2 +- .../web/tasklist/TaskListController.java | 2 +- .../command/tasklist/FeedbackAddExe.java | 13 ++++++---- .../command/tasklist/TaskDetailSaveExe.java | 9 ++++--- .../command/tasklist/TaskListAddExe.java | 17 +++++-------- .../service/tasklist/TaskListServiceImpl.java | 24 ++++++++++++------- .../api/tasklist/TaskListServiceI.java | 14 ++++++++--- 9 files changed, 57 insertions(+), 34 deletions(-) diff --git a/start/src/main/resources/sdk.yml b/start/src/main/resources/sdk.yml index e7ac2f2..c8fa954 100644 --- a/start/src/main/resources/sdk.yml +++ b/start/src/main/resources/sdk.yml @@ -1,6 +1,6 @@ sdk: server: - app-key: 002db3f140fe47d1b2754856c5172bd5 + app-key: 09a491d02f9b4371968deb601898b467 client: gateway: url: ${common.gateway.network.http.external} diff --git a/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/FeedbackController.java b/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/FeedbackController.java index 1f1fad5..729b7a6 100644 --- a/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/FeedbackController.java +++ b/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/FeedbackController.java @@ -28,10 +28,16 @@ public class FeedbackController { @ApiOperation("提交反馈") @PostMapping("/save") - public SingleResponse addFeedback(@Validated @RequestBody FeedbackAddCmd cmd) { + public SingleResponse addFeedback(@Validated @RequestBody FeedbackAddCmd cmd) { return taskListService.addFeedback(cmd); } + @ApiOperation("删除反馈") + @PostMapping("/delete/{id}") + public SingleResponse deleteFeedback(@PathVariable Long id) { + return taskListService.deleteFeedback(id); + } + @ApiOperation("获取反馈周期分组列表") @PostMapping("/periodGroupList") public MultiResponse periodGroupList(@RequestBody FeedbackPeriodGroupQry qry) { diff --git a/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/TaskDetailController.java b/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/TaskDetailController.java index 7c25d20..431cbf6 100644 --- a/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/TaskDetailController.java +++ b/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/TaskDetailController.java @@ -36,7 +36,7 @@ public class TaskDetailController { @ApiOperation("新增任务") @PostMapping("/save") - public SingleResponse add(@Validated @RequestBody TaskDetailSaveCmd cmd) { + public SingleResponse add(@Validated @RequestBody TaskDetailSaveCmd cmd) { return taskListService.addTaskDetail(cmd); } diff --git a/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/TaskListController.java b/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/TaskListController.java index 58e813f..66ba6e0 100644 --- a/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/TaskListController.java +++ b/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/TaskListController.java @@ -34,7 +34,7 @@ public class TaskListController { @ApiOperation("新增任务清单") @PostMapping("/save") - public SingleResponse add(@Validated @RequestBody TaskListAddCmd cmd) { + public SingleResponse add(@Validated @RequestBody TaskListAddCmd cmd) { return taskListService.add(cmd); } diff --git a/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/FeedbackAddExe.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/FeedbackAddExe.java index 0d18802..3acaed4 100644 --- a/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/FeedbackAddExe.java +++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/FeedbackAddExe.java @@ -1,7 +1,6 @@ package com.zcloud.safetyDutyList.command.tasklist; import com.alibaba.cola.exception.BizException; -import com.zcloud.safetyDutyList.domain.enums.FeedbackStatusEnum; import com.zcloud.safetyDutyList.domain.gateway.tasklist.FeedbackGateway; import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskDetailGateway; import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskListGateway; @@ -21,9 +20,10 @@ import java.time.LocalDateTime; * 反馈新增执行器 *

* 处理提交执行反馈的业务逻辑： - * 1. 创建反馈实体并初始化 - * 2. 若未指定反馈状态，默认设置为正常 + * 1. 校验任务和清单是否存在且已下发 + * 2. 创建反馈实体并初始化，自动生成周期标识 * 3. 保存反馈记录 + * 4. 返回新增后的反馈信息 */ @Component @AllArgsConstructor @@ -32,7 +32,7 @@ public class FeedbackAddExe { private final TaskListGateway taskListGateway; private final TaskDetailGateway taskDetailGateway; - public Boolean execute(FeedbackAddCmd cmd) { + public FeedbackCO execute(FeedbackAddCmd cmd) { TaskDetailE detailE = taskDetailGateway.getByTaskDetailId(cmd.getTaskDetailId()); if (detailE == null) { @@ -59,6 +59,9 @@ public class FeedbackAddExe { if (!res) { throw new BizException("反馈保存失败"); } - return true; + + FeedbackCO co = new FeedbackCO(); + BeanUtils.copyProperties(feedbackE, co); + return co; } } diff --git a/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskDetailSaveExe.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskDetailSaveExe.java index 2c325ba..7e77cb7 100644 --- a/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskDetailSaveExe.java +++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskDetailSaveExe.java @@ -21,6 +21,7 @@ import java.util.List; * 1. 查询该清单下已有任务详情，计算总分 * 2. 校验新增后清单总分不超过100分 * 3. 创建任务详情实体并保存 + * 4. 返回新增后的任务详情信息 */ @Component @AllArgsConstructor @@ -28,14 +29,13 @@ public class TaskDetailSaveExe { private final TaskDetailGateway taskDetailGateway; private final TaskListGateway taskListGateway; - public Boolean execute(TaskDetailSaveCmd cmd) { + public TaskDetailCO execute(TaskDetailSaveCmd cmd) { List existDetails = taskDetailGateway.listByTaskListId(cmd.getTaskListId()); BigDecimal totalScore = existDetails.stream() .map(TaskDetailE::getTaskScore) .filter(s -> s != null) .reduce(BigDecimal.ZERO, BigDecimal::add); - // 当前任务可设置的最大分值 BigDecimal diff = new BigDecimal("100").subtract(totalScore); if (cmd.getTaskScore() != null) { @@ -54,6 +54,9 @@ public class TaskDetailSaveExe { if (!res) { throw new BizException("保存失败"); } - return true; + + TaskDetailCO co = new TaskDetailCO(); + BeanUtils.copyProperties(detailE, co); + return co; } } diff --git a/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListAddExe.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListAddExe.java index c080d7d..74f0688 100644 --- a/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListAddExe.java +++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListAddExe.java @@ -1,39 +1,31 @@ package com.zcloud.safetyDutyList.command.tasklist; import com.alibaba.cola.exception.BizException; -import com.zcloud.safetyDutyList.domain.enums.SwitchFlagEnum; import com.zcloud.safetyDutyList.domain.enums.TaskStatusEnum; -import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskDetailGateway; import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskListGateway; -import com.zcloud.safetyDutyList.domain.model.tasklist.TaskDetailE; import com.zcloud.safetyDutyList.domain.model.tasklist.TaskListE; import com.zcloud.safetyDutyList.dto.clientobject.tasklist.TaskListCO; -import com.zcloud.safetyDutyList.dto.tasklist.TaskDetailAddCmd; import com.zcloud.safetyDutyList.dto.tasklist.TaskListAddCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.List; - /** * 清单新增执行器 *

* 处理新增安全责任清单的业务逻辑： * 1. 创建清单实体，初始化状态为进行中、开关为开启、下发状态为未下发 * 2. 保存清单到数据库 - * 3. 遍历命令中的任务详情列表，创建任务详情实体并批量保存 + * 3. 返回新增后的清单信息 */ @Component @AllArgsConstructor public class TaskListAddExe { private final TaskListGateway taskListGateway; - private final TaskDetailGateway taskDetailGateway; @Transactional(rollbackFor = Exception.class) - public Boolean execute(TaskListAddCmd cmd) { + public TaskListCO execute(TaskListAddCmd cmd) { TaskListE taskListE = new TaskListE(); BeanUtils.copyProperties(cmd, taskListE); taskListE.init(); @@ -43,6 +35,9 @@ public class TaskListAddExe { if (!res) { throw new BizException("保存失败"); } - return true; + + TaskListCO co = new TaskListCO(); + BeanUtils.copyProperties(taskListE, co); + return co; } } diff --git a/web-app/src/main/java/com/zcloud/safetyDutyList/service/tasklist/TaskListServiceImpl.java b/web-app/src/main/java/com/zcloud/safetyDutyList/service/tasklist/TaskListServiceImpl.java index 95af698..e972f27 100644 --- a/web-app/src/main/java/com/zcloud/safetyDutyList/service/tasklist/TaskListServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/safetyDutyList/service/tasklist/TaskListServiceImpl.java @@ -45,6 +45,8 @@ public class TaskListServiceImpl implements TaskListServiceI { private final TaskDetailUpdateScoreExe taskDetailUpdateScoreExe; /** 反馈新增执行器 */ private final FeedbackAddExe feedbackAddExe; + /** 反馈删除执行器 */ + private final FeedbackDeleteExe feedbackDeleteExe; /** 清单查询执行器 */ private final TaskListQueryExe taskListQueryExe; /** 任务详情查询执行器 */ @@ -64,9 +66,9 @@ public class TaskListServiceImpl implements TaskListServiceI { } @Override - public SingleResponse add(TaskListAddCmd cmd) { - taskListAddExe.execute(cmd); - return SingleResponse.buildSuccess(); + public SingleResponse add(TaskListAddCmd cmd) { + TaskListCO co = taskListAddExe.execute(cmd); + return SingleResponse.of(co); } @Override @@ -111,9 +113,9 @@ public class TaskListServiceImpl implements TaskListServiceI { } @Override - public SingleResponse addTaskDetail(TaskDetailSaveCmd cmd) { - taskDetailSaveExe.execute(cmd); - return SingleResponse.buildSuccess(); + public SingleResponse addTaskDetail(TaskDetailSaveCmd cmd) { + TaskDetailCO co = taskDetailSaveExe.execute(cmd); + return SingleResponse.of(co); } @Override @@ -134,8 +136,14 @@ public class TaskListServiceImpl implements TaskListServiceI { } @Override - public SingleResponse addFeedback(FeedbackAddCmd cmd) { - feedbackAddExe.execute(cmd); + public SingleResponse addFeedback(FeedbackAddCmd cmd) { + FeedbackCO co = feedbackAddExe.execute(cmd); + return SingleResponse.of(co); + } + + @Override + public SingleResponse deleteFeedback(Long id) { + feedbackDeleteExe.execute(id); return SingleResponse.buildSuccess(); } diff --git a/web-client/src/main/java/com/zcloud/safetyDutyList/api/tasklist/TaskListServiceI.java b/web-client/src/main/java/com/zcloud/safetyDutyList/api/tasklist/TaskListServiceI.java index 3def094..299929f 100644 --- a/web-client/src/main/java/com/zcloud/safetyDutyList/api/tasklist/TaskListServiceI.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/api/tasklist/TaskListServiceI.java @@ -39,7 +39,7 @@ public interface TaskListServiceI { * @param cmd 修改命令 * @return 修改后的清单信息 */ - SingleResponse edit(TaskListUpdateCmd cmd); + SingleResponse edit(TaskListUpdateCmd cmd); /** * 删除任务清单 @@ -63,7 +63,7 @@ public interface TaskListServiceI { * @param cmd 开关切换命令 * @return 操作结果 */ - SingleResponse switchFlag(TaskListSwitchCmd cmd); + SingleResponse switchFlag(TaskListSwitchCmd cmd); /** * 关闭任务清单（同时关闭关联的所有任务详情） @@ -127,7 +127,15 @@ public interface TaskListServiceI { * @param cmd 反馈提交命令 * @return 反馈信息 */ - SingleResponse addFeedback(FeedbackAddCmd cmd); + SingleResponse addFeedback(FeedbackAddCmd cmd); + + /** + * 删除反馈记录 + * + * @param id 主键ID + * @return 操作结果 + */ + SingleResponse deleteFeedback(Long id); /** * 查询反馈周期分组列表（按周期标识分组统计反馈数量）