dengsixing пре 1 месец
родитељ
комит
38d3615cb4

+ 7 - 0
src/main/java/com/fdkankan/external/listener/DemoDataListener.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.read.listener.ReadListener;
 import com.alibaba.excel.util.ListUtils;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.external.entity.ZgxxzxPushLog;
 import com.fdkankan.external.service.IScenePlusService;
 import com.fdkankan.external.service.IZgxxzxPushLogService;
@@ -79,4 +80,10 @@ public class DemoDataListener implements ReadListener<ZgxxzxPushLog> {
         zgxxzxPushLogService.saveBatch(cachedDataList);
         log.info("存储数据库成功!");
     }
+
+    public static void main(String[] args) {
+        JSONObject aa = new JSONObject();
+        aa.put("shootCount", null);
+        System.out.println(aa.getInteger("shootCount"));
+    }
 }

+ 2 - 2
src/main/java/com/fdkankan/external/service/impl/XinxizhongxinServiceImpl.java

@@ -158,9 +158,9 @@ public class XinxizhongxinServiceImpl implements XinxizhongxinService {
         for (ZgxxzxPushLog zgxxzxPushLog : list) {
             ResultData<Integer> resultData = xxzxClient.getDeployStatus(zgwwxxzx.getDestUrl() + "/historyrical/scene/getDeployStatus?taskId=" + zgxxzxPushLog.getTaskId());
             Integer status = resultData.getData();
-            if(status == CommonSuccessStatus.WAITING.code()){
+            if(status == CommonSuccessStatus.WAITING.code() || status == 2 || status == 3){
                 DateTime dateTime = DateExtUtil.offsetDay(new Date(), -7);
-                if(zgxxzxPushLog.getCreateTime().before(dateTime)){//7天都还没部署成功的,为失败
+                if(zgxxzxPushLog.getCreateTime().before(dateTime)){//7天都还没部署成功的,为失败
                     zgxxzxPushLog.setStatus(CommonSuccessStatus.FAIL.code());
                 }else{
                     continue;