优化OA保存工作

java110-bean/src/main/java/com/java110/dto/oaWorkflowXml/OaWorkflowXmlDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.oaWorkflowXml;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,10 +16,10 @@ import java.util.Date;
 public class OaWorkflowXmlDto extends PageDto implements Serializable {
 
     private String xmlId;
-private String storeId;
-private String bpmnXml;
-private String flowId;
-private String svgXml;
+    private String storeId;
+    private String bpmnXml;
+    private String flowId;
+    private String svgXml;
 
 
     private Date createTime;
@@ -29,31 +30,40 @@ private String svgXml;
     public String getXmlId() {
         return xmlId;
     }
-public void setXmlId(String xmlId) {
+
+    public void setXmlId(String xmlId) {
         this.xmlId = xmlId;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getBpmnXml() {
+
+    public String getBpmnXml() {
         return bpmnXml;
     }
-public void setBpmnXml(String bpmnXml) {
+
+    public void setBpmnXml(String bpmnXml) {
         this.bpmnXml = bpmnXml;
     }
-public String getFlowId() {
+
+    public String getFlowId() {
         return flowId;
     }
-public void setFlowId(String flowId) {
+
+    public void setFlowId(String flowId) {
         this.flowId = flowId;
     }
-public String getSvgXml() {
+
+    public String getSvgXml() {
         return svgXml;
     }
-public void setSvgXml(String svgXml) {
+
+    public void setSvgXml(String svgXml) {
         this.svgXml = svgXml;
     }
 

service-common/src/main/java/com/java110/common/api/WorkflowApi.java

@@ -75,13 +75,14 @@ public class WorkflowApi {
     /**
      * 更新流程
      *
-     * @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) {
+                                            @RequestBody String reqString) {
+        JSONObject reqJson = JSONObject.parseObject(reqString);
         WorkflowModelDto workflowModelDto = BeanConvertUtil.covertBean(reqJson, WorkflowModelDto.class);
 
         //部署model

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

@@ -74,6 +74,7 @@ public class ActivitiController {
         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);
     }

service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java

@@ -113,12 +113,14 @@ public class OaWorkflowApi {
      */
     @RequestMapping(value = "/queryOaWorkflow", method = RequestMethod.GET)
     public ResponseEntity<String> queryOaWorkflow(@RequestHeader(value = "store-id") String storeId,
+                                                  @RequestParam(value="flowId") String flowId,
                                                   @RequestParam(value = "page") int page,
                                                   @RequestParam(value = "row") int row) {
         OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
         oaWorkflowDto.setPage(page);
         oaWorkflowDto.setRow(row);
         oaWorkflowDto.setStoreId(storeId);
+        oaWorkflowDto.setFlowId(flowId);
         return getOaWorkflowBMOImpl.get(oaWorkflowDto);
     }
 
@@ -198,12 +200,14 @@ public class OaWorkflowApi {
      */
     @RequestMapping(value = "/queryOaWorkflowXml", method = RequestMethod.GET)
     public ResponseEntity<String> queryOaWorkflowXml(@RequestHeader(value = "store-id") String storeId,
+                                                     @RequestParam(value="flowId") String flowId,
                                                      @RequestParam(value = "page") int page,
                                                      @RequestParam(value = "row") int row) {
         OaWorkflowXmlDto oaWorkflowXmlDto = new OaWorkflowXmlDto();
         oaWorkflowXmlDto.setPage(page);
         oaWorkflowXmlDto.setRow(row);
         oaWorkflowXmlDto.setStoreId(storeId);
+        oaWorkflowXmlDto.setFlowId(flowId);
         return getOaWorkflowXmlBMOImpl.get(oaWorkflowXmlDto);
     }
 }

service-oa/src/main/java/com/java110/oa/api/OaWorkflowXmlApi.java

@@ -1,18 +0,0 @@
-package com.java110.oa.api;
-
-import com.java110.po.oaWorkflowXml.OaWorkflowXmlPo;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping(value = "/oaWorkflowXml")
-public class OaWorkflowXmlApi {
-
-}