From b015028be149074acd39e46238cd7aec7d123355 Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: 星期二, 17 八月 2021 14:33:10 +0800
Subject: [PATCH] 疫情上报数据数据不拦截，免登录
---
service-front/src/main/java/com/java110/front/controller/activiti/ActivitiController.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 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 56e8ff4..c4b2a9b 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
@@ -15,13 +15,11 @@
*/
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
@@ -39,9 +37,23 @@
* @param modelId
* @return
*/
- @RequestMapping(value = "/model/{modelId}/json", method = RequestMethod.GET,produces = "application/json;charset=UTF-8")
- public ResponseEntity<String> queryJson(@PathVariable String modelId) {
+ @RequestMapping(value = "/model/{modelId}/json", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
+ public String queryJson(@PathVariable String modelId) {
- return modelSMOImpl.getJson(modelId);
+ JSONObject paramOut = JSONObject.parseObject(modelSMOImpl.getJson(modelId).getBody());
+
+ return paramOut.getJSONObject("data").toJSONString();
+ }
+
+ /**
+ * 鏌ヨ宸ヤ綔娴乯son
+ *
+ * @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;
}
}
--
Gitblit v1.8.0