From e499e9113e3bcf942f631625ff9bee6fccb6924c Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 18 八月 2021 01:08:20 +0800
Subject: [PATCH] 优化掉员工方法
---
service-front/src/main/java/com/java110/front/controller/activiti/ActivitiController.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 7 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/controller/activiti/ActivitiController.java b/service-front/src/main/java/com/java110/front/controller/activiti/ActivitiController.java
index 56e8ff4..a59e51e 100644
--- a/service-front/src/main/java/com/java110/front/controller/activiti/ActivitiController.java
+++ b/service-front/src/main/java/com/java110/front/controller/activiti/ActivitiController.java
@@ -15,13 +15,16 @@
*/
package com.java110.front.controller.activiti;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.oaWorkflow.StencilsetJson;
+import com.java110.dto.workflow.WorkflowModelDto;
import com.java110.front.smo.activiti.IModelSMO;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.xml.ws.Response;
/**
* @desc add by 鍚村鏂� 8:38
@@ -39,9 +42,45 @@
* @param modelId
* @return
*/
- @RequestMapping(value = "/model/{modelId}/json", method = RequestMethod.GET,produces = "application/json;charset=UTF-8")
- public ResponseEntity<String> queryJson(@PathVariable String modelId) {
+ @RequestMapping(value = "/model/{modelId}/json", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
+ public String queryJson(@PathVariable String modelId) {
- return modelSMOImpl.getJson(modelId);
+ JSONObject paramOut = JSONObject.parseObject(modelSMOImpl.getJson(modelId).getBody());
+
+ return paramOut.getJSONObject("data").toJSONString();
+ }
+
+ /**
+ * 鏌ヨ宸ヤ綔娴乯son
+ *
+ * @param version
+ * @return
+ */
+ @RequestMapping(value = "/editor/stencilset", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
+ public String stencilset(@RequestParam(value = "version", required = false) String version) {
+
+ return StencilsetJson.JSON;
+ }
+
+ /**
+ * 鏇存柊娴佺▼
+ *
+ * @param modelId 妯″瀷ID
+ * @param name 娴佺▼妯″瀷鍚嶇О
+ * @param description
+ * @param json_xml 娴佺▼鏂囦欢
+ * @param svg_xml 鍥剧墖
+ */
+ @RequestMapping(value = "/model/{modelId}/save", method = RequestMethod.POST)
+ public ResponseEntity<String> saveModel(@PathVariable String modelId
+ , String name, String description
+ , String json_xml, String svg_xml) {
+
+ WorkflowModelDto workflowModelDto = new WorkflowModelDto();
+ workflowModelDto.setDescription(description);
+ workflowModelDto.setJson_xml(json_xml);
+ workflowModelDto.setSvg_xml(svg_xml);
+ workflowModelDto.setName(name);
+ return modelSMOImpl.saveModel(workflowModelDto);
}
}
--
Gitblit v1.8.0