diff --git a/src/main/java/com/lz/common/utils/TaskCommand.java b/src/main/java/com/lz/common/utils/TaskCommandUtils.java similarity index 98% rename from src/main/java/com/lz/common/utils/TaskCommand.java rename to src/main/java/com/lz/common/utils/TaskCommandUtils.java index 92e05aca..d159cef6 100644 --- a/src/main/java/com/lz/common/utils/TaskCommand.java +++ b/src/main/java/com/lz/common/utils/TaskCommandUtils.java @@ -13,7 +13,7 @@ import java.util.Arrays; import java.util.List; @Slf4j -public class TaskCommand { +public class TaskCommandUtils { diff --git a/src/main/java/com/lz/modules/app/controller/ThirdTaskController.java b/src/main/java/com/lz/modules/app/controller/ThirdTaskController.java index 6d78e7f7..a59fdad7 100644 --- a/src/main/java/com/lz/modules/app/controller/ThirdTaskController.java +++ b/src/main/java/com/lz/modules/app/controller/ThirdTaskController.java @@ -63,7 +63,7 @@ public class ThirdTaskController { a = a.replaceAll("\\\\u0000", ""); //替换掉前面的空格 log.info("替换空格之后的命令:" + a); commandDto = JSONObject.parseObject(a, CommandDto.class); - String[] tokens = TaskCommand.parse(commandDto.getCommand()); + String[] tokens = TaskCommandUtils.parse(commandDto.getCommand()); log.info("parse data :" + Arrays.toString(tokens)); Object object = null; try { diff --git a/src/main/java/com/lz/modules/third/dao/TaskRespMapper.java b/src/main/java/com/lz/modules/third/dao/TaskRespMapper.java index 9458d12e..926bd3e8 100644 --- a/src/main/java/com/lz/modules/third/dao/TaskRespMapper.java +++ b/src/main/java/com/lz/modules/third/dao/TaskRespMapper.java @@ -33,7 +33,7 @@ public interface TaskRespMapper extends BaseMapper { int deleteTaskRespById(@Param("id") Long id); - void deleteTaskRespByUserId(@Param("userId") Long userId); + void deleteTaskRespByUserId(@Param("userId") Long userId, @Param("command") String command); TaskResp selectTaskRespByUserIdIndex(@Param("userId") Long userId, @Param("index") Long index, @Param("command") String command); diff --git a/src/main/java/com/lz/modules/third/service/impl/TaskRespServiceImpl.java b/src/main/java/com/lz/modules/third/service/impl/TaskRespServiceImpl.java index 9f067074..16135455 100644 --- a/src/main/java/com/lz/modules/third/service/impl/TaskRespServiceImpl.java +++ b/src/main/java/com/lz/modules/third/service/impl/TaskRespServiceImpl.java @@ -66,7 +66,7 @@ public class TaskRespServiceImpl extends ServiceImpl i @Override public void deleteInsertLastResult(SysUserEntity user,List list,String command) { - taskRespMapper.deleteTaskRespByUserId(user.getUserId()); + taskRespMapper.deleteTaskRespByUserId(user.getUserId(),command); List taskRespList =new ArrayList<>(); for(ResultDto resultDto : list){ TaskResp taskResp = new TaskResp(); diff --git a/src/main/resources/mapper/third/TaskRespMapper.xml b/src/main/resources/mapper/third/TaskRespMapper.xml index 601181cd..aa026924 100644 --- a/src/main/resources/mapper/third/TaskRespMapper.xml +++ b/src/main/resources/mapper/third/TaskRespMapper.xml @@ -117,9 +117,8 @@ - - delete from lz_task_resp where user_id = #{userId} + delete from lz_task_resp where user_id = #{userId} and command = #{command}