From 27f0c5253fb48dbf9635d31c62d3435407f326c1 Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期三, 17 八月 2022 17:48:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzynasrs' into gzynasrs
---
src/main/java/com/zy/asrs/controller/MobileController.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 7508ecd..ab34b49 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.annotations.AppAuth;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -13,6 +14,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
+import com.zy.asrs.entity.param.Review;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.service.*;
import com.zy.asrs.task.handler.WorkLogHandler;
@@ -27,6 +29,7 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.util.*;
/**
@@ -327,20 +330,27 @@
/*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
@PostMapping("/test/startUp/auth")
-// @ManagerAuth(memo = "鐢宠PACK娴嬭瘯")
+ @ManagerAuth(memo = "鐢宠PACK娴嬭瘯")
public synchronized R startUpTestPACK(@RequestBody TestMast testMast) {
if (Cools.isEmpty(testMast)) {
return R.parse(BaseRes.PARAM);
}
- //鎻愪氦娴嬭瘯绯荤粺
- mobileService.startUpTestPACK(testMast);
-
+ mobileService.startUpTestPACK(testMast); //鎻愪氦娴嬭瘯绯荤粺
+ return R.ok();
+ }
+ @PostMapping("/test/transplant/auth")
+ @ManagerAuth(memo = "绉诲簱纭")
+ public synchronized R transplant(@RequestBody Review review) {
+ if (Cools.isEmpty(review)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ mobileService.transplant(review); //绉诲簱纭
return R.ok();
}
@PostMapping("/test/suspend/auth")
- @ManagerAuth(memo = "鏆傚仠娴嬭瘯")
+// @ManagerAuth(memo = "鏆傚仠娴嬭瘯")
public synchronized R suspendTestPACK() {
- mobileService.suspendTestPACK();
+ mobileService.suspendTestPACK(); //璇锋眰鏆傚仠娴嬭瘯
return R.ok();
}
/*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
--
Gitblit v1.9.1