diff --git a/casic-environment/src/main/java/com/casic/missiles/job/TyphoonQuartzJob.java b/casic-environment/src/main/java/com/casic/missiles/job/TyphoonQuartzJob.java index 316d2cb..78e6c09 100644 --- a/casic-environment/src/main/java/com/casic/missiles/job/TyphoonQuartzJob.java +++ b/casic-environment/src/main/java/com/casic/missiles/job/TyphoonQuartzJob.java @@ -5,8 +5,9 @@ import org.springframework.stereotype.Component; /** - * @author lwh * 台风数据定时任务,每小时执行一次 + * + * @author a203 * @Scheduled(cron = "0/10 * * * * ? ") * @Description 依赖casic-job-quartz,并在CasicApplication上增加注解 @EnableScheduling */ diff --git a/casic-environment/src/main/java/com/casic/missiles/job/TyphoonQuartzJob.java b/casic-environment/src/main/java/com/casic/missiles/job/TyphoonQuartzJob.java index 316d2cb..78e6c09 100644 --- a/casic-environment/src/main/java/com/casic/missiles/job/TyphoonQuartzJob.java +++ b/casic-environment/src/main/java/com/casic/missiles/job/TyphoonQuartzJob.java @@ -5,8 +5,9 @@ import org.springframework.stereotype.Component; /** - * @author lwh * 台风数据定时任务,每小时执行一次 + * + * @author a203 * @Scheduled(cron = "0/10 * * * * ? ") * @Description 依赖casic-job-quartz,并在CasicApplication上增加注解 @EnableScheduling */ diff --git a/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java b/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java index 27e5684..75ba151 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java +++ b/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java @@ -83,7 +83,7 @@ private NRSerialPort serialPort; private ChannelHandlerContext channelHandler; - private LinkedList temp = new LinkedList<>(); + private final LinkedList temp = new LinkedList<>(); private boolean isComplete = false; public SocketServiceImpl(IRobotService robotService, ITyphoonService typhoonService, diff --git a/casic-environment/src/main/java/com/casic/missiles/job/TyphoonQuartzJob.java b/casic-environment/src/main/java/com/casic/missiles/job/TyphoonQuartzJob.java index 316d2cb..78e6c09 100644 --- a/casic-environment/src/main/java/com/casic/missiles/job/TyphoonQuartzJob.java +++ b/casic-environment/src/main/java/com/casic/missiles/job/TyphoonQuartzJob.java @@ -5,8 +5,9 @@ import org.springframework.stereotype.Component; /** - * @author lwh * 台风数据定时任务,每小时执行一次 + * + * @author a203 * @Scheduled(cron = "0/10 * * * * ? ") * @Description 依赖casic-job-quartz,并在CasicApplication上增加注解 @EnableScheduling */ diff --git a/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java b/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java index 27e5684..75ba151 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java +++ b/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java @@ -83,7 +83,7 @@ private NRSerialPort serialPort; private ChannelHandlerContext channelHandler; - private LinkedList temp = new LinkedList<>(); + private final LinkedList temp = new LinkedList<>(); private boolean isComplete = false; public SocketServiceImpl(IRobotService robotService, ITyphoonService typhoonService, diff --git a/casic-task/src/main/java/com/casic/missiles/modular/system/service/impl/TaskServiceImpl.java b/casic-task/src/main/java/com/casic/missiles/modular/system/service/impl/TaskServiceImpl.java index f9809e0..02cded0 100644 --- a/casic-task/src/main/java/com/casic/missiles/modular/system/service/impl/TaskServiceImpl.java +++ b/casic-task/src/main/java/com/casic/missiles/modular/system/service/impl/TaskServiceImpl.java @@ -1,9 +1,7 @@ package com.casic.missiles.modular.system.service.impl; -import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.modular.system.dao.TaskMapper; import com.casic.missiles.modular.system.dto.TaskDTO; import com.casic.missiles.modular.system.model.Task; @@ -28,10 +26,13 @@ public void updateTaskById(int robotId) { QueryWrapper query = new QueryWrapper<>(); query.eq("ROBOT_ID", robotId); - Assert.isFalse(this.count(query) == 0, () -> new RequestValidException("机器人不存在,无法结束任务")); - Task task = this.baseMapper.selectTaskById(robotId); - task.setEndTime(TimeUtil.getCurrentTime()); - updateById(task); + if (this.count(query) != 0) { + Task task = this.baseMapper.selectTaskById(robotId); + if (task != null) { + task.setEndTime(TimeUtil.getCurrentTime()); + updateById(task); + } + } } @Override @@ -47,11 +48,13 @@ public TaskDTO selectRobotTask(int robotId) { QueryWrapper query = new QueryWrapper<>(); query.eq("ROBOT_ID", robotId); - Assert.isFalse(this.count(query) == 0, () -> new RequestValidException("机器人不存在,无法查看任务")); - Task task = this.baseMapper.selectTaskById(robotId); - if (task == null) { + if (this.count(query) != 0) { + Task task = this.baseMapper.selectTaskById(robotId); + if (task != null) { + return new TaskDTO(task); + } return null; } - return new TaskDTO(task); + return null; } }