java110 лет назад: 4
Родитель
Сommit
ba67751607

+ 28 - 0
java110-bean/src/main/java/com/java110/dto/workflow/WorkflowModelDto.java

@@ -18,6 +18,10 @@ public class WorkflowModelDto implements Serializable {
 
     private String modelId;
 
+    private String description;
+    private String json_xml;
+    private String svg_xml;
+
     public String getName() {
         return name;
     }
@@ -41,4 +45,28 @@ public class WorkflowModelDto implements Serializable {
     public void setModelId(String modelId) {
         this.modelId = modelId;
     }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getJson_xml() {
+        return json_xml;
+    }
+
+    public void setJson_xml(String json_xml) {
+        this.json_xml = json_xml;
+    }
+
+    public String getSvg_xml() {
+        return svg_xml;
+    }
+
+    public void setSvg_xml(String svg_xml) {
+        this.svg_xml = svg_xml;
+    }
 }

+ 27 - 0
service-front/src/main/java/com/java110/front/controller/activiti/ActivitiController.java

@@ -17,10 +17,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.*;
 
+import javax.xml.ws.Response;
+
 /**
  * @desc add by 吴学文 8:38
  */
@@ -56,4 +61,26 @@ public class ActivitiController {
 
         return StencilsetJson.JSON;
     }
+
+    /**
+     * 更新流程
+     *
+     * @param modelId     模型ID
+     * @param name        流程模型名称
+     * @param description
+     * @param json_xml    流程文件
+     * @param svg_xml     图片
+     */
+    @RequestMapping(value = "/model/{modelId}/save", method = RequestMethod.PUT)
+    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);
+    }
 }

+ 2 - 0
service-front/src/main/java/com/java110/front/smo/activiti/IModelSMO.java

@@ -14,6 +14,7 @@ package com.java110.front.smo.activiti;/*
  * limitations under the License.
  */
 
+import com.java110.dto.workflow.WorkflowModelDto;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.ResponseEntity;
 
@@ -27,4 +28,5 @@ public interface IModelSMO {
      */
     ResponseEntity<String> getJson(String modelId);
 
+    ResponseEntity<String> saveModel(WorkflowModelDto workflowModelDto);
 }

+ 16 - 2
service-front/src/main/java/com/java110/front/smo/activiti/impl/ModelSMOImpl.java

@@ -20,6 +20,7 @@ import com.java110.core.component.AbstractComponentSMO;
 import com.java110.core.context.IPageData;
 import com.java110.core.context.PageData;
 import com.java110.dto.app.AppDto;
+import com.java110.dto.workflow.WorkflowModelDto;
 import com.java110.front.smo.activiti.IModelSMO;
 import com.java110.utils.constant.ServiceConstant;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,13 +43,26 @@ public class ModelSMOImpl extends AbstractComponentSMO implements IModelSMO {
         IPageData pd = PageData.newInstance().builder("-1", "-1", "", "",
                 "", "", "", "", AppDto.WEB_APP_ID);
         ///workflow/getEditorJson
-       ResponseEntity responseEntity = this.callCenterService(restTemplate, pd, "",
-                ServiceConstant.SERVICE_API_URL + "/api/workflow/getEditorJson?modelId="+modelId,
+        ResponseEntity responseEntity = this.callCenterService(restTemplate, pd, "",
+                ServiceConstant.SERVICE_API_URL + "/api/workflow/getEditorJson?modelId=" + modelId,
                 HttpMethod.GET);
 
         return responseEntity;
     }
 
+    @Override
+    public ResponseEntity<String> saveModel(WorkflowModelDto workflowModelDto) {
+        IPageData pd = PageData.newInstance().builder("-1", "-1", "", "",
+                "", "", "", "", AppDto.WEB_APP_ID);
+        ///workflow/getEditorJson
+        ResponseEntity responseEntity = this.callCenterService(restTemplate, pd, JSONObject.toJSONString(workflowModelDto),
+                ServiceConstant.SERVICE_API_URL + "/api/workflow/saveModel",
+                HttpMethod.GET);
+
+        return responseEntity;
+
+    }
+
 
     @Override
     protected void validate(IPageData pd, JSONObject paramIn) {