From a0705c0be326a28922a30daec022e120f754fff7 Mon Sep 17 00:00:00 2001
From: 1098226878 <1098226878@qq.com>
Date: 星期四, 26 八月 2021 12:30:23 +0800
Subject: [PATCH] 优化代码
---
service-front/src/main/java/com/java110/front/controller/activiti/ActivitiController.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 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 286de2d..d6fa016 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
@@ -16,13 +16,15 @@
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
@@ -40,11 +42,40 @@
* @param modelId
* @return
*/
- @RequestMapping(value = "/model/{modelId}/json", method = RequestMethod.GET,produces = "application/json;charset=UTF-8")
+ @RequestMapping(value = "/model/{modelId}/json", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
public String queryJson(@PathVariable String 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 xmlJson 娴佺▼妯″瀷鍚嶇О
+ */
+ @RequestMapping(value = "/model/{modelId}/save", method = RequestMethod.POST)
+ public ResponseEntity<String> saveModel(@PathVariable String modelId
+ , @RequestBody String xmlJson) {
+ JSONObject paramJson = JSONObject.parseObject(xmlJson);
+ WorkflowModelDto workflowModelDto = new WorkflowModelDto();
+ workflowModelDto.setJson_xml(paramJson.getString("xml"));
+ workflowModelDto.setSvg_xml(paramJson.getString("svg"));
+ workflowModelDto.setModelId(modelId);
+ return modelSMOImpl.saveModel(workflowModelDto);
+ }
}
--
Gitblit v1.8.0