From 5ce6bfb2e237b9fbf092a03cf80e86d928ac7ca6 Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期二, 20 六月 2023 16:40:51 +0800 Subject: [PATCH] 孚能 --- src/main/java/com/zy/asrs/controller/MobileController.java | 35 ++++++++++++++++++++++------------- 1 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java index 6588483..ff28b43 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; @@ -22,11 +24,13 @@ 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; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.*; /** @@ -326,20 +330,25 @@ /*...........................璧e窞鏂板..............浠ヤ笅.............璧e窞鏂板...........................*/ - @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/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(); +// @ManagerAuth(memo = "鏆傚仠娴嬭瘯") + @ResponseBody + public synchronized R suspendTestPACK(@RequestBody SearchLocParam param) { + if (mobileService.suspendTestPACK(param.getBarcode())){ //璇锋眰鏆傚仠娴嬭瘯 + return R.ok(); + }else { + return R.error("鏆傚仠澶辫触"); + } } /*...........................璧e窞鏂板..............浠ヤ笂.............璧e窞鏂板...........................*/ -- Gitblit v1.9.1