From 20ad0135fc465913b4f5b7c2c0e61a572f382a9c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期日, 28 九月 2025 16:24:43 +0800
Subject: [PATCH] 标准树结构去掉中天科技检测中心
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java | 41 +++++++++++------------------------------
1 files changed, 11 insertions(+), 30 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java
index 6a51cca..e7cb46d 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.common.oa.OAProcess;
import com.ruoyi.inspect.dto.PushOADto;
import com.ruoyi.inspect.dto.UnqualifiedHandlerDto;
import com.ruoyi.inspect.pojo.InsUnqualifiedHandlerFile;
@@ -21,7 +20,6 @@
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
-import java.util.Map;
@RestController
@Api("涓嶅悎鏍煎鐞嗙鐞�")
@@ -36,21 +34,18 @@
private static final String CHECKRESULT = "CHECKRESULT";
-
-
@ApiOperation(value = "鎻愪氦OA")
@PostMapping("/pushOA")
- public Result pushOA(@RequestBody PushOADto pushOADto){
+ public Result pushOA(@RequestBody PushOADto pushOADto) {
return unqualifiedHandlerService.pushOA(pushOADto);
}
@ApiOperation(value = "鏌ヨ")
@GetMapping("/page")
- public Result pageByUnqualified(Page page, UnqualifiedHandlerDto unqualifiedHandlerDto){
+ public Result pageByUnqualified(Page page, UnqualifiedHandlerDto unqualifiedHandlerDto) {
return Result.success(unqualifiedHandlerService.pageList(page, unqualifiedHandlerDto));
}
-
@ApiOperation(value = "闄勪欢涓婁紶")
@@ -63,60 +58,46 @@
@Anonymous
@ApiOperation(value = "涓嶅悎鏍煎鐞哋A鍥炶皟")
@RequestMapping(value = "/callback", produces = "text/plain")
- public String unqualifiedHandlerOACallback(String data){
- String msg = OAProcess.oaReturnMsg(0, "success");
- JSONObject json = JSONObject.parseObject(data);
- log.info("oa鍥炶皟鍙傛暟========>" + json);
- try {
- Long oaWorkId = json.getLong(REQUESTID);
- String checkResult = json.getString(CHECKRESULT);
- Object o = json.get("workflowRequestLogs");
- JSONArray objects = JSONArray.parseArray(JSONObject.toJSONString(o));
- unqualifiedHandlerService.unqualifiedHandlerOACallback(oaWorkId, checkResult,objects);
- } catch (Exception e) {
- log.error("oa鍥炶皟澶辫触: " + e.getMessage());
- msg = OAProcess.oaReturnMsg(1, "oa鍥炶皟澶辫触: " + e.getMessage());
- }
- log.info("oa鍥炶皟杩斿洖缁撴灉========>" + msg);
- return msg;
+ public String unqualifiedHandlerOACallback(String data) {
+ return null;
}
/**
* 涓嬭浇oa闄勪欢
+ *
* @param handlerFileId
* @param response
*/
@GetMapping("/downloadOAFile/{handlerFileId}")
- public void downloadOAFile(@PathVariable("handlerFileId") Long handlerFileId, HttpServletResponse response){
- unqualifiedHandlerFileService.downloadOAFile(handlerFileId,response);
+ public void downloadOAFile(@PathVariable("handlerFileId") Long handlerFileId, HttpServletResponse response) {
+ unqualifiedHandlerFileService.downloadOAFile(handlerFileId, response);
}
@ApiOperation(value = "鏂板涓嶅悎鏍煎鐞�")
@PostMapping("/addUnqualifiedHandler")
- public Result addUnqualifiedHandler(@RequestBody UnqualifiedHandlerDto unqualifiedHandlerDto){
+ public Result addUnqualifiedHandler(@RequestBody UnqualifiedHandlerDto unqualifiedHandlerDto) {
return Result.success(unqualifiedHandlerService.addUnqualifiedHandler(unqualifiedHandlerDto));
}
@ApiOperation(value = "缂栬緫涓嶅悎鏍煎鐞�")
@PostMapping("/updateUnqualifiedHandler")
- public Result updateUnqualifiedHandler(@RequestBody UnqualifiedHandlerDto unqualifiedHandlerDto){
+ public Result updateUnqualifiedHandler(@RequestBody UnqualifiedHandlerDto unqualifiedHandlerDto) {
return Result.success(unqualifiedHandlerService.updateUnqualifiedHandler(unqualifiedHandlerDto));
}
@ApiOperation(value = "鏌ョ湅oa娴佺▼")
@GetMapping("/getOaFlow")
- public Result getOaFlow(Integer id){
+ public Result getOaFlow(Integer id) {
return Result.success(unqualifiedHandlerService.getOaFlow(id));
}
-
@ApiOperation(value = "鏌ョ湅涓嶅悎鏍煎鐞嗙晫闈�")
@GetMapping("/getUnqualifiedHandler")
- public Result getUnqualifiedHandler(Integer id){
+ public Result getUnqualifiedHandler(Integer id) {
return Result.success(unqualifiedHandlerService.getUnqualifiedHandler(id));
}
--
Gitblit v1.9.3