From 0ef9ad4637e0143144f02a38fffa10bb3d0e378d Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Thu, 3 Apr 2025 18:12:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E9=A3=9E=E8=A1=8C=E8=88=AA=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DeviceQrtzServiceImpl.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java index 0a0308b..a7aa038 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java @@ -5,17 +5,12 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.dubbo.config.annotation.DubboReference; -import org.dromara.business.api.RemoteBusinessTaskService; import org.dromara.common.core.constant.BusinessConstants; import org.dromara.common.core.constant.DeviceQrtzConstants; - import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.redis.utils.RedisOpsUtils; import org.dromara.common.satoken.utils.LoginHelper; - import org.dromara.common.sdk.cloudapi.wayline.*; import org.dromara.common.sdk.common.HttpResultResponse; import org.dromara.sample.fegin.RemoteBusinessTaskFeign; @@ -29,25 +24,18 @@ import org.dromara.sample.manage.model.entity.DeviceQrtzDateEntity; import org.dromara.sample.manage.model.entity.DeviceQrtzEntity; import org.dromara.sample.manage.model.entity.DeviceQrtzFileEntity; import org.dromara.sample.manage.service.IDeviceQrtzDateService; - import org.dromara.sample.manage.service.IDeviceQrtzService; - import org.dromara.sample.wayline.mapper.IWaylineFileMapper; -import org.dromara.sample.wayline.mapper.IWaylineJobMapper; import org.dromara.sample.wayline.model.entity.WaylineFileEntity; import org.dromara.sample.wayline.model.param.CreateJobParam; import org.dromara.sample.wayline.service.IFlightTaskService; -import org.dromara.sample.wayline.service.IWaylineJobService; import org.dromara.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.sql.SQLException; import java.text.ParseException; -import java.time.LocalDate; import java.time.LocalDateTime; -import java.time.LocalTime; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.concurrent.ExecutorService; @@ -205,6 +193,7 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService { public Boolean addFileList(Mapmap) { int sort=1; Long qrtzId = Convert.toLong(map.get("qrtzId")); + String deviceSn = Convert.toStr(map.get("deviceSn")); Date execDate = Convert.toDate(map.get("execDate")); String waylineIdStr = Convert.toStr(map.get("waylineIdStr")); List selectList = deviceQrtzFileMapper.selectList(new QueryWrapper() @@ -219,7 +208,7 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService { DeviceQrtzFileEntity entity = new DeviceQrtzFileEntity(); QueryWrapper queryWrapper = new QueryWrapper().eq("wayline_id", waylineId); WaylineFileEntity fileEntity = waylineFileMapper.selectOne(queryWrapper); - entity.setDeviceSn(fileEntity.getDeviceSn()); + entity.setDeviceSn(deviceSn); entity.setQrtzId(qrtzId); entity.setWaylineId(waylineId); entity.setWaylineName(fileEntity.getName());