فهرست منبع

流程编辑器逻辑修改

zhenglingfeng 8 سال پیش
والد
کامیت
a8f1acb78e

+ 14 - 3
src/main/java/com/yihu/hos/system/controller/ProcessController.java

@ -1,6 +1,5 @@
package com.yihu.hos.system.controller;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.system.service.ProcessManager;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
@ -24,7 +23,8 @@ public class ProcessController  extends BaseController {
     * @return
     */
    @RequestMapping("/initial")
    public String processInitial(Model model) {
    public String processInitial(Model model, Integer flowId) {
        model.addAttribute("flowId", flowId);
        model.addAttribute("contentPage", "system/process/process");
        return "partView";
    }
@ -49,6 +49,17 @@ public class ProcessController  extends BaseController {
        }
    }
    @RequestMapping(value = "/chat", method = RequestMethod.POST)
    @ResponseBody
    public Result getFlowchat(Integer flowId) {
        try {
            String flowchat = processManager.getFlowchat(flowId);
            return Result.success(flowchat);
        } catch (Exception e) {
            return Result.error("生成业务流程失败");
        }
    }
    @RequestMapping(value = "/json", method = RequestMethod.POST)
    @ResponseBody
    public Result formatJson(String code, String name, String positionJson, String flowJson) {
@ -59,7 +70,7 @@ public class ProcessController  extends BaseController {
            }
            processManager.saveProcess(code, name, flowId, positionJson);
            return Result.error("生成业务流程成功");
            return Result.success("生成业务流程成功");
        } catch (Exception e) {
            return Result.error("生成业务流程失败");
        }

+ 8 - 0
src/main/java/com/yihu/hos/system/dao/FlowProcessDao.java

@ -23,4 +23,12 @@ public class FlowProcessDao extends SQLGeneralDAO {
        }
        return null;
    }
    public SystemServiceFlowProcess getFlowProcessByFlowId(Integer flowId) throws Exception {
        List<SystemServiceFlowProcess> list = (List<SystemServiceFlowProcess>) super.hibernateTemplate.find("from SystemServiceFlowProcess s where flowId=? ", flowId);
        if (!CollectionUtil.isEmpty(list)) {
            return list.get(0);
        }
        return null;
    }
}

+ 13 - 2
src/main/java/com/yihu/hos/system/service/ProcessManager.java

@ -88,6 +88,17 @@ public class ProcessManager {
//        return Result.success(result);
//    }
    public String getFlowchat(Integer flowId) throws Exception {
        SystemServiceFlowProcess serviceFlowProcess = processDao.getFlowProcessByFlowId(flowId);
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("code", serviceFlowProcess.getCode());
        jsonObject.put("name", serviceFlowProcess.getName());
        jsonObject.put("flowId", serviceFlowProcess.getFlowId());
        jsonObject.put("result", serviceFlowProcess.getResult());
        return jsonObject.toString();
    }
    public Result getAllProcessor(String processorName) throws Exception {
        List<SystemServiceFlowProcessor> processorList = processorDao.getListByName(processorName);
        List<ProcessResultModel> resultModelList = new ArrayList<>();
@ -271,8 +282,8 @@ public class ProcessManager {
        String fileInfo = editor.generate(javaName, packageName);
        Integer flowId = flowManager.sendAddRoute(code, name, javaName, packageName, fileInfo);
        return flowId;
//        Integer flowId = flowManager.sendAddRoute(code, name, javaName, packageName, fileInfo);
        return null;
    }
    //首字母转大写