nocommit

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/constant/ThirdPartyApiConstant.java

@@ -14,6 +14,11 @@ public class ThirdPartyApiConstant {
      */
     public static final String CQ_TOKEN_CACHE_KEY = "pps.third.cq.token";
 
+    /**
+     * 过期时间
+     */
+    public static final int MAX_SECOND = 300;
+
     /**
      * 长庆Token
      */

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/WellheadDailyProductionSituationService.java

@@ -153,9 +153,8 @@ public class WellheadDailyProductionSituationService {
         if (ObjectUtil.isNull(exist)) {
             token = this.getCqToken(context);
         } else {
-            long between = DateUtil.between(exist.getCurrentDate(), DateUtil.date(), DateUnit.SECOND);
             long duration = (long) exist.getDuration();
-            if (duration - between < 300) {
+            if (duration - DateUtil.between(exist.getCurrentDate(), DateUtil.date(), DateUnit.SECOND) < ThirdPartyApiConstant.MAX_SECOND) {
                 token = this.getCqToken(context);
             } else {
                 token = exist.getCode();