From ca301e64c071ecbdf9e7442070fa7b9b80ca56e4 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 01 九月 2023 08:50:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 79 +++++++++++++++++++++++++++++----------
1 files changed, 58 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index ab34b49..9ea565a 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -24,6 +24,7 @@
import com.zy.common.model.WrkDto;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
+import com.zy.common.web.param.SearchLocParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -329,29 +330,65 @@
/*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
- @PostMapping("/test/startUp/auth")
- @ManagerAuth(memo = "鐢宠PACK娴嬭瘯")
- public synchronized R startUpTestPACK(@RequestBody TestMast testMast) {
- if (Cools.isEmpty(testMast)) {
- return R.parse(BaseRes.PARAM);
- }
- 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/startUp/auth")
+// @ManagerAuth(memo = "鐢宠PACK娴嬭瘯")
+// public synchronized R startUpTestPACK(@RequestBody TestMast testMast) {
+// if (Cools.isEmpty(testMast)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// mobileService.startUpTestPACK(testMast); //鎻愪氦娴嬭瘯绯荤粺
+// return R.ok();
+// }
+
@PostMapping("/test/suspend/auth")
// @ManagerAuth(memo = "鏆傚仠娴嬭瘯")
- public synchronized R suspendTestPACK() {
- mobileService.suspendTestPACK(); //璇锋眰鏆傚仠娴嬭瘯
- return R.ok();
+ @ResponseBody
+ public synchronized R suspendTestPACK(@RequestBody SearchLocParam param) {
+ if (mobileService.suspendTestPACK(param.getBarcode())){ //璇锋眰鏆傚仠娴嬭瘯
+ return R.ok();
+ }else {
+ return R.error("鏆傚仠澶辫触");
+ }
+ }
+ /**
+ * 娴嬭瘯搴撳熀鏈俊鎭�
+ */
+ @RequestMapping("/pack/basic/information")
+// @ManagerAuth(memo = "娴嬭瘯搴撳熀鏈俊鎭�")
+ public R packTestBasicInformation(){
+ return R.ok().add(mobileService.packTestBasicInformation());
+ }
+ /**
+ * 娴嬭瘯搴撲娇鐢ㄦ儏鍐�
+ */
+ @RequestMapping("/pack/usage/rate")
+// @ManagerAuth(memo = "娴嬭瘯搴撲娇鐢ㄦ儏鍐�")
+ public R packUsageRate(){
+ return R.ok().add(mobileService.packUsageRate());
+ }
+ /**
+ * 娴嬭瘯搴撳悎鏍兼暟
+ */
+ @RequestMapping("/pack/qualified")
+// @ManagerAuth(memo = "娴嬭瘯搴撳悎鏍兼暟")
+ public R packQualified(){
+ return R.ok().add(mobileService.packQualified());
+ }
+ /**
+ * 鏃�8-鏅�20
+ */
+ @RequestMapping("/pack/morning")
+// @ManagerAuth(memo = "娴嬭瘯搴撳悎鏍兼暟")
+ public R chartAxisMorning(){
+ return R.ok().add(mobileService.chartAxisMorning());
+ }
+ /**
+ * 鏅�20-绗簩澶╂棭8
+ */
+ @RequestMapping("/pack/evening")
+// @ManagerAuth(memo = "娴嬭瘯搴撳悎鏍兼暟")
+ public R chartAxisEvening(){
+ return R.ok().add(mobileService.chartAxisEvening());
}
/*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
--
Gitblit v1.9.1