优化代码

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

@@ -132,22 +132,6 @@ public class WorkflowApi {
         return new ResponseEntity(modelNode.toString(), HttpStatus.OK);
     }
 
-    /**
-     * 获取编辑器组件及配置项信息
-     * 获取流程json文件
-     *
-     * @return
-     */
-    @RequestMapping(value = "/editor/stencilset", method = RequestMethod.GET, produces = "application/json;charset=utf-8")
-    @ResponseBody
-    public String getStencilset() {
-        InputStream stencilsetStream = this.getClass().getClassLoader().getResourceAsStream("stencilset.json");
-        try {
-            return IOUtils.toString(stencilsetStream, "utf-8");
-        } catch (Exception e) {
-            throw new ActivitiException("Error while loading stencil set", e);
-        }
-    }
 
 
 }

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

@@ -16,13 +16,10 @@
 package com.java110.front.controller.activiti;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.oaWorkflow.StencilsetJson;
 import com.java110.front.smo.activiti.IModelSMO;
 import org.springframework.beans.factory.annotation.Autowired;
-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.*;
 
 /**
  * @desc add by 吴学文 8:38
@@ -40,11 +37,23 @@ public class ActivitiController {
      * @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();
     }
+
+    /**
+     * 查询工作流json
+     *
+     * @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;
+    }
 }

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 org.springframework.http.HttpEntity;
 import org.springframework.http.ResponseEntity;
 
 public interface IModelSMO {
@@ -25,4 +26,5 @@ public interface IModelSMO {
      * @return
      */
     ResponseEntity<String> getJson(String modelId);
+
 }

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

@@ -49,6 +49,7 @@ public class ModelSMOImpl extends AbstractComponentSMO implements IModelSMO {
         return responseEntity;
     }
 
+
     @Override
     protected void validate(IPageData pd, JSONObject paramIn) {