#

Junjie

2024-04-16 b410d11448b86685894e5d5f60263a7fd3b6c357

#

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/asrs/controller/FlowController.java

@@ -1,6 +1,7 @@
package com.zy.asrs.wcs.asrs.controller;

import com.alibaba.fastjson.JSON;
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;
@@ -72,11 +73,10 @@
            flowGraph.setStatus(0);
        }
        flowGraph.setName(param.get("name").toString());
        flowGraph.setMemo(param.get("memo").toString());
        flowGraph.setMemo(param.get("memo") == null ? "" : param.get("memo").toString());
        flowGraph.setOriginData(param.get("originData").toString());
        flowGraph.setProcessData(JSON.toJSONString(list));
        flowGraph.setProcessData(JSON.toJSONString(param.get("data")));
        flowGraph.setUpdateTime(new Date());
        flowGraph.setHostId(getHostId());
        flowGraphService.saveOrUpdate(flowGraph);

        return R.ok();
@@ -91,7 +91,8 @@

        //开始模拟执行
        String processData = flowGraph.getProcessData();
        List<FlowLogicCodeParam> list = JSON.parseArray(processData, FlowLogicCodeParam.class);
//        List<FlowLogicCodeParam> list = JSON.parseArray(processData, FlowLogicCodeParam.class);
        List<JSONObject> list = JSON.parseArray(processData, JSONObject.class);
        boolean execute = flowExecute.execute(list);
        return R.ok().add(execute);
    }

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java

@@ -442,6 +442,11 @@
                continue;
            }

            ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
            if (shuttleProtocol == null) {
                continue;
            }

            if (!shuttleThread.isCharging()) {
                continue;
            }

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/FlowExecute.java

@@ -1,8 +1,12 @@
package com.zy.asrs.wcs.rcs.thread;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.wcs.asrs.entity.param.FlowLogicCodeParam;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.codec.digest.Md5Crypt;
import org.springframework.stereotype.Component;

import java.util.List;
@@ -12,61 +16,99 @@
public class FlowExecute {

    //执行流程图
    public boolean execute(List<FlowLogicCodeParam> list) {
        for (FlowLogicCodeParam param : list) {
            if (param.getId().equals("1")) {
                return executeFlow(param.getLogicTrue());
            }
        }
        System.out.println(list);
        return false;
    public boolean execute(List<JSONObject> list) {
        String currentId = list.get(0).getString("id");

        String listId = DigestUtils.md5Hex(JSON.toJSONString(list));

        while (currentId != null) {
            //获取流程图
            JSONObject flow = findFLow(list, currentId);
            if (flow == null) {
                break;
    }

    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);
            //执行
            boolean result = executeFlow(flow, listId);

            //执行后续流程
            if (Cools.isEmpty(flow.get("nextTrue")) && Cools.isEmpty(flow.get("nextFalse"))) {
                break;//无后续流程
                    }

                    if (!statusFlag) {
                        //判断不通过
                        if (staJudgementFailExecute.equals("stop")) {
                            //判断失败后不继续执行
                            return false;
                        }
            //更新id
            currentId = result ? flow.getString("nextTrue") : flow.getString("nextFalse");
                    }

        System.out.println("执行完成");
        return true;
                }

                if (writeWorkNoStatus) {
                    //写入工作号
    private boolean executeFlow(JSONObject flow, String listId) {
        System.out.println(flow.getString("id") + "被执行");
        String type = flow.getString("type");
        if (type.equals("devp")) {

        } else if (type.equals("shuttle")) {

        }
        return true;
                }

                if (writeStaNoStatus) {
                    //写入目标站
    private JSONObject findFLow(List<JSONObject> list, String id) {
        for (JSONObject flow : list) {
            if (flow.getString("id").equals(id)) {
                return flow;
                }
                System.out.println(devp);
            }
            System.out.println(data);
        return null;
        }

        System.out.println(list);
        return false;
    }
//    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;
//    }

}