From 8a80a7059ecfd6bb635c58a3d6ead29f5b193cda Mon Sep 17 00:00:00 2001 From: liux <963924687@qq.com> Date: Sat, 11 Oct 2025 17:37:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E9=A5=B0=E4=BB=BB=E5=8A=A1=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=A8=A1=E5=9D=97=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/RepairAuditDetailsServiceImpl.java | 9 +++++++++ .../material/task/mapper/TmTaskMapper.java | 18 ++++++++++-------- .../task/service/impl/TmTaskServiceImpl.java | 19 ++++++++++++------- .../mapper/material/task/TmTaskMapper.xml | 4 ++++ 4 files changed, 35 insertions(+), 15 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java index 8054327a..72f3bd61 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java @@ -149,6 +149,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService if (!hasSpecialRole) { repairAuditDetails.setUserId(userId == 0 ? null : userId); } + long time1 = System.currentTimeMillis(); // 获取所有需要查询的 taskId、过滤空的 List repairQuestList = repairAuditDetailsMapper.selectRepairQuestList(repairAuditDetails); // 通过流过滤掉空对象 并转换为 List集合 @@ -160,7 +161,9 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService .collect(Collectors.toList()); // 批量查询 typeName + long time2 = System.currentTimeMillis(); List keyValueList = repairAuditDetailsMapper.selectTypeNamesByTaskIds(taskIds); + long time3 = System.currentTimeMillis(); // 设置 itemType if (CollectionUtil.isNotEmpty(keyValueList)) { Map keyValueMap = keyValueList.stream() @@ -176,6 +179,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService } } } + long time4 = System.currentTimeMillis(); if (CollectionUtil.isNotEmpty(repairQuestList)) { String keyWord = repairAuditDetails.getKeyWord(); // 如果关键字不为空，进行过滤 @@ -185,6 +189,11 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService .collect(Collectors.toList()); } } + long time5 = System.currentTimeMillis(); + System.err.println("time2-time1: " + (time2 - time1)); + System.err.println("time3-time2: " + (time3 - time2)); + System.err.println("time4-time3: " + (time4 - time3)); + System.err.println("time5-time4: " + (time5 - time4)); return repairQuestList; } catch (Exception e) { // 异常处理 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java index 827e6c93..073696b1 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java @@ -14,14 +14,14 @@ import org.apache.ibatis.annotations.Param; /** * 任务Mapper接口 - * + * * @author xsheng * @date 2024-10-16 */ public interface TmTaskMapper { /** * 查询任务 - * + * * @param taskId 任务主键 * @return 任务 */ @@ -29,7 +29,7 @@ public interface TmTaskMapper { /** * 批量查询任务 - * + * * @param taskIds 任务主键列表 * @return 任务列表 */ @@ -45,7 +45,7 @@ public interface TmTaskMapper { /** * 查询任务列表 - * + * * @param tmTask 任务 * @return 任务集合 */ @@ -53,7 +53,7 @@ public interface TmTaskMapper { /** * 新增任务 - * + * * @param tmTask 任务 * @return 结果 */ @@ -61,7 +61,7 @@ public interface TmTaskMapper { /** * 修改任务 - * + * * @param tmTask 任务 * @return 结果 */ @@ -76,7 +76,7 @@ public interface TmTaskMapper { /** * 删除任务 - * + * * @param taskId 任务主键 * @return 结果 */ @@ -84,7 +84,7 @@ public interface TmTaskMapper { /** * 批量删除任务 - * + * * @param taskIds 需要删除的数据主键集合 * @return 结果 */ @@ -175,6 +175,8 @@ public interface TmTaskMapper { */ TmTask selectTaskByCode(String code); + TmTask selectTaskByCodeAndType(@Param("code") String code,@Param("type") String type); + /** * 根据任务编号查询任务信息 * @param backApplyInfo diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/service/impl/TmTaskServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/service/impl/TmTaskServiceImpl.java index b867ea0b..9bf8f158 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/service/impl/TmTaskServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/service/impl/TmTaskServiceImpl.java @@ -11,7 +11,7 @@ import com.bonus.material.task.service.ITmTaskService; /** * 任务Service业务层处理 - * + * * @author xsheng * @date 2024-10-16 */ @@ -22,7 +22,7 @@ public class TmTaskServiceImpl implements ITmTaskService { /** * 查询任务 - * + * * @param taskId 任务主键 * @return 任务 */ @@ -33,7 +33,7 @@ public class TmTaskServiceImpl implements ITmTaskService { /** * 查询任务列表 - * + * * @param tmTask 任务 * @return 任务 */ @@ -44,7 +44,7 @@ public class TmTaskServiceImpl implements ITmTaskService { /** * 新增任务 - * + * * @param tmTask 任务 * @return 结果 */ @@ -52,6 +52,11 @@ public class TmTaskServiceImpl implements ITmTaskService { public int insertTmTask(TmTask tmTask) { tmTask.setCreateTime(DateUtils.getNowDate()); try { + //TODO: 2024/10/16 根据任务编号和任务类型，判断次时任务编号是否已存在，若已存在，不予创建 + TmTask tmTaskByCode = tmTaskMapper.selectTaskByCodeAndType(tmTask.getCode(),tmTask.getTaskType()+""); + if(tmTaskByCode !=null){ + throw new ServiceException("此任务已创建，请重新刷新页面查看！"); + } return tmTaskMapper.insertTmTask(tmTask); } catch (Exception e) { throw new ServiceException("错误信息描述"); @@ -60,7 +65,7 @@ public class TmTaskServiceImpl implements ITmTaskService { /** * 修改任务 - * + * * @param tmTask 任务 * @return 结果 */ @@ -76,7 +81,7 @@ public class TmTaskServiceImpl implements ITmTaskService { /** * 批量删除任务 - * + * * @param taskIds 需要删除的任务主键 * @return 结果 */ @@ -87,7 +92,7 @@ public class TmTaskServiceImpl implements ITmTaskService { /** * 删除任务信息 - * + * * @param taskId 任务主键 * @return 结果 */ diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml index 512c470d..1720b57e 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml @@ -285,4 +285,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) + +