From ab6a423cf604b83f06b5768dbc162ece744a32d9 Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: 星期五, 20 八月 2021 00:34:11 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-front/src/main/java/com/java110/front/controller/activiti/ActivitiController.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 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 a59e51e..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
@@ -66,21 +66,16 @@
* 鏇存柊娴佺▼
*
* @param modelId 妯″瀷ID
- * @param name 娴佺▼妯″瀷鍚嶇О
- * @param description
- * @param json_xml 娴佺▼鏂囦欢
- * @param svg_xml 鍥剧墖
+ * @param xmlJson 娴佺▼妯″瀷鍚嶇О
*/
@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) {
-
+ , @RequestBody String xmlJson) {
+ JSONObject paramJson = JSONObject.parseObject(xmlJson);
WorkflowModelDto workflowModelDto = new WorkflowModelDto();
- workflowModelDto.setDescription(description);
- workflowModelDto.setJson_xml(json_xml);
- workflowModelDto.setSvg_xml(svg_xml);
- workflowModelDto.setName(name);
+ workflowModelDto.setJson_xml(paramJson.getString("xml"));
+ workflowModelDto.setSvg_xml(paramJson.getString("svg"));
+ workflowModelDto.setModelId(modelId);
return modelSMOImpl.saveModel(workflowModelDto);
}
}
--
Gitblit v1.8.0