From 49cc211213ce71bd6e5bb8eeeffbda46c0bf98d8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 07 六月 2024 11:34:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java | 4 ++--
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 3 ++-
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 5 +++--
user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java | 5 ++---
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java b/framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java
index a6f221b..8c4d5b8 100644
--- a/framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java
+++ b/framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java
@@ -60,8 +60,8 @@
@Override
protected void addInterceptors(InterceptorRegistry registry) {
// TODO: 2024/6/4 璁块棶swagger闇�鍏充笅闈㈡嫤鎴櫒
-// registry.addInterceptor(fiferConfig).addPathPatterns("/**");
-// registry.addInterceptor(powerConfig).addPathPatterns("/**");
+ registry.addInterceptor(fiferConfig).addPathPatterns("/**");
+ registry.addInterceptor(powerConfig).addPathPatterns("/**");
registry.addInterceptor(logConfig).addPathPatterns("/**");
super.addInterceptors(registry);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
index 5e98366..e3a1e03 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
@@ -66,7 +66,8 @@
@ValueClassify("妫�楠屼笅鍗�")
@ApiOperation(value = "娣诲姞妫�楠屼笅鍗曟暟鎹�")
@PostMapping("/addInsOrder")
- public Result<?> addInsOrder(@RequestBody Map<String, Object> map) {
+ public Result<?> addInsOrder(String str) {
+ Map<String, Object> map = JSON.parseObject(str, Map.class);
JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
InsOrder insOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), InsOrder.class);
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
index a8a3b82..2c9c5b4 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
@@ -90,7 +90,7 @@
return Result.success(insOrderPlanService.verifyPlan(orderId, laboratory, type, tell));
}
- @ValueClassify("妫�楠屼换鍔�")
+ @ValueAuth
@ApiOperation(value = "鏍￠獙妫�楠屼换鍔℃彁浜�")
@PostMapping("/checkSubmitPlan")
public Result<?> checkSubmitPlan(Integer orderId, String laboratory) {
@@ -114,7 +114,7 @@
return Result.success();
}
- @ValueClassify("妫�楠屼换鍔�")
+ @ValueAuth
@ApiOperation(value = "鏌ョ湅妫�楠屽崟涓嬬殑闄勪欢鍒楄〃")
@PostMapping("/getFileList")
public Result<?> getFileList(@RequestBody Map<String, Object> data) throws Exception {
@@ -138,6 +138,7 @@
return Result.success(insOrderFileService.removeById(id));
}
+ @ValueAuth
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "涓嬭浇闄勪欢")
@PostMapping("/downFile")
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java b/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java
index ca5d2d6..e7797f6 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java
@@ -23,7 +23,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
@RestController
@AllArgsConstructor
@@ -43,13 +42,13 @@
@ValueClassify("鐢ㄦ埛绠＄悊")
@PostMapping("/getSampleUser")
- @ApiOperation(value = "鐩存帴鑾峰彇涓庤嚜宸辩浉鍚屽崟浣嶇殑浜哄憳鍒楄〃")
+ @ApiOperation(value = "鏌ョ湅鎸囧畾閮ㄩ棬鐨勪汉浜嬬郴缁熺粍缁囨灦鏋�")
public Result<?> getSampleUser(){
return Result.success();
}
@ValueClassify("鐢ㄦ埛绠＄悊")
- @ApiOperation(value = "鑾峰彇浜轰簨绯荤粺缁勭粐鏋舵瀯")
+ @ApiOperation(value = "鏌ョ湅浜轰簨绯荤粺缁勭粐鏋舵瀯")
@GetMapping(value = "/selectCompaniesList")
public Result<List<Company>> selectCompaniesList() {
//鍒ゆ柇鏄惁鏈夌洿鎺ヨ幏鍙栫涓夋柟閮ㄩ棬鐨勬潈闄�
--
Gitblit v1.9.3