youxiw2000 / trash · Commits

Commit ae6c31eab8058fe995a23fb942f3bcec71a598eb

Authored by youxiw2000
1 parent a5eeef3a
build: skipped

m

Inline Side-by-side
Showing 7 changed files with 25 additions and 22 deletions
trash-admin/src/main/resources/application-dev.yml
  View file @ae6c31e
... ... @@ -17,11 +17,11 @@ trash:
17 17 # 验证码类型 math 数组计算 char 字符验证
18 18 captchaType: math
19 19 # 远程服务器地址
20   - remotePath: http://175.6.47.84:8008
21   - token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
  20 + # remotePath: http://175.6.47.84:8008
  21 + # token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
22 22 #remotePath: http://cszhatu.natapp1.cc
23   - # remotePath: http://175.178.228.30:8008
24   - # token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
  23 + remotePath: http://175.178.228.30:8008
  24 + token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
25 25  
26 26  
27 27 # 数据源配置
... ...
trash-admin/src/main/resources/application-local.yml
  View file @ae6c31e
... ... @@ -17,8 +17,8 @@ trash:
17 17 # 验证码类型 math 数组计算 char 字符验证
18 18 captchaType: math
19 19 # 远程服务器地址
20   - #remotePath: http://175.6.47.84:8008
21   - #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
  20 + # remotePath: http://175.6.47.84:8008
  21 + # token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
22 22 #remotePath: http://cszhatu.natapp1.cc
23 23 remotePath: http://175.178.228.30:8008
24 24 token: Bearer durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
... ...
trash-ui/vue.config.js
  View file @ae6c31e
... ... @@ -41,13 +41,13 @@ module.exports = {
41 41 }
42 42 },
43 43 ['/voice']: {
44   - // target: `http://127.0.0.1:15001/`,
45   - target: `http://175.6.47.84:8008`,
  44 + target: `http://127.0.0.1:15001/`,
  45 + // target: `http://175.6.47.84:8008`,
46 46 changeOrigin: true,
47 47 },
48 48 ['/api']: {
49   - // target: `http://175.178.228.30:8008`,
50   - target: `http://175.6.47.84:8008`,
  49 + target: `http://175.178.228.30:8008`,
  50 + // target: `http://175.6.47.84:8008`,
51 51 changeOrigin: true,
52 52 }
53 53  
... ...
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
  View file @ae6c31e
... ... @@ -380,7 +380,7 @@ public class SupervisionThreestepController extends BaseController {
380 380 }
381 381  
382 382 if (i == -3) {
383   - return AjaxResult.error("项目已超期!");
  383 + return AjaxResult.error("项目本次清运周期已超期!");
384 384 }
385 385 if (i == -4) {
386 386 return AjaxResult.error("报工数据异常,请刷新页面重新提交!");
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
  View file @ae6c31e
... ... @@ -769,8 +769,8 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
769 769 long time = new Date().getTime();
770 770  
771 771 try {
772   - if (dateTime.parse(jsonObject.get("effectiveFrom").toString() + " 00:00:00").getTime() > time
773   - || dateTime.parse(jsonObject.get("effectiveEnd").toString() + " 23:59:59")
  772 + if (dateTime.parse(jsonObject.get("thisTransferFrom").toString() + " 00:00:00").getTime() > time
  773 + || dateTime.parse(jsonObject.get("thisTransferEnd").toString() + " 23:59:59")
774 774 .getTime() < time) {
775 775 return -3;
776 776 }
... ...
trash-workFlow/src/main/java/com/trash/workflow/listener/baseDataListener.java
  View file @ae6c31e
... ... @@ -27,9 +27,8 @@ public class baseDataListener implements ExecutionListener {
27 27  
28 28 private static final Logger log = LoggerFactory.getLogger(baseDataListener.class);
29 29  
30   - @Autowired
31   - trashConfig trashConfig;
32   -
  30 + int errorCount = 0;
  31 +
33 32 @Override
34 33 public void notify(DelegateExecution delegateExecution) {
35 34  
... ... @@ -62,14 +61,15 @@ public class baseDataListener implements ExecutionListener {
62 61  
63 62  
64 63 if(!object){
65   - final String token = trashConfig.getToken();
  64 + trashConfig config = SpringUtils.getBean(trashConfig.class);
  65 + final String token = config.getToken();
66 66 new Thread(new Runnable() {
67 67  
68 68 @Override
69 69 public void run() {
70 70 while(true){
  71 + errorCount++;
71 72 try {
72   -
73 73 boolean object = false;
74 74 if(delegateExecution.getProcessInstanceBusinessKey().contains("company")){
75 75 object = (boolean)RemoteServerUtils.updateCompanyAudit(list,token);
... ... @@ -80,9 +80,8 @@ public class baseDataListener implements ExecutionListener {
80 80 if(delegateExecution.getProcessInstanceBusinessKey().contains("driver")){
81 81 object = (boolean)RemoteServerUtils.updateDriverAudit(list,token);
82 82 }
83   -
84 83 try {
85   - log.info("baseDataListener:" + delegateExecution.getProcessInstanceBusinessKey().split(":")[1] + "" + object);
  84 + log.info("baseDataListener:" + delegateExecution.getProcessInstanceBusinessKey().split(":")[1] + "" + object);
86 85 Thread.sleep(30000);
87 86 } catch (InterruptedException e) {
88 87 // TODO Auto-generated catch block
... ... @@ -91,7 +90,6 @@ public class baseDataListener implements ExecutionListener {
91 90 if(object){
92 91 break;
93 92 }
94   -
95 93 } catch (Exception e) {
96 94 e.printStackTrace();
97 95 }
... ... @@ -102,6 +100,11 @@ public class baseDataListener implements ExecutionListener {
102 100 // TODO Auto-generated catch block
103 101 e.printStackTrace();
104 102 }
  103 +
  104 + if(errorCount > 100){
  105 + log.info("erro baseDataListener:" + delegateExecution.getProcessInstanceBusinessKey().split(":")[1]);
  106 + break;
  107 + }
105 108  
106 109 }
107 110  
... ...
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
  View file @ae6c31e
... ... @@ -82,7 +82,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
82 82  
83 83 String outArea = "株洲市,湘潭市,汨罗市,湘阴县";
84 84  
85   - String tcdOutArea = "长沙县,望城区,浏阳市,宁乡市"; // 车企人外区
  85 + String tcdOutArea = "长沙县,湘江新区,浏阳市,宁乡市"; // 车企人外区
86 86  
87 87 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
88 88  
... ...