From 5ec2680d2aec767db6a9d841a0e79de176641bff Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 06 六月 2024 10:25:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasJarMastController.java | 6 +++---
src/main/java/com/zy/asrs/controller/LocMastController.java | 2 +-
src/main/java/com/zy/asrs/controller/DocTypeController.java | 6 +++---
src/main/java/com/zy/system/entity/OperateLog.java | 4 ++--
src/main/java/com/zy/asrs/controller/BasJarController.java | 8 ++++----
src/main/java/com/zy/asrs/controller/MatController.java | 4 ++--
src/main/java/com/zy/asrs/controller/MobileController.java | 2 +-
src/main/java/com/zy/asrs/controller/BasRgvController.java | 8 ++++----
8 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasJarController.java b/src/main/java/com/zy/asrs/controller/BasJarController.java
index 1a956d9..f55b15f 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarController.java
@@ -63,14 +63,14 @@
}
@RequestMapping(value = "/basJar/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏂板纭寲缃�")
public R add(BasJar basJar) {
basJarService.insert(basJar);
return R.ok();
}
@RequestMapping(value = "/basJar/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "淇敼纭寲缃�")
public R update(BasJar basJar){
if (Cools.isEmpty(basJar) || null==basJar.getJarNo()){
return R.error();
@@ -80,7 +80,7 @@
}
@RequestMapping(value = "/basJar/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍒犻櫎纭寲缃�")
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
basJarService.deleteById(id);
@@ -89,7 +89,7 @@
}
@RequestMapping(value = "/basJar/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "瀵煎嚭纭寲缃愬熀纭�淇℃伅")
public R export(@RequestBody JSONObject param){
EntityWrapper<BasJar> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
diff --git a/src/main/java/com/zy/asrs/controller/BasJarMastController.java b/src/main/java/com/zy/asrs/controller/BasJarMastController.java
index 75361fa..597b99f 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarMastController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarMastController.java
@@ -60,14 +60,14 @@
}
@RequestMapping(value = "/basJarMast/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏂板纭寲缃愪綔涓�")
public R add(BasJarMast basJarMast) {
basJarMastService.insert(basJarMast);
return R.ok();
}
@RequestMapping(value = "/basJarMast/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏇存柊纭寲缃愪綔涓�")
public R update(BasJarMast basJarMast){
if (Cools.isEmpty(basJarMast) || null==basJarMast.getId()){
return R.error();
@@ -77,7 +77,7 @@
}
@RequestMapping(value = "/basJarMast/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍒犻櫎纭寲缃愪綔涓�")
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
basJarMastService.deleteById(id);
diff --git a/src/main/java/com/zy/asrs/controller/BasRgvController.java b/src/main/java/com/zy/asrs/controller/BasRgvController.java
index 7475aeb..b3635f5 100644
--- a/src/main/java/com/zy/asrs/controller/BasRgvController.java
+++ b/src/main/java/com/zy/asrs/controller/BasRgvController.java
@@ -60,14 +60,14 @@
}
@RequestMapping(value = "/basRgv/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏂板RGV")
public R add(BasRgv basRgv) {
basRgvService.insert(basRgv);
return R.ok();
}
@RequestMapping(value = "/basRgv/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "淇敼RGV")
public R update(BasRgv basRgv){
if (Cools.isEmpty(basRgv) || null==basRgv.getRgvNo()){
return R.error();
@@ -77,7 +77,7 @@
}
@RequestMapping(value = "/basRgv/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍒犻櫎RGV")
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
basRgvService.deleteById(id);
@@ -86,7 +86,7 @@
}
@RequestMapping(value = "/basRgv/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "瀵煎嚭RGV鍩虹淇℃伅")
public R export(@RequestBody JSONObject param){
EntityWrapper<BasRgv> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
diff --git a/src/main/java/com/zy/asrs/controller/DocTypeController.java b/src/main/java/com/zy/asrs/controller/DocTypeController.java
index 72ce073..b961514 100644
--- a/src/main/java/com/zy/asrs/controller/DocTypeController.java
+++ b/src/main/java/com/zy/asrs/controller/DocTypeController.java
@@ -57,7 +57,7 @@
}
@RequestMapping(value = "/docType/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏂板鍗曟嵁绫诲瀷")
public R add(DocType docType) {
docType.setStatus(1);
docType.setCreateBy(getUserId());
@@ -69,7 +69,7 @@
}
@RequestMapping(value = "/docType/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "淇敼鍗曟嵁绫诲瀷")
public R update(DocType docType){
if (Cools.isEmpty(docType) || null==docType.getDocId()){
return R.error();
@@ -81,7 +81,7 @@
}
@RequestMapping(value = "/docType/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍒犻櫎鍗曟嵁绫诲瀷")
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
docTypeService.deleteById(id);
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 5be4130..8542e2c 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -34,7 +34,7 @@
private LocDetlService locDetlService;
@RequestMapping(value = "/locMast/init/pwd")
- @ManagerAuth(memo = "鍒濆鍖栧彛浠ら獙璇�")
+// @ManagerAuth(memo = "鍒濆鍖栧彛浠ら獙璇�")
public R locMastInitPwd(@RequestParam(required = false) String pwd) {
if (Cools.isEmpty(pwd)) {
return R.error("璇疯緭鍏ュ彛浠�");
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index a339187..9595f3b 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -137,7 +137,7 @@
}
@RequestMapping(value = "/mat/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "淇敼鍟嗗搧妗ｆ")
public R update(Mat mat){
if (Cools.isEmpty(mat) || null==mat.getId()){
return R.error();
@@ -149,7 +149,7 @@
}
@RequestMapping(value = "/mat/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍒犻櫎鍟嗗搧妗ｆ")
public R delete(@RequestParam String param){
List<Mat> list = JSONArray.parseArray(param, Mat.class);
if (Cools.isEmpty(list)){
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 08d5bbf..d20ac79 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -115,7 +115,7 @@
// return R.ok().add(orderDetls);
// }
@RequestMapping("/order/search/orderNo/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍏ュ簱缁勬墭鑾峰彇鍗曟嵁淇℃伅")
public R orderSearchByBarcode(@RequestParam String orderNo){
if (Cools.isEmpty(orderNo)){
orderNo=null;
diff --git a/src/main/java/com/zy/system/entity/OperateLog.java b/src/main/java/com/zy/system/entity/OperateLog.java
index 1f30f84..ab8182e 100644
--- a/src/main/java/com/zy/system/entity/OperateLog.java
+++ b/src/main/java/com/zy/system/entity/OperateLog.java
@@ -81,9 +81,9 @@
if (!Cools.isEmpty(user)){
return user.getUsername();
} else if (this.userId==9527L){
- return "鑷姩";
+ return "9527";
}
- return null;
+ return "鏈煡";
}
public void setUserId(Long userId) {
this.userId = userId;
--
Gitblit v1.9.1