From 8fcab674e4781dafc9c4b9d2973ced5f952726f3 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 25 十一月 2021 09:15:08 +0800
Subject: [PATCH] 优化代码
---
service-common/src/main/java/com/java110/common/api/WorkflowApi.java | 143 +++++++++++++++++++++++++++++++++--------------
1 files changed, 100 insertions(+), 43 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/api/WorkflowApi.java b/service-common/src/main/java/com/java110/common/api/WorkflowApi.java
index fceb42c..7f1f6bd 100755
--- a/service-common/src/main/java/com/java110/common/api/WorkflowApi.java
+++ b/service-common/src/main/java/com/java110/common/api/WorkflowApi.java
@@ -1,24 +1,61 @@
package com.java110.common.api;
+import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.java110.common.bmo.workflow.IQueryWorkFlowFirstStaffBMO;
import com.java110.dto.workflow.WorkflowDto;
+import com.java110.dto.workflow.WorkflowModelDto;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
import org.activiti.editor.constants.ModelDataJsonConstants;
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.ProcessEngine;
+import org.activiti.engine.ProcessEngines;
import org.activiti.engine.RepositoryService;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.repository.Deployment;
import org.activiti.engine.repository.Model;
+import org.apache.batik.transcoder.TranscoderInput;
+import org.apache.batik.transcoder.TranscoderOutput;
+import org.apache.batik.transcoder.image.PNGTranscoder;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
@RestController
@RequestMapping("/workflow")
public class WorkflowApi {
+ private static final Logger logger = LoggerFactory.getLogger(WorkflowApi.class);
+
+ @Autowired
+ private RepositoryService repositoryService;
+
+ @Autowired
+ private ObjectMapper objectMapper;
+
+
+
+ String MODEL_ID = "modelId";
+ String MODEL_NAME = "name";
+ String MODEL_REVISION = "revision";
+ String MODEL_DESCRIPTION = "description";
+
+
@Autowired
private IQueryWorkFlowFirstStaffBMO queryWorkFlowFirstStaffBMOImpl;
@@ -34,55 +71,75 @@
return queryWorkFlowFirstStaffBMOImpl.query(workflowDto);
}
- private static final Logger logger = LoggerFactory.getLogger(ModelController.class);
-
- @Autowired
- private RepositoryService repositoryService;
- @Autowired
- private ObjectMapper objectMapper;
/**
- * 鍒涘缓妯″瀷
- * @param response
- * @param name 妯″瀷鍚嶇О
- * @param key 妯″瀷key
+ * 鏇存柊娴佺▼
+ *
+ * @param reqString 妯″瀷ID
+ * @ServiceCode /workflow/saveModel
*/
- @RequestMapping("/create")
- @ResponseBody
- public String create(HttpServletResponse response, String name, String key) throws IOException {
- logger.info("鍒涘缓妯″瀷鍏ュ弬name锛歿},key:{}",name,key);
- Model model = repositoryService.newModel();
- ObjectNode modelNode = objectMapper.createObjectNode();
- modelNode.put(ModelDataJsonConstants.MODEL_NAME, name);
- modelNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, "");
- modelNode.put(ModelDataJsonConstants.MODEL_REVISION, 1);
- model.setName(name);
- model.setKey(key);
- model.setMetaInfo(modelNode.toString());
- repositoryService.saveModel(model);
- createObjectNode(model.getId());
- logger.info("鍒涘缓妯″瀷缁撴潫锛岃繑鍥炴ā鍨婭D锛歿}",model.getId());
- return model.getId();
+ @RequestMapping(value = "/saveModel", method = RequestMethod.POST)
+ @ResponseStatus(value = HttpStatus.OK)
+ public ResponseEntity<String> saveModel(
+ @RequestBody String reqString) {
+ JSONObject reqJson = JSONObject.parseObject(reqString);
+ WorkflowModelDto workflowModelDto = BeanConvertUtil.covertBean(reqJson, WorkflowModelDto.class);
+
+ //閮ㄧ讲model
+ return queryWorkFlowFirstStaffBMOImpl.saveModel(workflowModelDto);
+
}
/**
- * 鍒涘缓妯″瀷鏃跺畬鍠凪odelEditorSource
+ * 閮ㄧ讲娴佺▼
+ *
+ * @param reqString 妯″瀷ID
+ * @ServiceCode /workflow/deployModel
+ */
+ @RequestMapping(value = "/deployModel", method = RequestMethod.POST)
+ @ResponseStatus(value = HttpStatus.OK)
+ public ResponseEntity<String> deployModel(
+ @RequestBody String reqString) {
+ JSONObject reqJson = JSONObject.parseObject(reqString);
+ WorkflowModelDto workflowModelDto = BeanConvertUtil.covertBean(reqJson, WorkflowModelDto.class);
+
+ //閮ㄧ讲model
+ return queryWorkFlowFirstStaffBMOImpl.deployModel(workflowModelDto);
+
+ }
+
+
+ /**
+ * 鑾峰彇model鐨勮妭鐐逛俊鎭紝缂栬緫鍣ㄦ牴鎹繑鍥炵殑json杩涜缁樺浘
+ *
* @param modelId
+ * @return
+ * @ServiceCode /workflow/getEditorJson
*/
@SuppressWarnings("deprecation")
- private void createObjectNode(String modelId){
- logger.info("鍒涘缓妯″瀷瀹屽杽ModelEditorSource鍏ュ弬妯″瀷ID锛歿}",modelId);
- ObjectNode editorNode = objectMapper.createObjectNode();
- editorNode.put("id", "canvas");
- editorNode.put("resourceId", "canvas");
- ObjectNode stencilSetNode = objectMapper.createObjectNode();
- stencilSetNode.put("namespace","http://b3mn.org/stencilset/bpmn2.0#");
- editorNode.put("stencilset", stencilSetNode);
- try {
- repositoryService.addModelEditorSource(modelId,editorNode.toString().getBytes("utf-8"));
- } catch (Exception e) {
- logger.info("鍒涘缓妯″瀷鏃跺畬鍠凪odelEditorSource鏈嶅姟寮傚父锛歿}",e);
+ @RequestMapping(value = "/getEditorJson", method = RequestMethod.GET)
+ public ResponseEntity getEditorJson(@RequestParam(value = "modelId") String modelId) {
+ ObjectNode modelNode = null;
+ Model model = repositoryService.getModel(modelId);
+ if (model != null) {
+ try {
+ if (StringUtils.isNotEmpty(model.getMetaInfo())) {
+ modelNode = (ObjectNode) objectMapper.readTree(model.getMetaInfo());
+ } else {
+ modelNode = objectMapper.createObjectNode();
+ modelNode.put(MODEL_NAME, model.getName());
+ }
+ modelNode.put(MODEL_ID, model.getId());
+ ObjectNode editorJsonNode = (ObjectNode) objectMapper.readTree(
+ new String(repositoryService.getModelEditorSource(model.getId()), "utf-8"));
+ modelNode.put("model", editorJsonNode);
+ } catch (Exception e) {
+ logger.error("Error creating model JSON", e);
+ throw new ActivitiException("Error creating model JSON", e);
+ }
}
- logger.info("鍒涘缓妯″瀷瀹屽杽ModelEditorSource缁撴潫");
+ return new ResponseEntity(modelNode.toString(), HttpStatus.OK);
}
+
+
}
--
Gitblit v1.8.0