上传定时任务,优化代码

src/main/java/com/bme/access/upload/module/dao/InAndOutDateUrlMapper.java

@@ -11,4 +11,6 @@ public interface InAndOutDateUrlMapper {
 
     List<InAndOutDateUrl> selectInAndOutDateUrl(@Param("startTime")String startTime, @Param("endTime")String endTime);
     InAndOutDateUrl getLastInRecord(@Param("numberPlate") String numberPlate, @Param("time") String time);
+
+    InAndOutDateUrl selectInAndOutDateUrlByNo(String numberPlate);
 }

src/main/java/com/bme/access/upload/module/service/TransportVehicleInfoService.java

@@ -4,7 +4,9 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bme.access.upload.common.DateUtils;
 import com.bme.access.upload.common.HttpUtils;
+import com.bme.access.upload.model.InAndOutDateUrl;
 import com.bme.access.upload.module.dao.DataUploadTimeMapper;
+import com.bme.access.upload.module.dao.InAndOutDateUrlMapper;
 import com.bme.access.upload.module.dao.TransportVehicleInfoFailMapper;
 import com.bme.access.upload.module.dao.TransportVehicleInfoMapper;
 import com.bme.access.upload.module.module.TransportVehicleInfoUrl;
@@ -41,6 +43,8 @@ public class TransportVehicleInfoService {
     private BeanConverter beanConverter;
     @Resource
     private TransportVehicleInfoFailMapper transportVehicleInfoFailMapper;
+    @Resource
+    private InAndOutDateUrlMapper inAndOutDateUrlMapper;
 
     private final static String ADD_VEHICLE_URL = "https://dctapi.soszyzg.com/dct/new/addVehicleInfo";
 
@@ -76,7 +80,15 @@ public class TransportVehicleInfoService {
                 log.info("车辆上传车牌异常={}", JSON.toJSONString(transportVehicleInfoUrl));
                 continue;
             }
-            UploadTransportVehicleInfo uploadVehicleInfo = beanConverter.convertTransportVehicleInfo(transportVehicleInfoUrl);
+
+            // 查询车牌颜色
+            InAndOutDateUrl inAndOutDateUrl = inAndOutDateUrlMapper.selectInAndOutDateUrlByNo(transportVehicleInfoUrl.getNumberPlate());
+            Integer color = 5;
+            if (Objects.nonNull(inAndOutDateUrl)) {
+                color = inAndOutDateUrl.getVehicleColorIndex();
+            }
+
+            UploadTransportVehicleInfo uploadVehicleInfo = beanConverter.convertTransportVehicleInfo(transportVehicleInfoUrl, color);
             try {
                 String bodyJson = JSONObject.toJSONString(uploadVehicleInfo);
                 HttpResponse httpResponse = HttpUtils.sendPost(ADD_VEHICLE_URL, null, null, bodyJson);
@@ -115,7 +127,15 @@ public class TransportVehicleInfoService {
                 log.info("车辆上传车牌异常={}", JSON.toJSONString(transportVehicleInfoUrl));
                 continue;
             }
-            UploadTransportVehicleInfo uploadVehicleInfo = beanConverter.convertTransportVehicleInfo(transportVehicleInfoUrl);
+
+            // 查询车牌颜色
+            InAndOutDateUrl inAndOutDateUrl = inAndOutDateUrlMapper.selectInAndOutDateUrlByNo(transportVehicleInfoUrl.getNumberPlate());
+            Integer color = 5;
+            if (Objects.nonNull(inAndOutDateUrl)) {
+                color = inAndOutDateUrl.getVehicleColorIndex();
+            }
+
+            UploadTransportVehicleInfo uploadVehicleInfo = beanConverter.convertTransportVehicleInfo(transportVehicleInfoUrl, color);
             try {
                 String bodyJson = JSONObject.toJSONString(uploadVehicleInfo);
                 HttpResponse httpResponse = HttpUtils.sendPost(ADD_VEHICLE_URL, null, null, bodyJson);

src/main/java/com/bme/access/upload/module/utils/BeanConverter.java

@@ -73,7 +73,7 @@ public class BeanConverter {
         return list;
     }
 
-    public UploadTransportVehicleInfo convertTransportVehicleInfo(TransportVehicleInfoUrl item) {
+    public UploadTransportVehicleInfo convertTransportVehicleInfo(TransportVehicleInfoUrl item, Integer rawColor) {
         UploadTransportVehicleInfo info = new UploadTransportVehicleInfo();
         info.setCarNo(item.getNumberPlate());
         if (item.getVehicleEmissions() == null) {
@@ -93,26 +93,26 @@ public class BeanConverter {
             info.setInternetStatus(item.getOnlineStatus());
         }
         // 车牌颜色 0-蓝牌,1-黄牌,2-白牌,3-黑牌,4-新能源绿牌,5-其他,6-新能源绿黄牌
-        if (Objects.isNull(item.getPlateColor())) {
+        if (Objects.isNull(rawColor)) {
             info.setLicensePlateColor("5");
         } else {
             String color = "5";
-            if (item.getPlateColor() == 1) {
+            if (rawColor == 1) {
                 color = "0";
             }
-            if (item.getPlateColor() == 2) {
+            if (rawColor == 2) {
                 color = "1";
             }
-            if (item.getPlateColor() == 3) {
+            if (rawColor == 3) {
                 color = "2";
             }
-            if (item.getPlateColor() == 4) {
+            if (rawColor == 4) {
                 color = "3";
             }
-            if (item.getPlateColor() == 5) {
+            if (rawColor == 5) {
                 color = "4";
             }
-            if (item.getPlateColor() == 6) {
+            if (rawColor == 6) {
                 color = "6";
             }
             info.setLicensePlateColor(color);