From faaf296cbb86bcb2fb5e3de2541852d91e35e3c5 Mon Sep 17 00:00:00 2001
From: JYW <2013732181@qq.com>
Date: 星期二, 30 四月 2024 14:45:09 +0800
Subject: [PATCH] 2024-04-30 将遗漏的两个接口加入，完善角色管理中接口权限
---
inspect-server/src/main/java/com/yuanchu/mom/controller/SampleOrderController.java | 3
cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java | 13 ----
cnas-server/src/main/java/com/yuanchu/mom/controller/StandardMethodController.java | 2
inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java | 8 +-
inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java | 9 +-
cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java | 13 ++--
cnas-server/src/main/java/com/yuanchu/mom/service/SealService.java | 5 -
inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java | 2
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 8 +-
cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java | 9 --
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java | 2
user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java | 8 +-
cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java | 8 +-
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 3
user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java | 6 +-
user-server/src/main/java/com/yuanchu/mom/controller/SystemLogController.java | 3
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 11 +--
cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java | 39 +++++-------
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 2
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java | 2
cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java | 2
21 files changed, 67 insertions(+), 91 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
index 513b097..9c2c333 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
@@ -33,8 +33,8 @@
private CapacityScopeService capacityScopeService;
private ProductService productService;
- @ValueClassify("鑳藉姏鑼冨洿")
- @ApiOperation(value = "鑳藉姏鑼冨洿-鑾峰彇椤圭洰妫�楠屽弬鏁板垪琛�")
+ @ValueAuth
+ @ApiOperation(value = "鑾峰彇椤圭洰妫�楠屽弬鏁板垪琛�")
@PostMapping("/selectItemParameterList")
public Result selectItemParameterList(@RequestBody Map<String, Object> data) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
@@ -42,25 +42,25 @@
return Result.success(capacityScopeService.selectItemParameterList(page, itemParameter));
}
@ValueClassify("鑳藉姏鑼冨洿")
- @ApiOperation(value = "鑳藉姏鑼冨洿-娣诲姞椤圭洰妫�楠屽弬鏁�")
+ @ApiOperation(value = "娣诲姞椤圭洰妫�楠屽弬鏁�")
@PostMapping("/addItemParameter")
public Result addItemParameter(@RequestBody StructureItemParameter itemParameter) {
return Result.success(capacityScopeService.addItemParameter(itemParameter));
}
@ValueClassify(value="鑳藉姏鑼冨洿")
- @ApiOperation(value = "鑳藉姏鑼冨洿-鍒犻櫎椤圭洰妫�楠屽弬鏁�")
+ @ApiOperation(value = "鍒犻櫎椤圭洰妫�楠屽弬鏁�")
@PostMapping("/delItemParameter")
public Result<?> delItemParameter(Integer id) {
return Result.success(capacityScopeService.delItemParameter(id));
}
@ValueClassify(value="鑳藉姏鑼冨洿")
- @ApiOperation(value = "鑳藉姏鑼冨洿-淇敼椤圭洰妫�楠屽弬鏁�")
+ @ApiOperation(value = "淇敼椤圭洰妫�楠屽弬鏁�")
@PostMapping("/upItemParameter")
public Result<?> upItemParameter(@RequestBody StructureItemParameter itemParameter) {
return Result.success(capacityScopeService.upItemParameter(itemParameter));
}
@ValueClassify(value="鑳藉姏鑼冨洿")
- @ApiOperation(value = "鑳藉姏鑼冨洿-鑾峰彇妫�楠屽璞�")
+ @ApiOperation(value = "鑾峰彇妫�楠屽璞�")
@PostMapping("/selectTestObjectList")
public Result selectTestObjectList(@RequestBody Map<String, Object> data) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
@@ -68,37 +68,36 @@
return Result.success(capacityScopeService.selectTestObjectList(page, pageTestObjectDto));
}
@ValueClassify(value="鑳藉姏鑼冨洿")
- @ApiOperation(value = "鑳藉姏鑼冨洿-娣诲姞妫�楠屽璞�")
+ @ApiOperation(value = "娣诲姞妫�楠屽璞�")
@PostMapping("/addTestObject")
public Result addTestObject(@RequestBody StructureTestObject testObject) {
return Result.success(capacityScopeService.addTestObject(testObject));
}
@ValueClassify(value="鑳藉姏鑼冨洿")
- @ApiOperation(value = "鑳藉姏鑼冨洿-鍒犻櫎妫�楠屽璞�")
+ @ApiOperation(value = "鍒犻櫎妫�楠屽璞�")
@PostMapping("/delTestObject")
public Result<?> delTestObject(Integer id) {
return Result.success(capacityScopeService.delTestObject(id));
}
@ValueClassify(value="鑳藉姏鑼冨洿")
- @ApiOperation(value = "鑳藉姏鑼冨洿-淇敼妫�楠屽璞�")
+ @ApiOperation(value = "淇敼妫�楠屽璞�")
@PostMapping("/upTestObject")
public Result upTestObject(@RequestBody StructureTestObject testObject) {
return Result.success(capacityScopeService.upTestObject(testObject));
}
-
- @ApiOperation(value = "鑳藉姏鑼冨洿-鑾峰彇妫�楠屽璞℃灇涓�")
- @GetMapping("/selectTestObjectByName")
@ValueAuth
+ @ApiOperation(value = "鑾峰彇妫�楠屽璞℃灇涓�")
+ @GetMapping("/selectTestObjectByName")
public Result selectTestObjectByName() {
return Result.success(capacityScopeService.selectTestObjectByName());
}
- @ValueClassify(value="鑳藉姏鑼冨洿")
- @ApiOperation(value = "鑳藉姏鑼冨洿-璁惧閲岄潰閫夋嫨妫�楠岄」鐩�(鏍戝舰缁撴瀯)")
+ @ValueClassify("璁惧宸ュ叿鏄庣粏")
+ @ApiOperation(value = "璁惧閲岄潰閫夋嫨妫�楠岄」鐩�(鏍戝舰缁撴瀯)")
@PostMapping("/getInsProduction")
public Result getInsProduction(){
return Result.success(capacityScopeService.getInsProduction());
}
- @ValueClassify(value="鑳藉姏鑼冨洿")
+ @ValueClassify(value="浜у搧缁存姢")
@ApiOperation(value = "缁存姢妫�楠屽璞＄殑浜у搧")
@PostMapping("/selectProductListByObjectId")
public Result selectProductListByObjectId(@RequestBody Map<String, Object> data) throws Exception {
@@ -106,25 +105,21 @@
Product product = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Product.class);
return Result.success(productService.selectProductListByObjectId(page, product));
}
-
-
+ @ValueClassify(value="鑳藉姏鑼冨洿")
@ApiOperation(value = "娣诲姞浜у搧")
@PostMapping("/addProduct")
- @ValueAuth
public Result addProduct(@RequestBody Product product) {
return Result.success(productService.addProduct(product));
}
-
+ @ValueClassify(value="鑳藉姏鑼冨洿")
@ApiOperation(value = "淇敼浜у搧")
@PostMapping("/upProduct")
- @ValueAuth
public Result upProduct(@RequestBody Product product) {
return Result.success(productService.upProduct(product));
}
-
+ @ValueClassify(value="鑳藉姏鑼冨洿")
@ApiOperation(value = "鍒犻櫎浜у搧")
@PostMapping("/delProduct")
- @ValueAuth
public Result delProduct(Integer id) {
return Result.success(productService.delProduct(id));
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java
index fef26e1..d9bb223 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java
@@ -26,8 +26,8 @@
public class CertificationController {
private CertificationService certificationService;
- @ValueClassify("瀹為獙瀹よ祫璐�")
- @ApiOperation(value = "璧勮川璇存槑-鏌ヨ璧勮川鏄庣粏鍒楄〃")
+ @ValueAuth
+ @ApiOperation(value = "鏌ヨ璧勮川鏄庣粏鍒楄〃")
@PostMapping("/getCertificationDetail")
public Result getCertificationDetail(@RequestBody Map<String, Object> data) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
@@ -35,13 +35,13 @@
return Result.success(certificationService.getCertificationDetail(page, certification));
}
@ValueClassify("瀹為獙瀹よ祫璐�")
- @ApiOperation(value = "璧勮川璇存槑-娣诲姞璧勮川鏄庣粏鍒楄〃")
+ @ApiOperation(value = "娣诲姞璧勮川鏄庣粏鍒楄〃")
@PostMapping("/addCertificationDetail")
public Result addCertificationDetail(@RequestBody Certification certification) {
return Result.success(certificationService.addCertificationDetail(certification));
}
@ValueClassify("瀹為獙瀹よ祫璐�")
- @ApiOperation(value = "璧勮川璇存槑-鍒犻櫎璧勮川鏄庣粏鍒楄〃")
+ @ApiOperation(value = "鍒犻櫎璧勮川鏄庣粏鍒楄〃")
@PostMapping("/delCertificationDetail")
public Result<?> delCertificationDetail( String ids) {
return Result.success(certificationService.delCertificationDetail(ids));
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java
index 37c8f72..7e2c211 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java
@@ -1,6 +1,7 @@
package com.yuanchu.mom.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.UserDto;
import com.yuanchu.mom.dto.UserPageDto;
@@ -33,25 +34,25 @@
DepartmentService departmentService;
@ValueClassify("浜哄憳鏄庣粏")
- @ApiOperation(value = "浜哄憳鏄庣粏-娣诲姞閮ㄩ棬")
+ @ApiOperation(value = "娣诲姞閮ㄩ棬")
@PostMapping("/addDepartment")
public Result addDepartment(@RequestBody Department department) {
return Result.success(departmentService.addDepartment(department));
}
- @ValueClassify("浜哄憳鏄庣粏")
- @ApiOperation(value = "浜哄憳鏄庣粏-鑾峰彇閮ㄩ棬鏍�")
+ @ValueAuth
+ @ApiOperation(value = "鑾峰彇閮ㄩ棬鏍�")
@GetMapping("/selectDepartment")
public Result selectDepartment() {
return Result.success(departmentService.selectDepartment());
}
@ValueClassify("浜哄憳鏄庣粏")
- @ApiOperation(value = "浜哄憳鏄庣粏-鍒犻櫎閮ㄩ棬")
+ @ApiOperation(value = "鍒犻櫎閮ㄩ棬")
@PostMapping("/delDepartment")
public Result delDepartment(Integer id) {
return Result.success(departmentService.delDepartment(id));
}
- @ValueClassify("浜哄憳鏄庣粏")
- @ApiOperation(value = "浜哄憳鏄庣粏-鏍规嵁閫夋嫨鐨勬爲灞曠ず鐩稿叧鐨勪汉鍛�")
+ @ValueAuth
+ @ApiOperation(value = "鏍规嵁閫夋嫨鐨勬爲灞曠ず鐩稿叧鐨勪汉鍛�")
@PostMapping("/showUserById")
public Result showUserById(@RequestBody Map<String, Object> data) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index 3d93f74..2cfc3af 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -37,7 +37,7 @@
@Value("${file.path}")
private String filePath;
- @ValueClassify("璁惧宸ュ叿鏄庣粏")
+ @ValueAuth
@ApiOperation(value = "鏌ヨ璁惧璇︽儏鍒楄〃")
@PostMapping("/selectDeviceParameter")
public Result selectDeviceParameter(@RequestBody Map<String, Object> data) throws Exception {
@@ -88,6 +88,7 @@
//鍥剧墖涓婁紶
@ApiOperation(value = "璁惧鍥剧墖涓婁紶")
@PostMapping("/uploadFile")
+ @ValueAuth
public Result uploadFile(MultipartFile file) {
String urlString;
String pathName;
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
index c008538..2b43637 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
@@ -31,7 +31,7 @@
@Resource
private LaboratoryService laboratoryService;
- @ValueClassify("鍦烘墍鎴栬鏂�")
+ @ValueAuth
@ApiOperation(value = "鏌ヨ瀹為獙瀹ょ鐞嗗垪琛�")
@PostMapping("/selectItemParameter")
public Result selectItemParameter(@RequestBody Map<String, Object> data) throws Exception {
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java
index 70d9846..4299cbf 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java
@@ -26,12 +26,6 @@
@Resource
private SealService sealService;
- @ApiOperation(value = "鍒犻櫎鍗扮珷")
- @PostMapping("/deleteSeal")
-
- public Result deleteSeal(@RequestBody Integer id) {
- return Result.success(sealService.delSeal(id));
- }
@ValueClassify("鍦烘墍鎴栬鏂�")
@ApiOperation(value = "娣诲姞鍗扮珷鍙傛暟")
@PostMapping("/addSeal")
@@ -46,12 +40,6 @@
}
}
-
- @ApiOperation(value = "淇敼鍗扮珷鍙傛暟")
- @PostMapping("/upSeal")
- public Result upSeal(@RequestBody Seal seal){
- return Result.success(sealService.upSeal(seal));
- }
@ValueClassify("鍦烘墍鎴栬鏂�")
@ApiOperation(value="鏌ヨ鍗扮珷鍒楄〃")
@PostMapping("/selectSeal")
@@ -59,6 +47,5 @@
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
Seal seal = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Seal.class);
return Result.success(sealService.selectSeal(page,seal));
-
}
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/StandardMethodController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/StandardMethodController.java
index aeb628b..2980dd0 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/StandardMethodController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/StandardMethodController.java
@@ -24,7 +24,7 @@
public class StandardMethodController {
private StandardMethodService standardMethodService;
- @ValueClassify("瀹為獙瀹ょ殑妫�娴嬭兘鍔涙。妗�")
+ @ValueAuth
@ApiOperation(value = "鑾峰彇鏍囧噯鏂规硶鍒楄〃")
@PostMapping("/selectStandardMethodList")
public Result selectStandardMethodList(@RequestBody Map<String, Object> data) throws Exception {
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/SealService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/SealService.java
index df66ac6..68674b9 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/SealService.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/SealService.java
@@ -13,10 +13,7 @@
//鏂板
int addSeal(Seal seal);
- //鍒犻櫎
- int delSeal(int id);
- //鏇存柊
- int upSeal(Seal seal);
+
//鏌ヨ
Map<String, Object> selectSeal(Page page, Seal seal);
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java
index a132642..9aa477a 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java
@@ -25,15 +25,8 @@
return sealMapper.insert(seal);
}
- @Override
- public int delSeal(int id) {
- return sealMapper.deleteById(id);
- }
- @Override
- public int upSeal(Seal seal) {
- return sealMapper.updateById(seal);
- }
+
@Override
public Map<String, Object> selectSeal(Page page, Seal seal) {
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 f5db78a..63f1243 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
@@ -42,7 +42,7 @@
private InsOrderTemplateService insOrderTemplateService;
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
- @ValueClassify("妫�楠屼笅鍗�")
+ @ValueAuth
@ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曟暟鎹�")
@PostMapping("/selectInsOrderParameter")
public Result selectInsOrderParameter(@RequestBody Map<String, Object> data) throws Exception {
@@ -110,10 +110,9 @@
public Result<?> selectInsOrderTemplateById(Integer id) {
return Result.success("鎴愬姛", insOrderTemplateService.selectInsOrderTemplateById(id));
}
-
+ @ValueClassify("妫�楠屼笅鍗�")
@ApiOperation(value = "鍒犻櫎妫�楠屽崟妯℃澘")
@PostMapping("/delInsOrderTemplate")
- @ValueAuth
public Result<?> delInsOrderTemplate(Integer id) {
return Result.success(insOrderTemplateService.delInsOrderTemplate(id));
}
@@ -126,7 +125,7 @@
SampleProductDto2 sampleProductDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleProductDto2.class);
return Result.success(insOrderService.selectSampleAndProductByOrderId(page, sampleProductDto));
}
- @ValueClassify("璐圭敤缁熻")
+ @ValueAuth
@ApiOperation(value = "璐圭敤缁熻")
@PostMapping("/costStatistics")
public Result<?> costStatistics(@RequestBody Map<String, Object> data) throws Exception {
@@ -134,8 +133,8 @@
CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
return Result.success(insOrderService.costStatistics(page, costStatisticsDto));
}
- @ValueClassify("鏍峰搧缂洪櫡鎸囨暟")
- @ApiOperation(value = "鏍峰搧缂洪櫡鎸囨暟", tags = "鏍峰搧缂洪櫡鎸囨暟")
+ @ValueAuth
+ @ApiOperation(value = "鏍峰搧缂洪櫡鎸囨暟")
@PostMapping("/selectSampleDefects")
public Result selectSampleDefects(Integer size, Integer current, String inspectionItems, String orderNumber) {
return Result.success(insOrderService.selectSampleDefects(new Page<>(current, size),inspectionItems, orderNumber));
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 dc3972f..9f0b499 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
@@ -28,7 +28,7 @@
private InsOrderPlanService insOrderPlanService;
- @ValueClassify("妫�楠屼换鍔�")
+ @ValueAuth
@ApiOperation(value = "鑾峰彇妫�楠屼换鍔″垪琛�")
@PostMapping("/selectInsOrderPlanList")
public Result selectInsOrderPlanList(@RequestBody Map<String, Object> data) throws Exception {
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
index 96621d7..ab508a7 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
@@ -30,7 +30,7 @@
@Value("${wordUrl}")
private String wordUrl;
- @ValueClassify("鎶ュ憡缂栧埗")
+ @ValueAuth
@ApiOperation(value = "鏌ヨ妫�楠屾姤鍛婃暟鎹�")
@PostMapping("/pageInsReport")
public Result pageInsReport(@RequestBody Map<String, Object> data) throws Exception {
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java
index 6fdbcdc..3841c3d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.service.ReportService;
@@ -23,19 +24,19 @@
public class ReportController {
private ReportService reportService;
- @ValueClassify("涓汉棣栭〉")
+ @ValueAuth
@ApiOperation(value = "姣忔棩涓氬姟缁熻")
@GetMapping("/businessStatisticsByDay")
public Result businessStatisticsByDay(){
return Result.success(reportService.businessStatisticsByDay());
}
- @ValueClassify("涓汉棣栭〉")
+ @ValueAuth
@ApiOperation(value = "妫�娴嬮」鐩粺璁�")
@GetMapping("/testProductByDay")
public Result testProductByDay(){
return Result.success(reportService.testProductByDay());
}
- @ValueClassify("涓汉棣栭〉")
+ @ValueAuth
@ApiOperation(value = "棣栭〉-->鏃ュ巻浠诲姟鍥�")
@GetMapping("/calendarWorkByWeek")
public Result calendarWorkByWeek(){
@@ -47,7 +48,7 @@
public Result addSchedule(String time, String text){
return Result.success(reportService.addSchedule(time,text));
}
- @ValueClassify("涓汉棣栭〉")
+ @ValueAuth
@ApiOperation(value = "棣栭〉-->鎴戠殑鏃ョ▼")
@PostMapping("/ScheduleByMe")
public Result ScheduleByMe(String date){
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/SampleOrderController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/SampleOrderController.java
index a8be6ca..ce2e8d0 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/SampleOrderController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/SampleOrderController.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.controller;
+import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.service.SampleOrderService;
import com.yuanchu.mom.vo.Result;
import lombok.AllArgsConstructor;
@@ -18,7 +19,7 @@
public class SampleOrderController {
private SampleOrderService sampleOrderService;
-
+ @ValueAuth
@GetMapping("/list")
public Result list() {
return Result.success(sampleOrderService.selectSampleOrderList());
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java
index 1c6e8ef..fe42eac 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java
@@ -22,7 +22,7 @@
public class StandardTemplateController {
private StandardTemplateService standardTemplateService;
- @ValueClassify("鍘熷璁板綍妯℃澘")
+ @ValueAuth
@ApiOperation(value = "鑾峰彇鍘熷璁板綍妯℃澘鍒楄〃")
@PostMapping("/selectStandardTemplatePageList")
public Result selectStandardTemplatePageList(@RequestBody Map<String, Object> data) throws Exception {
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
index 75cb990..9897074 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
@@ -25,7 +25,7 @@
private StandardMethodListService standardMethodListService;
private StandardProductListService standardProductListService;
- @ValueClassify("鏍囧噯搴�")
+ @ValueAuth
@ApiOperation(value = "鑾峰彇鏍囧噯鏍�")
@GetMapping("/selectStandardTreeList")
public Result selectStandardTreeList(){
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java
index 8363521..292f5c4 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java
@@ -26,7 +26,7 @@
public Result addWarehouse(String name) {
return Result.success(warehouseService.addWarehouse(name));
}
- @ValueClassify("鏍峰搧绠＄悊")
+ @ValueAuth
@GetMapping("/selectWarehouse")
@ApiOperation("鏌ヨ浠撳簱")
public Result selectWarehouse() {
@@ -68,7 +68,7 @@
public Result upShelf(@RequestBody WarehouseShelf warehouseShelf) {
return Result.success(warehouseService.upShelf(warehouseShelf));
}
- @ValueClassify("鏍峰搧绠＄悊")
+
@GetMapping("/getWarehouse")
@ApiOperation("鏌ヨ璐ф灦涓嬬殑瀛樻斁淇℃伅")
@ValueAuth
@@ -88,13 +88,13 @@
return Result.success(warehouseService.outWarehouse(sampleCode));
}
- @ValueClassify("鏍峰搧绠＄悊")
+ @ValueAuth
@PostMapping("/getSampleRecord")
@ApiOperation("鏌ヨ鏍峰搧璇︾粏璁板綍")
public Result getSampleRecord(Integer id) {
return Result.success(warehouseService.getSampleRecord(id));
}
- @ValueClassify("鏍峰搧绠＄悊")
+ @ValueAuth
@PostMapping("/searchSampleId")
@ApiOperation("閫氳繃鏍峰搧缂栧彿杩涜妫�绱�")
public Result searchSampleId(String sampleCode) {
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java b/user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java
index 1efa47b..e798217 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java
@@ -24,7 +24,7 @@
private EnumService enumService;
- @ValueClassify("鏁版嵁瀛楀吀")
+ @ValueAuth
@ApiOperation(value = "鑾峰彇鏋氫妇鍒楄〃")
@PostMapping("/selectEnumList")
public Result selectEnumList(@RequestBody Map<String, Object> data) throws Exception {
@@ -50,14 +50,14 @@
public Result<?> delEnum(Integer id) {
return Result.success(enumService.delEnum(id));
}
- @ValueClassify("鏁版嵁瀛楀吀")
+
@ApiOperation(value = "閫氳繃鍒嗙被鏌ヨ鏋氫妇")
@PostMapping("/selectEnumByCategory")
@ValueAuth
public Result<?> selectEnumByCategory(String category){
return Result.success(enumService.selectEnumByCategory(category));
}
- @ValueClassify("鏁版嵁瀛楀吀")
+ @ValueAuth
@ApiOperation(value = "鑾峰彇鏁版嵁瀛楀吀鐨勫垎绫�")
@PostMapping("/getDic")
public Result<?> getDic(){
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java b/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java
index 430fcc0..b49c9d1 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java
@@ -28,14 +28,14 @@
private RoleService roleService;
private PowerService powerService;
- @ValueClassify("瑙掕壊绠＄悊")
+ @ValueAuth
@ApiOperation(value = "鑾峰彇瑙掕壊鍒楄〃鏋氫妇")
@GetMapping("/selectRoleList")
public Result selectRoleList(){
return Result.success(roleService.selectList());
}
- @ValueClassify("瑙掕壊绠＄悊")
+ @ValueAuth
@ApiOperation(value = "鑾峰彇瑙掕壊鍒楄〃")
@PostMapping("/selectRoleLists")
public Result selectRoleLists(@RequestBody Map<String, Object> data) throws Exception {
@@ -49,13 +49,13 @@
public Result delRole(Integer id){
return Result.success(roleService.delRole(id));
}
- @ValueClassify("瑙掕壊绠＄悊")
+ @ValueAuth
@ApiOperation(value = "閫氳繃瑙掕壊id鏌ヨ鏉冮檺鍒楄〃")
@PostMapping("/selectPowerByRoleId")
public Result<?> selectPowerByRoleId(Integer id) {
return Result.success(powerService.selectPowerByRoleId(id));
}
- @ValueClassify("瑙掕壊绠＄悊")
+
@ApiOperation(value = "鑾峰彇鑿滃崟")
@GetMapping("/selectMenuList")
@ValueAuth
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/SystemLogController.java b/user-server/src/main/java/com/yuanchu/mom/controller/SystemLogController.java
index b2e483b..25b5b5f 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/SystemLogController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/SystemLogController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.pojo.PageSystemLogDto;
import com.yuanchu.mom.service.SystemLogService;
@@ -28,7 +29,7 @@
public class SystemLogController {
private SystemLogService systemLogService;
- @ValueClassify("绯荤粺鏃ュ織")
+ @ValueAuth
@ApiOperation(value = "鑾峰彇绯荤粺鏃ュ織鍒楄〃")
@PostMapping("/selectSystemLogList")
public Result selectSystemLogList(@RequestBody Map<String, Object> data) throws Exception {
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
index edb5726..b9e4160 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
@@ -91,7 +91,7 @@
}
return Result.fail(map.get("info"));
}
- @ValueClassify("鐢ㄦ埛绠＄悊")
+ @ValueAuth
@ApiOperation(value = "鑾峰彇鐢ㄦ埛鍒楄〃")
@PostMapping("/selectUserList")
public Result selectUserList(@RequestBody Map<String, Object> data) throws Exception {
@@ -122,7 +122,7 @@
public Result<?> getUserMenu() {
return Result.success(userService.getUserMenu());
}
- @ValueClassify("鐢ㄦ埛绠＄悊")
+ @ValueAuth
@ApiOperation(value = "鑾峰彇瀹㈡埛鍒楄〃")
@PostMapping("/selectCustomPageList")
public Result selectCustomPageList(@RequestBody Map<String, Object> data) throws Exception {
@@ -130,13 +130,13 @@
Custom custom = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Custom.class);
return Result.success(customService.selectCustomPageList(page, custom));
}
- @ValueClassify("鐢ㄦ埛绠＄悊")
+ @ValueClassify("瀹㈡埛绠＄悊")
@ApiOperation(value = "鍒犻櫎瀹㈡埛淇℃伅")
@PostMapping("/delCustomById")
public Result<?> delCustomById(Integer id) {
return Result.success(customService.delCustomById(id));
}
- @ValueClassify("鐢ㄦ埛绠＄悊")
+ @ValueClassify("瀹㈡埛绠＄悊")
@ApiOperation(value = "鏂板瀹㈡埛淇℃伅")
@PostMapping("/addCustom")
public Result<?> addCustom(@RequestBody Custom custom) {
--
Gitblit v1.9.3