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 | 103 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 92 insertions(+), 11 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 25e2fb5..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,26 +1,107 @@
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.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.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+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 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
+ 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;
- @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 reqString 妯″瀷ID
+ * @ServiceCode /workflow/saveModel
+ */
+ @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);
+ }
+
+ /**
+ * 閮ㄧ讲娴佺▼
+ *
+ * @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")
+ @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);
+ }
+ }
+ return new ResponseEntity(modelNode.toString(), HttpStatus.OK);
}
}
--
Gitblit v1.8.0