m

youxiw2000
1 parent a5eeef3a
Showing 7 changed files with 25 additions and 22 deletions
trash-admin/src/main/resources/application-dev.yml
trash-admin/src/main/resources/application-local.yml
trash-ui/vue.config.js
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
trash-workFlow/src/main/java/com/trash/workflow/listener/baseDataListener.java
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
@@ -17,11 +17,11 @@ trash:
     # 验证码类型 math 数组计算 char 字符验证
     captchaType: math
     # 远程服务器地址
-    remotePath: http://175.6.47.84:8008
-    token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
+    # remotePath: http://175.6.47.84:8008
+    # token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
     #remotePath: http://cszhatu.natapp1.cc
-    # remotePath: http://175.178.228.30:8008
-    # token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
+    remotePath: http://175.178.228.30:8008
+    token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
 # 数据源配置
@@ -17,8 +17,8 @@ trash:
     # 验证码类型 math 数组计算 char 字符验证
     captchaType: math
     # 远程服务器地址
-    #remotePath: http://175.6.47.84:8008
-    #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
+    # remotePath: http://175.6.47.84:8008
+    # token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
     #remotePath: http://cszhatu.natapp1.cc
     remotePath: http://175.178.228.30:8008
     token: Bearer durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
@@ -41,13 +41,13 @@ module.exports = {
         }
       },
         ['/voice']: {
-          // target: `http://127.0.0.1:15001/`,
-          target: `http://175.6.47.84:8008`,
+          target: `http://127.0.0.1:15001/`,
+          // target: `http://175.6.47.84:8008`,
           changeOrigin: true,
         },
         ['/api']: {
-          // target: `http://175.178.228.30:8008`,
-          target: `http://175.6.47.84:8008`,
+          target: `http://175.178.228.30:8008`,
+          // target: `http://175.6.47.84:8008`,
           changeOrigin: true,
         }
@@ -380,7 +380,7 @@ public class SupervisionThreestepController extends BaseController {
 		}
 		if (i == -3) {
-			return AjaxResult.error("项目已超期!");
+			return AjaxResult.error("项目本次清运周期已超期!");
 		}
 		if (i == -4) {
 			return AjaxResult.error("报工数据异常,请刷新页面重新提交!");
@@ -769,8 +769,8 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 				long time = new Date().getTime();
 				try {
-					if (dateTime.parse(jsonObject.get("effectiveFrom").toString() + " 00:00:00").getTime() > time
-							|| dateTime.parse(jsonObject.get("effectiveEnd").toString() + " 23:59:59")
+					if (dateTime.parse(jsonObject.get("thisTransferFrom").toString() + " 00:00:00").getTime() > time
+							|| dateTime.parse(jsonObject.get("thisTransferEnd").toString() + " 23:59:59")
 									.getTime() < time) {
 						return -3;
 					}
@@ -27,9 +27,8 @@ public class baseDataListener implements ExecutionListener {
     private static final Logger log = LoggerFactory.getLogger(baseDataListener.class);
-    @Autowired
-    trashConfig trashConfig;
-    
+    int errorCount = 0;
+        
     @Override
     public void notify(DelegateExecution delegateExecution) {
@@ -62,14 +61,15 @@ public class baseDataListener implements ExecutionListener {
     	if(!object){
-    		final String token = trashConfig.getToken();
+    		trashConfig config = SpringUtils.getBean(trashConfig.class);
+    		final String token = config.getToken();
     		new Thread(new Runnable() {
     			@Override
     			public void run() {
     				while(true){
+    					errorCount++;
     					try {
-						
 	    					boolean object = false;
 	    			    	if(delegateExecution.getProcessInstanceBusinessKey().contains("company")){
 	    			    		object = (boolean)RemoteServerUtils.updateCompanyAudit(list,token);
@@ -80,9 +80,8 @@ public class baseDataListener implements ExecutionListener {
 	    			    	if(delegateExecution.getProcessInstanceBusinessKey().contains("driver")){
 	    			    		object = (boolean)RemoteServerUtils.updateDriverAudit(list,token);
 	    			    	}
-	    			    	
 	    			    	try {
-	  				          log.info("baseDataListener:" + delegateExecution.getProcessInstanceBusinessKey().split(":")[1] + "" + object);
+	  				          	log.info("baseDataListener:" + delegateExecution.getProcessInstanceBusinessKey().split(":")[1] + "" + object);
 		  						Thread.sleep(30000);
 		  					} catch (InterruptedException e) {
 		  						// TODO Auto-generated catch block
@@ -91,7 +90,6 @@ public class baseDataListener implements ExecutionListener {
 	    			    	if(object){
 	    			    		break;
 	    			    	}
-	    			    	
     					} catch (Exception e) {
     						e.printStackTrace();
 						}
@@ -102,6 +100,11 @@ public class baseDataListener implements ExecutionListener {
 		  						// TODO Auto-generated catch block
 		  						e.printStackTrace();
 		  					}
+    					
+    					if(errorCount > 100){
+  				          	log.info("erro baseDataListener:" + delegateExecution.getProcessInstanceBusinessKey().split(":")[1]);
+  				          	break;
+    					}
     				}
@@ -82,7 +82,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
 	String outArea = "株洲市,湘潭市,汨罗市,湘阴县";
-	String tcdOutArea = "长沙县,望城区,浏阳市,宁乡市"; // 车企人外区
+	String tcdOutArea = "长沙县,湘江新区,浏阳市,宁乡市"; // 车企人外区
 	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");