|
@@ -14,10 +14,7 @@ import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
|
|
import com.yh.saas.plugin.yiliangyiyun.mapper.PublishTaskInfoMapper;
|
|
import com.yh.saas.plugin.yiliangyiyun.mapper.PublishTaskInfoMapper;
|
|
import com.yh.saas.plugin.yiliangyiyun.service.*;
|
|
import com.yh.saas.plugin.yiliangyiyun.service.*;
|
|
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
|
|
-import com.yh.saas.plugin.yiliangyiyun.util.EntCoordUtil;
|
|
|
|
-import com.yh.saas.plugin.yiliangyiyun.util.GeTuiUtils;
|
|
|
|
-import com.yh.saas.plugin.yiliangyiyun.util.PdfUtil;
|
|
|
|
-import com.yh.saas.plugin.yiliangyiyun.util.RandomUtil;
|
|
|
|
|
|
+import com.yh.saas.plugin.yiliangyiyun.util.*;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.scheduling.annotation.Scheduled;
|
|
import org.springframework.scheduling.annotation.Scheduled;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -75,6 +72,8 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
|
|
private IHyCarCaptainInfoService hyCarCaptainInfoService;
|
|
private IHyCarCaptainInfoService hyCarCaptainInfoService;
|
|
@Autowired
|
|
@Autowired
|
|
private GeTuiUtils geTuiUtils;
|
|
private GeTuiUtils geTuiUtils;
|
|
|
|
+ @Autowired
|
|
|
|
+ private QRCodeUtil qrCodeUtil;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 地球半径,单位 km
|
|
* 地球半径,单位 km
|
|
@@ -1352,6 +1351,8 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
|
|
List<PublishTaskInfo> publishTaskInfoList = this.selectPublishTaskInfoList();//调用Service中的方法
|
|
List<PublishTaskInfo> publishTaskInfoList = this.selectPublishTaskInfoList();//调用Service中的方法
|
|
String number = "YS" + date + getPickupCode(publishTaskInfoList);
|
|
String number = "YS" + date + getPickupCode(publishTaskInfoList);
|
|
publishTaskInfo.setTaskNo(number);
|
|
publishTaskInfo.setTaskNo(number);
|
|
|
|
+ String qrCode =qrCodeUtil.generateQRCodeImage(publishTaskInfo.getId()+","+number,800,800,"task",publishTaskInfo.getId());
|
|
|
|
+ publishTaskInfo.setQrCode(qrCode);
|
|
publishTaskInfo.setShowHide("1");
|
|
publishTaskInfo.setShowHide("1");
|
|
publishTaskInfo.setStatus(StatusEnum.TASK_REVIEWING.getName());
|
|
publishTaskInfo.setStatus(StatusEnum.TASK_REVIEWING.getName());
|
|
publishTaskInfo.setStatusKey(StatusEnum.TASK_REVIEWING.getFlag());
|
|
publishTaskInfo.setStatusKey(StatusEnum.TASK_REVIEWING.getFlag());
|