From 77ac6b72ed82d51d0d45bf156ac1b5bb3cb15782 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 19 三月 2024 14:01:43 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/asrs/controller/FlowController.java | 55 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/asrs/controller/FlowController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/asrs/controller/FlowController.java
index 441ea98..8b75166 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/asrs/controller/FlowController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/asrs/controller/FlowController.java
@@ -1,24 +1,28 @@
package com.zy.asrs.wcs.asrs.controller;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wcs.asrs.entity.FlowGraph;
import com.zy.asrs.wcs.asrs.entity.param.FlowLogicCodeParam;
+import com.zy.asrs.wcs.asrs.service.FlowGraphService;
+import com.zy.asrs.wcs.core.thread.FlowExecute;
+import com.zy.asrs.wcs.system.controller.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
+import java.util.*;
@RestController
-@RequestMapping("/flow")
-public class FlowController {
+@RequestMapping("/api")
+public class FlowController extends BaseController {
- @PostMapping("/analysisExportData")
+ @Autowired
+ private FlowGraphService flowGraphService;
+ @Autowired
+ private FlowExecute flowExecute;
+
+ @PostMapping("/flow/analysisExportData")
public R analysisExportData(@RequestBody HashMap<String, Object> param) {
- System.out.println(param);
List<LinkedHashMap<String, Object>> data = (List<LinkedHashMap<String, Object>>) param.get("data");
ArrayList<FlowLogicCodeParam> list = new ArrayList<>();
@@ -32,7 +36,7 @@
Boolean isLogic = Boolean.parseBoolean(mapData.get("isLogic").toString());
String searchLogicId = mapData.get("searchLogicId").toString();
Boolean searchLogicBool = Boolean.parseBoolean(mapData.get("searchLogicBool").toString());
- String codeContent = mapData.get("codeContent").toString();
+ String codeContent = mapData.get("codeContent") == null ? "" : mapData.get("codeContent").toString();
if (isLogic) {
FlowLogicCodeParam flowLogicCodeParam = new FlowLogicCodeParam();
flowLogicCodeParam.setId(id);
@@ -60,9 +64,36 @@
}
- System.out.println(list);
+ FlowGraph flowGraph = new FlowGraph();
+ if (param.get("id") != null) {
+ flowGraph.setId(Integer.parseInt(param.get("id").toString()));
+ }else {
+ flowGraph.setCreateTime(new Date());
+ flowGraph.setStatus(0);
+ }
+ flowGraph.setName(param.get("name").toString());
+ flowGraph.setMemo(param.get("memo").toString());
+ flowGraph.setOriginData(param.get("originData").toString());
+ flowGraph.setProcessData(JSON.toJSONString(list));
+ flowGraph.setUpdateTime(new Date());
+ flowGraph.setHostId(getHostId());
+ flowGraphService.saveOrUpdate(flowGraph);
return R.ok();
}
+ @PostMapping("/flow/mockRun")
+ public R mockRun(@RequestBody HashMap<String, Object> param) {
+ FlowGraph flowGraph = flowGraphService.getById(param.get("id").toString());
+ if (flowGraph == null) {
+ return R.error("娴佺▼鍥句笉瀛樺湪");
+ }
+
+ //寮�濮嬫ā鎷熸墽琛�
+ String processData = flowGraph.getProcessData();
+ List<FlowLogicCodeParam> list = JSON.parseArray(processData, FlowLogicCodeParam.class);
+ boolean execute = flowExecute.execute(list);
+ return R.ok().add(execute);
+ }
+
}
--
Gitblit v1.9.1