From 0c3caf5265e7dda3543d138d552fef7592ccde41 Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期一, 25 五月 2020 17:03:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/system/controller/RoleController.java | 10 +-
src/main/java/com/zy/system/controller/UserController.java | 10 +-
src/main/java/com/zy/asrs/controller/BasWhsController.java | 8 +-
src/main/java/com/zy/asrs/controller/LocMastController.java | 8 +-
src/main/java/com/zy/asrs/controller/BasDevpController.java | 8 +-
src/main/java/com/zy/asrs/controller/LocDetlController.java | 8 +-
src/main/java/com/zy/common/config/AdminInterceptor.java | 6 +-
src/main/java/com/zy/system/controller/ResourceController.java | 10 +-
src/main/java/com/zy/asrs/controller/WrkMastLogController.java | 8 +-
src/main/java/com/zy/asrs/controller/BasWrkStatusController.java | 8 +-
src/main/java/com/zy/asrs/controller/WrkMastController.java | 12 ++--
src/main/java/com/zy/asrs/controller/BasCrnpController.java | 8 +-
src/main/java/com/zy/asrs/controller/WrkDetlController.java | 6 +-
src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java | 8 +-
src/main/java/com/zy/common/web/AuthController.java | 5 +
src/main/java/com/zy/asrs/controller/BasCrnStatusController.java | 8 +-
src/main/java/com/zy/asrs/controller/StaDescController.java | 8 +-
src/main/java/com/zy/asrs/controller/StkPlcmController.java | 6 +-
src/main/java/com/zy/asrs/controller/WrkLastnoController.java | 8 +-
src/main/java/com/zy/asrs/controller/BasCrnErrorController.java | 8 +-
src/main/java/com/zy/asrs/controller/BasLocTypeController.java | 8 +-
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 11 +--
22 files changed, 90 insertions(+), 90 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java b/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java
index 86e4584..28178c6 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java
@@ -57,7 +57,7 @@
}
@RequestMapping(value = "/basCrnError/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈哄紓甯哥爜娣诲姞")
public R add(BasCrnError basCrnError) {
basCrnError.setModiUser(getUserId());
basCrnError.setModiTime(new Date());
@@ -68,7 +68,7 @@
}
@RequestMapping(value = "/basCrnError/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈哄紓甯哥爜淇敼")
public R update(BasCrnError basCrnError){
if (Cools.isEmpty(basCrnError) || null==basCrnError.getErrorCode()){
return R.error();
@@ -80,7 +80,7 @@
}
@RequestMapping(value = "/basCrnError/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈哄紓甯哥爜鍒犻櫎")
public R delete(@RequestParam String param){
List<BasCrnError> list = JSONArray.parseArray(param, BasCrnError.class);
if (Cools.isEmpty(list)){
@@ -93,7 +93,7 @@
}
@RequestMapping(value = "/basCrnError/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈哄紓甯哥爜瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasCrnError> wrapper = new EntityWrapper<>();
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
index f39f3f5..9962ec2 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
@@ -57,7 +57,7 @@
}
@RequestMapping(value = "/basCrnStatus/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佹坊鍔�")
public R add(BasCrnStatus basCrnStatus) {
basCrnStatus.setModiUser(getUserId());
basCrnStatus.setModiTime(new Date());
@@ -68,7 +68,7 @@
}
@RequestMapping(value = "/basCrnStatus/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佷慨鏀�")
public R update(BasCrnStatus basCrnStatus){
if (Cools.isEmpty(basCrnStatus) || null==basCrnStatus.getStsNo()){
return R.error();
@@ -80,7 +80,7 @@
}
@RequestMapping(value = "/basCrnStatus/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佸垹闄�")
public R delete(@RequestParam String param){
List<BasCrnStatus> list = JSONArray.parseArray(param, BasCrnStatus.class);
if (Cools.isEmpty(list)){
@@ -93,7 +93,7 @@
}
@RequestMapping(value = "/basCrnStatus/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佸鍑�")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasCrnStatus> wrapper = new EntityWrapper<>();
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnpController.java b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
index 9a76c1c..e8c3fbe 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
@@ -57,7 +57,7 @@
}
@RequestMapping(value = "/basCrnp/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈烘坊鍔�")
public R add(BasCrnp basCrnp) {
basCrnp.setModiUser(getUserId());
basCrnp.setModiTime(new Date());
@@ -68,7 +68,7 @@
}
@RequestMapping(value = "/basCrnp/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈轰慨鏀�")
public R update(BasCrnp basCrnp){
if (Cools.isEmpty(basCrnp) || null==basCrnp.getCrnNo()){
return R.error();
@@ -80,7 +80,7 @@
}
@RequestMapping(value = "/basCrnp/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈哄垹闄�")
public R delete(@RequestParam String param){
List<BasCrnp> list = JSONArray.parseArray(param, BasCrnp.class);
if (Cools.isEmpty(list)){
@@ -93,7 +93,7 @@
}
@RequestMapping(value = "/basCrnp/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈哄鍑�")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasCrnp> wrapper = new EntityWrapper<>();
diff --git a/src/main/java/com/zy/asrs/controller/BasDevpController.java b/src/main/java/com/zy/asrs/controller/BasDevpController.java
index 297dc68..c2e77f5 100644
--- a/src/main/java/com/zy/asrs/controller/BasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasDevpController.java
@@ -57,7 +57,7 @@
}
@RequestMapping(value = "/basDevp/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绔欑偣娣诲姞")
public R add(BasDevp basDevp) {
basDevp.setModiUser(getUserId());
basDevp.setModiTime(new Date());
@@ -68,7 +68,7 @@
}
@RequestMapping(value = "/basDevp/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绔欑偣淇敼")
public R update(BasDevp basDevp){
if (Cools.isEmpty(basDevp) || null==basDevp.getDevNo()){
return R.error();
@@ -80,7 +80,7 @@
}
@RequestMapping(value = "/basDevp/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绔欑偣鍒犻櫎")
public R delete(@RequestParam String param){
List<BasDevp> list = JSONArray.parseArray(param, BasDevp.class);
if (Cools.isEmpty(list)){
@@ -93,7 +93,7 @@
}
@RequestMapping(value = "/basDevp/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绔欑偣瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasDevp> wrapper = new EntityWrapper<>();
diff --git a/src/main/java/com/zy/asrs/controller/BasLocTypeController.java b/src/main/java/com/zy/asrs/controller/BasLocTypeController.java
index 91ed94c..7db32ed 100644
--- a/src/main/java/com/zy/asrs/controller/BasLocTypeController.java
+++ b/src/main/java/com/zy/asrs/controller/BasLocTypeController.java
@@ -71,7 +71,7 @@
}
@RequestMapping(value = "/basLocType/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅鐘舵�佹坊鍔�")
public R add(BasLocType basLocType) {
basLocType.setModiUser(getUserId());
basLocType.setModiTime(new Date());
@@ -82,7 +82,7 @@
}
@RequestMapping(value = "/basLocType/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅鐘舵�佷慨鏀�")
public R update(BasLocType basLocType){
if (Cools.isEmpty(basLocType) || null==basLocType.getLocSts()){
return R.error();
@@ -94,7 +94,7 @@
}
@RequestMapping(value = "/basLocType/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅鐘舵�佸垹闄�")
public R delete(@RequestParam String param){
List<BasLocType> list = JSONArray.parseArray(param, BasLocType.class);
if (Cools.isEmpty(list)){
@@ -107,7 +107,7 @@
}
@RequestMapping(value = "/basLocType/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅鐘舵�佸鍑�")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasLocType> wrapper = new EntityWrapper<>();
diff --git a/src/main/java/com/zy/asrs/controller/BasWhsController.java b/src/main/java/com/zy/asrs/controller/BasWhsController.java
index bdd436f..4e0388e 100644
--- a/src/main/java/com/zy/asrs/controller/BasWhsController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWhsController.java
@@ -57,7 +57,7 @@
}
@RequestMapping(value = "/basWhs/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅绫诲瀷娣诲姞")
public R add(BasWhs basWhs) {
basWhs.setModiUser(getUserId());
basWhs.setModiTime(new Date());
@@ -68,7 +68,7 @@
}
@RequestMapping(value = "/basWhs/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅绫诲瀷淇敼")
public R update(BasWhs basWhs){
if (Cools.isEmpty(basWhs) || null==basWhs.getId()){
return R.error();
@@ -80,7 +80,7 @@
}
@RequestMapping(value = "/basWhs/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅绫诲瀷鍒犻櫎")
public R delete(@RequestParam String param){
List<BasWhs> list = JSONArray.parseArray(param, BasWhs.class);
if (Cools.isEmpty(list)){
@@ -93,7 +93,7 @@
}
@RequestMapping(value = "/basWhs/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅绫诲瀷瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasWhs> wrapper = new EntityWrapper<>();
diff --git a/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java b/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
index 1fe1e13..b588147 100644
--- a/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
@@ -71,7 +71,7 @@
}
@RequestMapping(value = "/basWrkIotype/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍏ュ嚭搴撶被鍨嬫坊鍔�")
public R add(BasWrkIotype basWrkIotype) {
basWrkIotype.setModiUser(getUserId());
basWrkIotype.setModiTime(new Date());
@@ -82,7 +82,7 @@
}
@RequestMapping(value = "/basWrkIotype/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍏ュ嚭搴撶被鍨嬩慨鏀�")
public R update(BasWrkIotype basWrkIotype){
if (Cools.isEmpty(basWrkIotype) || null==basWrkIotype.getIoType()){
return R.error();
@@ -94,7 +94,7 @@
}
@RequestMapping(value = "/basWrkIotype/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍏ュ嚭搴撶被鍨嬪垹闄�")
public R delete(@RequestParam String param){
List<BasWrkIotype> list = JSONArray.parseArray(param, BasWrkIotype.class);
if (Cools.isEmpty(list)){
@@ -107,7 +107,7 @@
}
@RequestMapping(value = "/basWrkIotype/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍏ュ嚭搴撶被鍨嬪鍑�")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasWrkIotype> wrapper = new EntityWrapper<>();
diff --git a/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java b/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
index 96fd94f..a99fd29 100644
--- a/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
@@ -71,7 +71,7 @@
}
@RequestMapping(value = "/basWrkStatus/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔鐘舵�佹坊鍔�")
public R add(BasWrkStatus basWrkStatus) {
basWrkStatus.setModiUser(getUserId());
basWrkStatus.setModiTime(new Date());
@@ -82,7 +82,7 @@
}
@RequestMapping(value = "/basWrkStatus/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔鐘舵�佷慨鏀�")
public R update(BasWrkStatus basWrkStatus){
if (Cools.isEmpty(basWrkStatus) || null==basWrkStatus.getWrkSts()){
return R.error();
@@ -94,7 +94,7 @@
}
@RequestMapping(value = "/basWrkStatus/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔鐘舵�佸垹闄�")
public R delete(@RequestParam String param){
List<BasWrkStatus> list = JSONArray.parseArray(param, BasWrkStatus.class);
if (Cools.isEmpty(list)){
@@ -107,7 +107,7 @@
}
@RequestMapping(value = "/basWrkStatus/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔鐘舵�佸鍑�")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasWrkStatus> wrapper = new EntityWrapper<>();
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index d2e1069..8094935 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -57,7 +57,7 @@
}
@RequestMapping(value = "/locDetl/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅鏄庣粏娣诲姞")
public R add(LocDetl locDetl) {
locDetl.setModiUser(getUserId());
locDetl.setModiTime(new Date());
@@ -68,7 +68,7 @@
}
@RequestMapping(value = "/locDetl/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅鏄庣粏淇敼")
public R update(LocDetl locDetl){
if (Cools.isEmpty(locDetl) || null==locDetl.getMatnr()){
return R.error();
@@ -80,7 +80,7 @@
}
@RequestMapping(value = "/locDetl/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅鏄庣粏鍒犻櫎")
public R delete(@RequestParam String param){
List<LocDetl> list = JSONArray.parseArray(param, LocDetl.class);
if (Cools.isEmpty(list)){
@@ -93,7 +93,7 @@
}
@RequestMapping(value = "/locDetl/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅鏄庣粏瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 7009309..7e061ad 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -57,7 +57,7 @@
}
@RequestMapping(value = "/locMast/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅娣诲姞")
public R add(LocMast locMast) {
locMast.setModiUser(getUserId());
locMast.setModiTime(new Date());
@@ -68,7 +68,7 @@
}
@RequestMapping(value = "/locMast/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅淇敼")
public R update(LocMast locMast){
if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
return R.error();
@@ -80,7 +80,7 @@
}
@RequestMapping(value = "/locMast/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅鍒犻櫎")
public R delete(@RequestParam String param){
List<LocMast> list = JSONArray.parseArray(param, LocMast.class);
if (Cools.isEmpty(list)){
@@ -93,7 +93,7 @@
}
@RequestMapping(value = "/locMast/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index fc5f5ab..d77ba97 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -45,7 +45,7 @@
// 瀵煎嚭
@RequestMapping(value = "/viewStockUseExport.action")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅浣跨敤缁熻瀵煎嚭")
public R viewStockUseExport(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
List<ViewStockUseBean> list = reportQueryMapper.getViewStockUseAll(new ViewStockUseBean());
@@ -53,7 +53,6 @@
}
//------------------搴撳瓨婊炵暀缁熻--------------------------------------
- @ResponseBody
@RequestMapping("/viewStayTimeList.action")
public Map<String,Object> queryViewStayTimeListByPages(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@@ -71,7 +70,7 @@
// 瀵煎嚭
@RequestMapping(value = "/viewStayTimeExport.action")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撳瓨婊炵暀缁熻瀵煎嚭")
public R viewStayTimeExport(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
List<ViewStayTimeBean> list = reportQueryMapper.getViewStayTimeAll(new ViewStayTimeBean());
@@ -123,7 +122,7 @@
//excel瀵煎嚭
@RequestMapping("/viewInOutExport.action")
- @ManagerAuth
+ @ManagerAuth(memo = "绔欑偣鏃ュ叆鍑哄簱娆℃暟缁熻瀵煎嚭")
public R viewInOutExport(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
List<ViewInOutBean> list = reportQueryMapper.getViewInOutAll(new ViewInOutBean());
@@ -148,7 +147,7 @@
//excel瀵煎嚭
@RequestMapping("/viewWorkInExport.action")
- @ManagerAuth
+ @ManagerAuth(memo = "鏃ュ叆搴撴槑缁嗙粺璁″鍑�")
public R viewWorkInExport(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
List<ViewWorkInBean> list = reportQueryMapper.getViewWorkInAll(new ViewWorkInBean());
@@ -173,7 +172,7 @@
//excel瀵煎嚭
@RequestMapping("/viewWorkOutExport.action")
- @ManagerAuth
+ @ManagerAuth(memo = "鏃ュ嚭搴撴槑缁嗙粺璁″鍑�")
public R viewWorkOutExport(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
List<ViewWorkInBean> list = reportQueryMapper.getViewWorkOutAll(new ViewWorkInBean());
diff --git a/src/main/java/com/zy/asrs/controller/StaDescController.java b/src/main/java/com/zy/asrs/controller/StaDescController.java
index 4c20032..7e7d659 100644
--- a/src/main/java/com/zy/asrs/controller/StaDescController.java
+++ b/src/main/java/com/zy/asrs/controller/StaDescController.java
@@ -57,7 +57,7 @@
}
@RequestMapping(value = "/staDesc/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绔欑偣璺緞娣诲姞")
public R add(StaDesc staDesc) {
staDesc.setModiUser(getUserId());
staDesc.setModiTime(new Date());
@@ -68,7 +68,7 @@
}
@RequestMapping(value = "/staDesc/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绔欑偣璺緞淇敼")
public R update(StaDesc staDesc){
if (Cools.isEmpty(staDesc) || null==staDesc.getCrnNo()){
return R.error();
@@ -80,7 +80,7 @@
}
@RequestMapping(value = "/staDesc/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绔欑偣璺緞鍒犻櫎")
public R delete(@RequestParam String param){
List<StaDesc> list = JSONArray.parseArray(param, StaDesc.class);
if (Cools.isEmpty(list)){
@@ -93,7 +93,7 @@
}
@RequestMapping(value = "/staDesc/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绔欑偣璺緞瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
diff --git a/src/main/java/com/zy/asrs/controller/StkPlcmController.java b/src/main/java/com/zy/asrs/controller/StkPlcmController.java
index 056da4b..32bad27 100644
--- a/src/main/java/com/zy/asrs/controller/StkPlcmController.java
+++ b/src/main/java/com/zy/asrs/controller/StkPlcmController.java
@@ -58,14 +58,14 @@
}
@RequestMapping(value = "/stkPlcm/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈哄紓甯告棩蹇楁坊鍔�")
public R add(StkPlcm stkPlcm) {
stkPlcmService.insert(stkPlcm);
return R.ok();
}
@RequestMapping(value = "/stkPlcm/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈哄紓甯告棩蹇楀垹闄�")
public R delete(@RequestParam String param){
List<StkPlcm> list = JSONArray.parseArray(param, StkPlcm.class);
if (Cools.isEmpty(list)){
@@ -78,7 +78,7 @@
}
@RequestMapping(value = "/stkPlcm/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈哄紓甯告棩蹇楀鍑�")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<StkPlcm> wrapper = new EntityWrapper<>();
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlController.java b/src/main/java/com/zy/asrs/controller/WrkDetlController.java
index 3f5c49d..4539ea0 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlController.java
@@ -60,14 +60,14 @@
}
@RequestMapping(value = "/wrkDetl/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔妗ｆ槑缁嗘坊鍔�")
public R add(WrkDetl wrkDetl) {
wrkDetlService.insert(wrkDetl);
return R.ok();
}
@RequestMapping(value = "/wrkDetl/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔妗ｆ槑缁嗗垹闄�")
public R delete(@RequestParam String param){
List<WrkDetl> list = JSONArray.parseArray(param, WrkDetl.class);
if (Cools.isEmpty(list)){
@@ -80,7 +80,7 @@
}
@RequestMapping(value = "/wrkDetl/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔妗ｆ槑缁嗗鍑�")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<WrkDetl> wrapper = new EntityWrapper<>();
diff --git a/src/main/java/com/zy/asrs/controller/WrkLastnoController.java b/src/main/java/com/zy/asrs/controller/WrkLastnoController.java
index 45585ff..b5d73fd 100644
--- a/src/main/java/com/zy/asrs/controller/WrkLastnoController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkLastnoController.java
@@ -57,7 +57,7 @@
}
@RequestMapping(value = "/wrkLastno/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔搴忓彿娣诲姞")
public R add(WrkLastno wrkLastno) {
wrkLastno.setModiUser(getUserId());
wrkLastno.setModiTime(new Date());
@@ -68,7 +68,7 @@
}
@RequestMapping(value = "/wrkLastno/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔搴忓彿淇敼")
public R update(WrkLastno wrkLastno){
if (Cools.isEmpty(wrkLastno) || null==wrkLastno.getWrkMk()){
return R.error();
@@ -80,7 +80,7 @@
}
@RequestMapping(value = "/wrkLastno/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔搴忓彿鍒犻櫎")
public R delete(@RequestParam String param){
List<WrkLastno> list = JSONArray.parseArray(param, WrkLastno.class);
if (Cools.isEmpty(list)){
@@ -93,7 +93,7 @@
}
@RequestMapping(value = "/wrkLastno/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔搴忓彿瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<WrkLastno> wrapper = new EntityWrapper<>();
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index 9c9d979..af3c691 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -64,7 +64,7 @@
}
@RequestMapping(value = "/wrkMast/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔妗ｆ坊鍔�")
public R add(WrkMast wrkMast) {
wrkMast.setModiUser(getUserId());
wrkMast.setModiTime(new Date());
@@ -75,7 +75,7 @@
}
@RequestMapping(value = "/wrkMast/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔妗ｄ慨鏀�")
public R update(WrkMast wrkMast){
if (Cools.isEmpty(wrkMast) || null==wrkMast.getWrkNo()){
return R.error();
@@ -87,7 +87,7 @@
}
@RequestMapping(value = "/wrkMast/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔妗ｅ垹闄�")
public R delete(@RequestParam String param){
List<WrkMast> list = JSONArray.parseArray(param, WrkMast.class);
if (Cools.isEmpty(list)){
@@ -100,7 +100,7 @@
}
@RequestMapping(value = "/wrkMast/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔妗ｅ鍑�")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
@@ -137,7 +137,7 @@
}
@RequestMapping(value = "/wrkMast/add/pri/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔妗ｅ鍔犱紭鍏堢骇")
public R addPri(@RequestBody List<WrkMast> list) {
for (WrkMast entity : list){
entity.setIoPri(entity.getIoPri() + 1);
@@ -147,7 +147,7 @@
}
@RequestMapping(value = "/wrkMast/red/pri/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔妗ｉ檷浣庝紭鍏堢骇")
public R redPri(@RequestBody List<WrkMast> list) {
for (WrkMast entity : list){
entity.setIoPri(entity.getIoPri() - 1);
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
index ae40055..2573e68 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
@@ -67,14 +67,14 @@
}
@RequestMapping(value = "/wrkMastLog/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｆ坊鍔�")
public R add(WrkMastLog wrkMastLog) {
wrkMastLogService.insert(wrkMastLog);
return R.ok();
}
@RequestMapping(value = "/wrkMastLog/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｄ慨鏀�")
public R update(WrkMastLog wrkMastLog){
if (Cools.isEmpty(wrkMastLog) || null==wrkMastLog.getId()){
return R.error();
@@ -84,7 +84,7 @@
}
@RequestMapping(value = "/wrkMastLog/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｅ垹闄�")
public R delete(@RequestParam String param){
List<WrkMastLog> list = JSONArray.parseArray(param, WrkMastLog.class);
if (Cools.isEmpty(list)){
@@ -97,7 +97,7 @@
}
@RequestMapping(value = "/wrkMastLog/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｅ鍑�")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<WrkMastLog> wrapper = new EntityWrapper<>();
diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index 991e816..70f4ae5 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -69,7 +69,7 @@
if (method.isAnnotationPresent(ManagerAuth.class)){
ManagerAuth annotation = method.getAnnotation(ManagerAuth.class);
if (annotation.value().equals(ManagerAuth.Auth.CHECK)){
- return check(request, response);
+ return check(request, response, annotation.memo());
}
}
return true;
@@ -85,7 +85,7 @@
}
}
- private boolean check(HttpServletRequest request, HttpServletResponse response) {
+ private boolean check(HttpServletRequest request, HttpServletResponse response, String memo) {
try {
String token = request.getHeader("token");
UserLogin userLogin = userLoginService.selectOne(new EntityWrapper<UserLogin>().eq("token", token));
@@ -108,7 +108,7 @@
}
// 鎿嶄綔鏃ュ織
OperateLog operateLog = new OperateLog();
- operateLog.setAction(request.getRequestURI());
+ operateLog.setAction(Cools.isEmpty(memo)?request.getRequestURI():memo);
operateLog.setIp(request.getRemoteAddr());
operateLog.setUserId(user.getId());
operateLog.setRequest(JSON.toJSONString(request.getParameterMap()));
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index 4563cc5..835ba54 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -49,6 +49,7 @@
private RolePermissionService rolePermissionService;
@RequestMapping("/login.action")
+ @ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐧诲綍")
public R loginAction(String mobile, String password){
if (mobile.equals("super") && password.equals(Cools.md5(superPwd))) {
Map<String, Object> res = new HashMap<>();
@@ -114,7 +115,7 @@
}
@RequestMapping("/menu/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "棣栭〉鑿滃崟")
public R menu(){
// 鑾峰彇鎵�鏈変竴绾ц彍鍗�
List<Resource> oneLevel = resourceService.selectList(new EntityWrapper<Resource>().eq("level", 1).eq("status", 1).orderBy("sort"));
@@ -257,7 +258,7 @@
}
@RequestMapping("/power/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鎺堟潈")
@Transactional
public R power(Long roleId, String powers){
Role role = roleService.selectById(roleId);
diff --git a/src/main/java/com/zy/system/controller/ResourceController.java b/src/main/java/com/zy/system/controller/ResourceController.java
index 400708f..12ad261 100644
--- a/src/main/java/com/zy/system/controller/ResourceController.java
+++ b/src/main/java/com/zy/system/controller/ResourceController.java
@@ -54,7 +54,7 @@
}
@RequestMapping(value = "/resource/edit/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鑿滃崟缂栬緫")
public R edit(Resource resource) {
if (Cools.isEmpty(resource)){
return R.error();
@@ -71,14 +71,14 @@
}
@RequestMapping(value = "/resource/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鑿滃崟娣诲姞")
public R add(Resource resource) {
resourceService.insert(resource);
return R.ok();
}
@RequestMapping(value = "/resource/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鑿滃崟淇敼")
public R update(Resource resource){
if (Cools.isEmpty(resource) || null==resource.getId()){
return R.error();
@@ -88,7 +88,7 @@
}
@RequestMapping(value = "/resource/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鑿滃崟鍒犻櫎")
public R delete(Integer[] ids){
if (Cools.isEmpty(ids)){
return R.error();
@@ -98,7 +98,7 @@
}
@RequestMapping(value = "/resource/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鑿滃崟瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<Resource> wrapper = new EntityWrapper<>();
diff --git a/src/main/java/com/zy/system/controller/RoleController.java b/src/main/java/com/zy/system/controller/RoleController.java
index f29fa65..d47e3bf 100644
--- a/src/main/java/com/zy/system/controller/RoleController.java
+++ b/src/main/java/com/zy/system/controller/RoleController.java
@@ -74,7 +74,7 @@
}
@RequestMapping(value = "/role/edit/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "瑙掕壊缂栬緫")
public R edit(Role role) {
if (Cools.isEmpty(role)){
return R.error();
@@ -88,14 +88,14 @@
}
@RequestMapping(value = "/role/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "瑙掕壊娣诲姞")
public R add(Role role) {
roleService.insert(role);
return R.ok();
}
@RequestMapping(value = "/role/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "瑙掕壊淇敼")
public R update(Role role){
if (Cools.isEmpty(role) || null==role.getId()){
return R.error();
@@ -105,7 +105,7 @@
}
@RequestMapping(value = "/role/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "瑙掕壊鍒犻櫎")
public R delete(Integer[] ids){
if (Cools.isEmpty(ids)){
return R.error();
@@ -115,7 +115,7 @@
}
@RequestMapping(value = "/role/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "瑙掕壊瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<Role> wrapper = new EntityWrapper<>();
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index 75f78c7..33cefe4 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -76,7 +76,7 @@
}
@RequestMapping(value = "/user/edit/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绯荤粺鐢ㄦ埛缂栬緫")
public R edit(User user) {
if (Cools.isEmpty(user)){
return R.error();
@@ -90,14 +90,14 @@
}
@RequestMapping(value = "/user/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绯荤粺鐢ㄦ埛娣诲姞")
public R add(User user) {
userService.insert(user);
return R.ok();
}
@RequestMapping(value = "/user/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绯荤粺鐢ㄦ埛淇敼")
public R update(User user){
if (Cools.isEmpty(user) || null==user.getId()){
return R.error();
@@ -117,7 +117,7 @@
}
@RequestMapping(value = "/user/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绯荤粺鐢ㄦ埛鍒犻櫎")
public R delete(Integer[] ids){
if (Cools.isEmpty(ids)){
return R.error();
@@ -127,7 +127,7 @@
}
@RequestMapping(value = "/user/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绯荤粺鐢ㄦ埛瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<User> wrapper = new EntityWrapper<>();
--
Gitblit v1.9.1