From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-common/src/main/java/com/java110/common/api/WorkflowApi.java | 100 +++++++++++++++++--------------------------------
1 files changed, 35 insertions(+), 65 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 0d9f15b..7b5e44e 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,32 +1,31 @@
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 org.activiti.editor.constants.ModelDataJsonConstants;
+import com.java110.dto.oaWorkflow.WorkflowModelDto;
+import com.java110.utils.util.BeanConvertUtil;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.RepositoryService;
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.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.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 java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
+import org.springframework.web.bind.annotation.RequestBody;
+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;
@RestController
@RequestMapping("/workflow")
public class WorkflowApi {
+
private static final Logger logger = LoggerFactory.getLogger(WorkflowApi.class);
@Autowired
@@ -40,72 +39,46 @@
String MODEL_REVISION = "revision";
String MODEL_DESCRIPTION = "description";
-
@Autowired
private IQueryWorkFlowFirstStaffBMO queryWorkFlowFirstStaffBMOImpl;
-
- @RequestMapping(value = "/getFirstStaff", method = RequestMethod.GET)
- public ResponseEntity<String> getFirstStaff(@RequestParam(name = "flowType") String flowType,
- @RequestParam(name = "communityId") String communityId,
- @RequestHeader(value = "store-id") String storeId) {
- WorkflowDto workflowDto = new WorkflowDto();
- workflowDto.setCommunityId(communityId);
- workflowDto.setFlowType(flowType);
- workflowDto.setStoreId(storeId);
- return queryWorkFlowFirstStaffBMOImpl.query(workflowDto);
- }
-
/**
* 鏇存柊娴佺▼
*
- * @param modelId 妯″瀷ID
- * @param name 娴佺▼妯″瀷鍚嶇О
- * @param description
- * @param json_xml 娴佺▼鏂囦欢
- * @param svg_xml 鍥剧墖
+ * @param reqString 妯″瀷ID
+ * @ServiceCode /workflow/saveModel
*/
- @RequestMapping(value = "/model/{modelId}/save", method = RequestMethod.PUT)
+ @RequestMapping(value = "/saveModel", method = RequestMethod.POST)
@ResponseStatus(value = HttpStatus.OK)
- public void saveModel(@PathVariable String modelId
- , String name, String description
- , String json_xml, String svg_xml) {
- try {
- Model model = repositoryService.getModel(modelId);
- ObjectNode modelJson = (ObjectNode) objectMapper.readTree(model.getMetaInfo());
- modelJson.put(MODEL_NAME, name);
- modelJson.put(MODEL_DESCRIPTION, description);
- modelJson.put(ModelDataJsonConstants.MODEL_REVISION, model.getVersion() + 1);
- model.setMetaInfo(modelJson.toString());
- model.setName(name);
- repositoryService.saveModel(model);
- repositoryService.addModelEditorSource(model.getId(), json_xml.getBytes("utf-8"));
+ public ResponseEntity<String> saveModel(@RequestBody String reqString) {
+ JSONObject reqJson = JSONObject.parseObject(reqString);
+ WorkflowModelDto workflowModelDto = BeanConvertUtil.covertBean(reqJson, WorkflowModelDto.class);
+ //閮ㄧ讲model
+ return queryWorkFlowFirstStaffBMOImpl.saveModel(workflowModelDto);
+ }
- InputStream svgStream = new ByteArrayInputStream(svg_xml.getBytes("utf-8"));
- TranscoderInput input = new TranscoderInput(svgStream);
-
- PNGTranscoder transcoder = new PNGTranscoder();
- // Setup output
- ByteArrayOutputStream outStream = new ByteArrayOutputStream();
- TranscoderOutput output = new TranscoderOutput(outStream);
-
- // Do the transformation
- transcoder.transcode(input, output);
- final byte[] result = outStream.toByteArray();
- repositoryService.addModelEditorSourceExtra(model.getId(), result);
- outStream.close();
- } catch (Exception e) {
- logger.error("Error saving model", e);
- throw new ActivitiException("Error saving model", e);
- }
+ /**
+ * 閮ㄧ讲娴佺▼
+ *
+ * @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杩涜缁樺浘
- * @ServiceCode /workflow/getEditorJson
+ *
* @param modelId
* @return
+ * @ServiceCode /workflow/getEditorJson
*/
@SuppressWarnings("deprecation")
@RequestMapping(value = "/getEditorJson", method = RequestMethod.GET)
@@ -131,7 +104,4 @@
}
return new ResponseEntity(modelNode.toString(), HttpStatus.OK);
}
-
-
-
}
--
Gitblit v1.8.0