|
@ -5,17 +5,12 @@ import cn.hutool.core.util.ObjectUtil; |
|
|
import cn.hutool.core.util.StrUtil; |
|
|
import cn.hutool.core.util.StrUtil; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
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.BusinessConstants; |
|
|
import org.dromara.common.core.constant.DeviceQrtzConstants; |
|
|
import org.dromara.common.core.constant.DeviceQrtzConstants; |
|
|
|
|
|
|
|
|
import org.dromara.common.mybatis.core.page.TableDataInfo; |
|
|
import org.dromara.common.mybatis.core.page.TableDataInfo; |
|
|
import org.dromara.common.redis.utils.RedisOpsUtils; |
|
|
import org.dromara.common.redis.utils.RedisOpsUtils; |
|
|
import org.dromara.common.satoken.utils.LoginHelper; |
|
|
import org.dromara.common.satoken.utils.LoginHelper; |
|
|
|
|
|
|
|
|
import org.dromara.common.sdk.cloudapi.wayline.*; |
|
|
import org.dromara.common.sdk.cloudapi.wayline.*; |
|
|
import org.dromara.common.sdk.common.HttpResultResponse; |
|
|
import org.dromara.common.sdk.common.HttpResultResponse; |
|
|
import org.dromara.sample.fegin.RemoteBusinessTaskFeign; |
|
|
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.DeviceQrtzEntity; |
|
|
import org.dromara.sample.manage.model.entity.DeviceQrtzFileEntity; |
|
|
import org.dromara.sample.manage.model.entity.DeviceQrtzFileEntity; |
|
|
import org.dromara.sample.manage.service.IDeviceQrtzDateService; |
|
|
import org.dromara.sample.manage.service.IDeviceQrtzDateService; |
|
|
|
|
|
|
|
|
import org.dromara.sample.manage.service.IDeviceQrtzService; |
|
|
import org.dromara.sample.manage.service.IDeviceQrtzService; |
|
|
|
|
|
|
|
|
import org.dromara.sample.wayline.mapper.IWaylineFileMapper; |
|
|
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.entity.WaylineFileEntity; |
|
|
import org.dromara.sample.wayline.model.param.CreateJobParam; |
|
|
import org.dromara.sample.wayline.model.param.CreateJobParam; |
|
|
import org.dromara.sample.wayline.service.IFlightTaskService; |
|
|
import org.dromara.sample.wayline.service.IFlightTaskService; |
|
|
import org.dromara.sample.wayline.service.IWaylineJobService; |
|
|
|
|
|
import org.dromara.system.api.model.LoginUser; |
|
|
import org.dromara.system.api.model.LoginUser; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.stereotype.Service; |
|
|
import org.springframework.stereotype.Service; |
|
|
import org.springframework.util.CollectionUtils; |
|
|
import org.springframework.util.CollectionUtils; |
|
|
|
|
|
|
|
|
import java.sql.SQLException; |
|
|
|
|
|
import java.text.ParseException; |
|
|
import java.text.ParseException; |
|
|
import java.time.LocalDate; |
|
|
|
|
|
import java.time.LocalDateTime; |
|
|
import java.time.LocalDateTime; |
|
|
import java.time.LocalTime; |
|
|
|
|
|
import java.time.format.DateTimeFormatter; |
|
|
import java.time.format.DateTimeFormatter; |
|
|
import java.util.*; |
|
|
import java.util.*; |
|
|
import java.util.concurrent.ExecutorService; |
|
|
import java.util.concurrent.ExecutorService; |
|
@ -205,6 +193,7 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService { |
|
|
public Boolean addFileList(Map<String,Object>map) { |
|
|
public Boolean addFileList(Map<String,Object>map) { |
|
|
int sort=1; |
|
|
int sort=1; |
|
|
Long qrtzId = Convert.toLong(map.get("qrtzId")); |
|
|
Long qrtzId = Convert.toLong(map.get("qrtzId")); |
|
|
|
|
|
String deviceSn = Convert.toStr(map.get("deviceSn")); |
|
|
Date execDate = Convert.toDate(map.get("execDate")); |
|
|
Date execDate = Convert.toDate(map.get("execDate")); |
|
|
String waylineIdStr = Convert.toStr(map.get("waylineIdStr")); |
|
|
String waylineIdStr = Convert.toStr(map.get("waylineIdStr")); |
|
|
List<DeviceQrtzFileEntity> selectList = deviceQrtzFileMapper.selectList(new QueryWrapper<DeviceQrtzFileEntity>() |
|
|
List<DeviceQrtzFileEntity> selectList = deviceQrtzFileMapper.selectList(new QueryWrapper<DeviceQrtzFileEntity>() |
|
@ -219,7 +208,7 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService { |
|
|
DeviceQrtzFileEntity entity = new DeviceQrtzFileEntity(); |
|
|
DeviceQrtzFileEntity entity = new DeviceQrtzFileEntity(); |
|
|
QueryWrapper<WaylineFileEntity> queryWrapper = new QueryWrapper<WaylineFileEntity>().eq("wayline_id", waylineId); |
|
|
QueryWrapper<WaylineFileEntity> queryWrapper = new QueryWrapper<WaylineFileEntity>().eq("wayline_id", waylineId); |
|
|
WaylineFileEntity fileEntity = waylineFileMapper.selectOne(queryWrapper); |
|
|
WaylineFileEntity fileEntity = waylineFileMapper.selectOne(queryWrapper); |
|
|
entity.setDeviceSn(fileEntity.getDeviceSn()); |
|
|
entity.setDeviceSn(deviceSn); |
|
|
entity.setQrtzId(qrtzId); |
|
|
entity.setQrtzId(qrtzId); |
|
|
entity.setWaylineId(waylineId); |
|
|
entity.setWaylineId(waylineId); |
|
|
entity.setWaylineName(fileEntity.getName()); |
|
|
entity.setWaylineName(fileEntity.getName()); |
|
|