上传定时任务

src/main/java/com/bme/access/upload/job/UploadDataNewTask.java

@@ -28,7 +28,7 @@ public class UploadDataNewTask {
     /**
      * 场内运输车辆信息-添加
      */
-    @Scheduled(cron = "0 0/15 * * * *")
+    @Scheduled(cron = "0 0/2 * * * *")
     public void uploadInFactoryTransportVehicleInfo() {
         try {
             inFactoryTransportVehicleInfoService.getAndUploadInFactoryTransportVehicleInfo();
@@ -40,7 +40,7 @@ public class UploadDataNewTask {
     /**
      * 车辆信息-添加
      */
-    @Scheduled(cron = "0 8/5 * * * ?")
+//    @Scheduled(cron = "0 8/5 * * * ?")
     public void uploadTransportVehicleInfo() {
         try {
             transportVehicleInfoService.getAndUploadTransportVehicleInfoList(Boolean.TRUE);
@@ -52,7 +52,7 @@ public class UploadDataNewTask {
     /**
      * 非道路移动机械信息-添加
      */
-    @Scheduled(cron = "0 0/15 * * * *")
+//    @Scheduled(cron = "0 0/15 * * * *")
     public void uploadNoneRoadMovementInfo() {
         try {
             noneRoadMovementInfoService.getAndUploadTransportVehicleDate();

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

@@ -39,8 +39,7 @@ public class InFactoryTransportVehicleInfoService {
         }
         for (InFactoryTransportVehicleInfo inFactoryTransportVehicleInfo : inFactoryTransportVehicleInfos) {
             String bodyJson = JSONObject.toJSONString(inFactoryTransportVehicleInfo);
-            HttpResponse httpResponse = HttpUtils.sendPost(IN_FACTORY_URL, null, null, bodyJson);
-            log.info("场内车辆上传结果: {}", JSON.toJSONString(httpResponse));
+            HttpUtils.sendPost(IN_FACTORY_URL, null, null, bodyJson);
             Thread.sleep(50);
         }
         log.info("上传场内车辆{}条", inFactoryTransportVehicleInfoUrls.size());

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

@@ -22,10 +22,16 @@ public class BeanConverter {
         for (InFactoryTransportVehicleInfoUrl item : inFactoryTransportVehicleInfoUrls) {
             InFactoryTransportVehicleInfo info = new InFactoryTransportVehicleInfo();
             info.setCarNo(item.getNumberPlate());
-            info.setVehicleListImg(Base64Utils.getBase64ByUrl(item.getOnBoardList()));
-            info.setDrivingLicenseImg(Base64Utils.getBase64ByUrl(item.getDrivingLicense()));
+            if (StringUtils.isNotBlank(item.getOnBoardList())) {
+                info.setVehicleListImg(Base64Utils.getBase64ByUrl(item.getOnBoardList()));
+            }
+            if (StringUtils.isNotBlank(item.getDrivingLicense())) {
+                info.setDrivingLicenseImg(Base64Utils.getBase64ByUrl(item.getDrivingLicense()));
+            }
             info.setSensorCatalyticConverterImg(null);
-            info.setCarImg(Base64Utils.getBase64ByUrl(item.getVehicleImage()));
+            if (StringUtils.isNotBlank(item.getVehicleImage())) {
+                info.setCarImg(Base64Utils.getBase64ByUrl(item.getVehicleImage()));
+            }
             if (item.getVehicleEmissions() == null) {
                 info.setEmissionStandard("X");
             } else {
@@ -35,7 +41,7 @@ public class BeanConverter {
                     info.setEmissionStandard(item.getVehicleEmissions());
                 }
             }
-            info.setFuelType(item.getFuelType());  // TODO
+            info.setFuelType(item.getFuelType());
             info.setHbCarNo(item.getEnvironmentCode());
             if (Objects.nonNull(item.getOnlineStatus())) {
                 // 联网状态 0—未联网,1—已联网

src/main/resources/mapper/InFactoryTransportVehicleInfoMapper.xml

@@ -15,7 +15,7 @@
         Driving_license   drivingLicense,
         DTime             dtime,
         vehicle_type    vehicleType
-        from InFactory_Transport_Vehicle where DTime > #{uploadTime}
+        from InFactory_Transport_Vehicle_Info where DTime > #{uploadTime}
     </select>
 
     <select id="selectInFactoryTransportVehicleInfo1"
@@ -40,11 +40,11 @@
             online_status onlineStatus,
             model,
             Environment_Code environmentCode
-        from InFactory_Transport_Vehicle
+        from InFactory_Transport_Vehicle_Info
     </select>
 
     <select id="selectInFactoryTransportVehicleInfoCount" resultType="java.lang.Integer">
-        select count(*) from InFactory_Transport_Vehicle
+        select count(*) from InFactory_Transport_Vehicle_Info
     </select>
 
 </mapper>
\ No newline at end of file