Browse Source

数据统计-redis断开时间调整

黄远 5 years ago
parent
commit
7cf741a3e8

+ 12 - 10
lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/service/ContractDataService.java

@@ -48,16 +48,18 @@ public class ContractDataService {
             Map<Long, ContractDataModel> idToContractModel = contractDataModelList.stream().collect(Collectors.toMap(ContractDataModel::getId, a -> a));
             //设置合同状态
             contractDataModelList.forEach(a -> {
-                switch (a.getStatus()) {
-                    case 2:
-                        a.setContractType(2);
-                    case 3:
-                        //合同结束,如果有续签,则合同未丢失,如果没有需求合同丢失
-                        a.setContractType(3);
-                        ContractDataModel contractDataModel = idToContractModel.get(a.getId());
-                        if (contractDataModel != null) {
-                            a.setContractType(0);
-                        }
+                if (a.getStatus() != null) {
+                    switch (a.getStatus()) {
+                        case 2:
+                            a.setContractType(2);
+                        case 3:
+                            //合同结束,如果有续签,则合同未丢失,如果没有需求合同丢失
+                            a.setContractType(3);
+                            ContractDataModel contractDataModel = idToContractModel.get(a.getId());
+                            if (contractDataModel != null) {
+                                a.setContractType(0);
+                            }
+                    }
                 }
             });
         }

+ 1 - 0
lift-batch-service/src/main/resources/application-local.yml

@@ -18,6 +18,7 @@ spring:
         max-idle: 8 #最大空闲链接
         max-wait: 20000ms
         min-idle: 0
+    timeout: 600000
 
 #aliyun OSS服务配置信息,加载到SystemConfiguration
 aliyun: