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-common/src/main/java/com/java110/common/api/WorkflowApi.java | 48 +++++++++++++++++++-----------------------------
1 files changed, 19 insertions(+), 29 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 669e4c3..7f1f6bd 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
@@ -75,43 +75,33 @@
/**
* 鏇存柊娴佺▼
*
- * @param reqJson 妯″瀷ID
+ * @param reqString 妯″瀷ID
* @ServiceCode /workflow/saveModel
*/
@RequestMapping(value = "/saveModel", method = RequestMethod.POST)
@ResponseStatus(value = HttpStatus.OK)
- public ResponseEntity<String> saveModel(@RequestBody JSONObject reqJson) {
+ public ResponseEntity<String> saveModel(
+ @RequestBody String reqString) {
+ JSONObject reqJson = JSONObject.parseObject(reqString);
WorkflowModelDto workflowModelDto = BeanConvertUtil.covertBean(reqJson, WorkflowModelDto.class);
- try {
- Model model = repositoryService.getModel(workflowModelDto.getModelId());
- ObjectNode modelJson = (ObjectNode) objectMapper.readTree(model.getMetaInfo());
- modelJson.put(MODEL_NAME, workflowModelDto.getName());
- modelJson.put(MODEL_DESCRIPTION, workflowModelDto.getDescription());
- modelJson.put(ModelDataJsonConstants.MODEL_REVISION, model.getVersion() + 1);
- model.setMetaInfo(modelJson.toString());
- model.setName(workflowModelDto.getName());
- repositoryService.saveModel(model);
- repositoryService.addModelEditorSource(model.getId(), workflowModelDto.getJson_xml().getBytes("utf-8"));
- InputStream svgStream = new ByteArrayInputStream(workflowModelDto.getSvg_xml().getBytes("utf-8"));
- TranscoderInput input = new TranscoderInput(svgStream);
+ //閮ㄧ讲model
+ return queryWorkFlowFirstStaffBMOImpl.saveModel(workflowModelDto);
- 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);
--
Gitblit v1.8.0