上传定时任务

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

@@ -25,8 +25,9 @@ public class UploadDataNewTask {
     /**
      * 场内运输车辆信息-添加
      */
-//    @Scheduled(cron = "0 0/2 * * * *")
+    @Scheduled(cron = "0 0/15 * * * *")
     public void uploadInFactoryTransportVehicleInfo() {
+        log.info("场内运输车辆信息-添加");
         try {
             inFactoryTransportVehicleInfoService.getAndUploadInFactoryTransportVehicleInfo();
         } catch (Exception e) {
@@ -37,8 +38,9 @@ public class UploadDataNewTask {
     /**
      * 车辆信息-添加
      */
-//    @Scheduled(cron = "0 8/15 * * * ?")
+    @Scheduled(cron = "0 8/5 * * * ?")
     public void uploadTransportVehicleInfo() {
+        log.info("车辆信息-添加");
         try {
             transportVehicleInfoService.getAndUploadTransportVehicleInfoList(Boolean.TRUE);
         } catch (Exception e) {
@@ -49,8 +51,9 @@ public class UploadDataNewTask {
     /**
      * 非道路移动机械信息-添加
      */
-//    @Scheduled(cron = "0 0/15 * * * *")
+    @Scheduled(cron = "0 0/15 * * * *")
     public void uploadNoneRoadMovementInfo() {
+        log.info("非道路移动机械信息-添加");
         try {
             noneRoadMovementInfoService.getNoWayDate();
         } catch (Exception e) {
@@ -60,6 +63,7 @@ public class UploadDataNewTask {
 
     @Scheduled(cron = "0 */1 * * * ?")
     public void uploadInAndOutDate() {
+        log.info("车辆出入厂货物信息");
         try {
             inAndOutDateService.uploadInAndOutDate();
         } catch (Exception e) {
@@ -69,10 +73,11 @@ public class UploadDataNewTask {
 
     @Scheduled(cron = "0 */1 * * * ?")
     public void uploadTransportDateInfo() {
+        log.info("车辆出入厂信息-添加");
         try {
             transportDateService.uploadTransportDate();
         } catch (Exception e) {
-            log.error("上传货物异常: {}", e);
+            log.error("上传货物异常", e);
         }
     }
 

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

+package com.bme.access.upload.module.dao;
+
+
+import com.bme.access.upload.module.module.TransportVehicleInfoUrl;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 车辆电子运行台账
+ *
+ * @author yutyi
+ * @date 2020/07/28
+ */
+@Mapper
+public interface TransportVehicleInfoFailMapper {
+    void insertFail(@Param("numberPlate") String numberPlate);
+}
\ No newline at end of file

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

@@ -35,6 +35,7 @@ public class InFactoryTransportVehicleInfoService {
                 loginService.login();
             } catch (Exception e) {
                 log.error("更新token失败：{}", e.getMessage());
+                return;
             }
         }
         for (InFactoryTransportVehicleInfo inFactoryTransportVehicleInfo : inFactoryTransportVehicleInfos) {

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

@@ -30,12 +30,12 @@ public class NoneRoadMovementInfoService {
         List<NoneRoadMovementInfoUrl> noneRoadMovementInfoUrls = noneRoadMovementInfoMapper.selectNoneRoadMovementInfo1();
         log.info("查询非道路数据有: {} 条 ", noneRoadMovementInfoUrls.size());
         List<NoneRoadMovementInfo> noneRoadMovementInfos = beanConverter.convertNoneRoadMovementInfo(noneRoadMovementInfoUrls);
-        log.info("数据转换完成");
         if (!CollectionUtils.isEmpty(noneRoadMovementInfos)) {
             try {
                 loginService.login();
             } catch (Exception e) {
                 log.error("更新token失败：{}", e.getMessage());
+                return;
             }
         }
         for (NoneRoadMovementInfo noneRoadMovementInfo : noneRoadMovementInfos) {

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.bme.access.upload.common.DateUtils;
 import com.bme.access.upload.common.HttpUtils;
 import com.bme.access.upload.module.dao.DataUploadTimeMapper;
+import com.bme.access.upload.module.dao.TransportVehicleInfoFailMapper;
 import com.bme.access.upload.module.dao.TransportVehicleInfoMapper;
 import com.bme.access.upload.module.module.TransportVehicleInfoUrl;
 import com.bme.access.upload.module.module.upload.TransportVehicleResultInfo;
@@ -18,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
@@ -37,6 +39,8 @@ public class TransportVehicleInfoService {
     private LoginService loginService;
     @Autowired
     private BeanConverter beanConverter;
+    @Resource
+    private TransportVehicleInfoFailMapper transportVehicleInfoFailMapper;
 
     private final static String ADD_VEHICLE_URL = "https://dctapi.soszyzg.com/dct/new/addVehicleInfo";
 
@@ -53,21 +57,23 @@ public class TransportVehicleInfoService {
         }
     }
 
-    private void getAndUploadTransportVehicleInfo(String uploadTime, Boolean flag) throws Exception {
+    private void getAndUploadTransportVehicleInfo(String uploadTime, Boolean flag) {
         log.info("执行车辆信息上传线程");
 
         List<TransportVehicleInfoUrl> uploadTransportVehicleInfoList = transportVehicleInfoMapper.getUploadTransportVehicleInfo(uploadTime);
         if (!CollectionUtils.isEmpty(uploadTransportVehicleInfoList)) {
-            loginService.login();
+            try {
+                loginService.login();
+            } catch (Exception e) {
+                log.error("更新token失败：{}", e.getMessage());
+                return;
+            }
         }
         for (TransportVehicleInfoUrl transportVehicleInfoUrl : uploadTransportVehicleInfoList) {
-            if (StringUtils.isEmpty(transportVehicleInfoUrl.getNumberPlate()) || transportVehicleInfoUrl.getNumberPlate().length() >= 10) {
+            if (StringUtils.isEmpty(transportVehicleInfoUrl.getNumberPlate())) {
                 log.info("车辆上传车牌异常={}", JSON.toJSONString(transportVehicleInfoUrl));
                 continue;
             }
-            if (StringUtils.isEmpty(transportVehicleInfoUrl.getRegistrationDate())) {
-                transportVehicleInfoUrl.setRegistrationDate(LocalDate.now().with(TemporalAdjusters.firstDayOfYear()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
-            }
             UploadTransportVehicleInfo uploadVehicleInfo = beanConverter.convertTransportVehicleInfo(transportVehicleInfoUrl);
             try {
                 String bodyJson = JSONObject.toJSONString(uploadVehicleInfo);
@@ -81,7 +87,8 @@ public class TransportVehicleInfoService {
                     HttpUtils.sendPost(ADD_VEHICLE_URL, null, null, bodyJson);
                     Thread.sleep(50);
                 } catch (Exception ex) {
-                    log.info("再次失败，将此数据存于失败表");
+                    log.info("再次失败，将此数据存于车辆失败表uploadVehicleInfo={}", JSON.toJSONString(uploadVehicleInfo));
+                    transportVehicleInfoFailMapper.insertFail(transportVehicleInfoUrl.getNumberPlate());
                 }
             }
         }

src/main/resources/mapper/TransportVehicleInfoFailMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bme.access.upload.module.dao.TransportVehicleInfoFailMapper">
+
+    <insert id="insertFail">
+        insert into New_Transport_Vehicle_Info_Url_Upload_Fail(Number_plate) values (#{numberPlate})
+    </insert>
+</mapper>
\ No newline at end of file