From e222fba1a5aab1c9877667560629ae643133cb7d Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 19 四月 2024 14:25:08 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/FlowExecute.java | 203 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 156 insertions(+), 47 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/FlowExecute.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/FlowExecute.java
index 2725023..f3ad71a 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/FlowExecute.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/FlowExecute.java
@@ -1,8 +1,18 @@
package com.zy.asrs.wcs.rcs.thread;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.wcs.asrs.entity.param.FlowLogicCodeParam;
+import com.zy.asrs.wcs.core.entity.Task;
+import com.zy.asrs.wcs.core.service.TaskService;
+import com.zy.asrs.wcs.core.utils.RedisUtil;
+import com.zy.asrs.wcs.core.utils.ShuttleDispatcher;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.codec.digest.Md5Crypt;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
@@ -11,62 +21,161 @@
@Component
public class FlowExecute {
+ @Autowired
+ private RedisUtil redisUtil;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private ShuttleDispatcher shuttleDispatcher;
+
//鎵ц娴佺▼鍥�
- public boolean execute(List<FlowLogicCodeParam> list) {
- for (FlowLogicCodeParam param : list) {
- if (param.getId().equals("1")) {
- return executeFlow(param.getLogicTrue());
+ public boolean execute(List<JSONObject> list) {
+ String currentId = list.get(0).getString("id");
+
+ JSONObject devpType = list.get(0).getJSONObject("data").getJSONObject("devpType");
+ String staNo = devpType.getString("staNo");
+ //鎼滅储宸ヤ綔妗�
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
+ .eq(Task::getOriginSite, staNo)
+ .eq(Task::getStatus, 1));
+
+ for (Task task : tasks) {
+ String redisKey = DigestUtils.md5Hex(JSON.toJSONString(list));
+
+ while (currentId != null) {
+ //鑾峰彇娴佺▼鍥�
+ JSONObject flow = findFLow(list, currentId);
+ if (flow == null) {
+ break;
+ }
+
+ //鎵ц
+ boolean result = executeFlow(task, flow, redisKey);
+
+ //鎵ц鍚庣画娴佺▼
+ if (Cools.isEmpty(flow.get("nextTrue")) && Cools.isEmpty(flow.get("nextFalse"))) {
+ break;//鏃犲悗缁祦绋�
+ }
+
+ //鏇存柊id
+ currentId = result ? flow.getString("nextTrue") : flow.getString("nextFalse");
}
+
+ System.out.println("鎵ц瀹屾垚");
+ redisUtil.del(redisKey);//閲婃斁缂撳瓨
}
- System.out.println(list);
- return false;
+ return true;
}
- private boolean executeFlow(List<Map<String, Object>> list) {
- for (Map<String, Object> map : list) {
- JSONObject data = (JSONObject) map.get("data");
- if (data.getString("type").equals("devp")) {
- JSONObject devp = data.getJSONObject("devpType");
- String devpNo = devp.getString("devpNo");//杈撻�佺嚎PLC
- String staNo = devp.getString("staNo");//绔欏彿
- Boolean enableStaStatus = devp.getBoolean("enableStaStatus");//鍒ゆ柇绔欑偣鐘舵��
- JSONArray staStatus = devp.getJSONArray("staStatus");//绔欑偣鐘舵�佸垪琛�
- String staJudgementFailExecute = devp.getString("staJudgementFailExecute");//鍒ゆ柇澶辫触鍚庢槸鍚︾户缁墽琛屾祦绋�
- Boolean writeWorkNoStatus = devp.getBoolean("writeWorkNoStatus");//鏄惁鍐欏叆宸ヤ綔鍙�
- Boolean writeStaNoStatus = devp.getBoolean("writeStaNoStatus");//鏄惁鍐欏叆鐩爣绔�
- String writeWorkNo = devp.getString("writeWorkNo");//鍐欏叆宸ヤ綔鍙锋暟鎹�
- String writeStaNo = devp.getString("writeStaNo");//鍐欏叆鐩爣绔欐暟鎹�
- if (enableStaStatus) {
- //鍒ゆ柇绔欑偣鐘舵��
- boolean statusFlag = true;//榛樿鍒ゆ柇閫氳繃
- for (Object status : staStatus) {
- System.out.println(status);
- }
+ private boolean executeFlow(Task task, JSONObject flow, String redisKey) {
+ System.out.println(flow.getString("id") + "琚墽琛�");
+ JSONObject data = flow.getJSONObject("data");
+ String type = data.getString("type");
+ boolean result = false;
+ if (type.equals("devp")) {
+ result = executeDevpFlow(task, data, redisKey);
+ } else if (type.equals("shuttle")) {
+ result = executeShuttleFlow(task, data, redisKey);
+ }
+ return result;
+ }
- if (!statusFlag) {
- //鍒ゆ柇涓嶉�氳繃
- if (staJudgementFailExecute.equals("stop")) {
- //鍒ゆ柇澶辫触鍚庝笉缁х画鎵ц
- return false;
- }
- }
-
- }
-
- if (writeWorkNoStatus) {
- //鍐欏叆宸ヤ綔鍙�
- }
-
- if (writeStaNoStatus) {
- //鍐欏叆鐩爣绔�
- }
- System.out.println(devp);
+ private JSONObject findFLow(List<JSONObject> list, String id) {
+ for (JSONObject flow : list) {
+ if (flow.getString("id").equals(id)) {
+ return flow;
}
- System.out.println(data);
+ }
+ return null;
+ }
+
+ private boolean executeDevpFlow(Task task, JSONObject data, String redisKey) {
+ JSONObject devpType = data.getJSONObject("devpType");
+ String staNo = devpType.getString("staNo");
+ //鎼滅储宸ヤ綔
+
+ return true;
+ }
+
+ private boolean executeShuttleFlow(Task task, JSONObject data, String redisKey) {
+ JSONObject shuttleType = data.getJSONObject("shuttleType");
+ JSONArray shuttleOper = shuttleType.getJSONArray("shuttleOper");
+ for (Object object : shuttleOper) {
+ String oper = String.valueOf(object);
+ if (oper.equals("searchIdleShuttle")) {
+ //鎼滅储绌洪棽杞�
+ ShuttleThread shuttleThread = shuttleDispatcher.searchIdleShuttle(task);
+ if (shuttleThread == null) {
+ return false;
+ }
+ //瀛樺叆缂撳瓨
+ redisSet(redisKey, "shuttleDevice", shuttleThread.getDevice());
+ return true;
+ }
}
- System.out.println(list);
- return false;
+ return true;
}
+ private boolean redisSet(String redisKey, String key, Object data) {
+ if (redisUtil.hasKey(redisKey)) {
+ Object obj = redisUtil.get(redisKey);
+ JSONObject object = JSON.parseObject(String.valueOf(obj));
+ object.put(key, data);
+ redisUtil.set(redisKey, JSON.toJSONString(object));
+ } else {
+ JSONObject object = new JSONObject();
+ object.put(key, data);
+ redisUtil.set(redisKey, JSON.toJSONString(object));
+ }
+ return true;
+ }
+
+// private boolean executeFlow(List<Map<String, Object>> list) {
+// for (Map<String, Object> map : list) {
+// JSONObject data = (JSONObject) map.get("data");
+// if (data.getString("type").equals("devp")) {
+// JSONObject devp = data.getJSONObject("devpType");
+// String devpNo = devp.getString("devpNo");//杈撻�佺嚎PLC
+// String staNo = devp.getString("staNo");//绔欏彿
+// Boolean enableStaStatus = devp.getBoolean("enableStaStatus");//鍒ゆ柇绔欑偣鐘舵��
+// JSONArray staStatus = devp.getJSONArray("staStatus");//绔欑偣鐘舵�佸垪琛�
+// String staJudgementFailExecute = devp.getString("staJudgementFailExecute");//鍒ゆ柇澶辫触鍚庢槸鍚︾户缁墽琛屾祦绋�
+// Boolean writeWorkNoStatus = devp.getBoolean("writeWorkNoStatus");//鏄惁鍐欏叆宸ヤ綔鍙�
+// Boolean writeStaNoStatus = devp.getBoolean("writeStaNoStatus");//鏄惁鍐欏叆鐩爣绔�
+// String writeWorkNo = devp.getString("writeWorkNo");//鍐欏叆宸ヤ綔鍙锋暟鎹�
+// String writeStaNo = devp.getString("writeStaNo");//鍐欏叆鐩爣绔欐暟鎹�
+// if (enableStaStatus) {
+// //鍒ゆ柇绔欑偣鐘舵��
+// boolean statusFlag = true;//榛樿鍒ゆ柇閫氳繃
+// for (Object status : staStatus) {
+// System.out.println(status);
+// }
+//
+// if (!statusFlag) {
+// //鍒ゆ柇涓嶉�氳繃
+// if (staJudgementFailExecute.equals("stop")) {
+// //鍒ゆ柇澶辫触鍚庝笉缁х画鎵ц
+// return false;
+// }
+// }
+//
+// }
+//
+// if (writeWorkNoStatus) {
+// //鍐欏叆宸ヤ綔鍙�
+// }
+//
+// if (writeStaNoStatus) {
+// //鍐欏叆鐩爣绔�
+// }
+// System.out.println(devp);
+// }
+// System.out.println(data);
+// }
+//
+// System.out.println(list);
+// return false;
+// }
+
}
--
Gitblit v1.9.1