From e54a03e1c3fefef7ec84df6168ff5cf26e53f8cb Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 09 一月 2025 15:47:07 +0800
Subject: [PATCH] station and user disable check Stationlogin first

---
 pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRCtrl.java |   92 ++++++++++++++++++---------------------------
 1 files changed, 37 insertions(+), 55 deletions(-)

diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRCtrl.java
index ef71459..f2bff1e 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRCtrl.java
@@ -6,17 +6,14 @@
 import com.dy.common.webUtil.BaseResponseUtils;
 import com.dy.common.webUtil.QueryResultVo;
 import com.dy.pmsGlobal.aop.Log;
-import com.dy.pmsGlobal.pojoBa.BaRole;
 import com.dy.pmsGlobal.pojoPlt.PltProductScrappingReason;
 import com.dy.pmsGlobal.pojoPlt.PltProductUnqualifiedReason;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 浜у搧璁惧鎶ュ簾鍘熷洜
@@ -35,22 +32,19 @@
     /**
      * 淇濆瓨
      * @param reason
-     * @param bindingResult
      * @return
      */
     @PostMapping(path="save")
-    @SsoPowerAop(power = "10300001")
+    @SsoPowerAop(power = "10300011")
     @Log("淇濆瓨浜у搧璁惧鎶ュ簾鍘熷洜")
-    public BaseResponse<PltProductScrappingReason> save(@RequestBody @Valid PltProductScrappingReason reason,BindingResult bindingResult){
-        try {
-            if (bindingResult != null && bindingResult.hasErrors()) {
-                return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
-            }
-            reason.deleted = false;
-            return BaseResponseUtils.buildSuccess(sv.save(reason));
-        }catch (Exception e){
-            log.error("淇濆瓨浜у搧璁惧鎶ュ簾鍘熷洜寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage());
+    public BaseResponse<Boolean> save(@RequestBody @Valid PltProductScrappingReason reason){
+        reason.disabled = false;
+        reason.deleted = false;
+        int count = sv.save(reason);
+        if (count <= 0) {
+            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+        } else {
+            return BaseResponseUtils.buildSuccess(true);
         }
     }
 
@@ -58,21 +52,17 @@
     /**
      * 鏇存柊
      * @param reason
-     * @param bindingResult
      * @return
      */
     @PostMapping(path="update")
-    @SsoPowerAop(power = "10300001")
+    @SsoPowerAop(power = "10300011")
     @Log("鏇存柊浜у搧璁惧鎶ュ簾鍘熷洜")
-    public BaseResponse<PltProductScrappingReason> update(@RequestBody @Valid PltProductScrappingReason reason,BindingResult bindingResult){
-        try {
-            if (bindingResult != null && bindingResult.hasErrors()) {
-                return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
-            }
-            return BaseResponseUtils.buildSuccess(sv.update(reason));
-        }catch (Exception e){
-            log.error("鏇存柊浜у搧璁惧鎶ュ簾鍘熷洜寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage());
+    public BaseResponse<Boolean> update(@RequestBody @Valid PltProductScrappingReason reason){
+        int count = sv.update(reason);
+        if (count <= 0) {
+            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+        } else {
+            return BaseResponseUtils.buildSuccess(true);
         }
     }
 
@@ -82,14 +72,15 @@
      * @return
      */
     @GetMapping(path="delete")
-    @SsoPowerAop(power = "10300001")
+    @SsoPowerAop(power = "10300011")
     @Log("鍒犻櫎浜у搧璁惧鎶ュ簾鍘熷洜")
-    public BaseResponse<PltProductScrappingReason> delete(String id){
-        try {
-            return BaseResponseUtils.buildSuccess(sv.delete(Long.parseLong(id)));
-        }catch (Exception e){
-            log.error("鍒犻櫎浜у搧璁惧鎶ュ簾鍘熷洜寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage());
+    public BaseResponse<Boolean> delete(String id){
+        int count = sv.delete(Long.parseLong(id));
+
+        if (count <= 0) {
+            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+        } else {
+            return BaseResponseUtils.buildSuccess(true);
         }
     }
 
@@ -100,16 +91,11 @@
      * @return
      */
     @GetMapping(path="one")
-    @SsoPowerAop(power = "10300000") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+    @SsoPowerAop(power = "10300010") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
     @Log("鏍规嵁ID鏌ヨ浜у搧璁惧鎶ュ簾鍘熷洜")
     public BaseResponse<PltProductScrappingReason> one(String id){
-        try{
-            PltProductScrappingReason param=sv.selectById(id);
-            return BaseResponseUtils.buildSuccess(JSON.toJSON(param));
-        }catch (Exception e){
-            log.error("鏌ヨ浜у搧璁惧鎶ュ簾鍘熷洜寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage());
-        }
+        PltProductScrappingReason param=sv.selectById(id);
+        return BaseResponseUtils.buildSuccess(JSON.toJSON(param));
     }
 
     /**
@@ -118,16 +104,11 @@
      * @return
      */
     @PostMapping(path="some")
-    @SsoPowerAop(power = "10300000")
+    @SsoPowerAop(power = "10300010")
     @Log("鏌ヨ浜у搧璁惧鎶ュ簾鍘熷洜")
     public BaseResponse<QueryResultVo<List<PltProductScrappingReason>>> some(@RequestBody QueryVo vo){
-        try {
-            QueryResultVo<List<PltProductScrappingReason>> list = sv.selectSome(vo) ;
-            return BaseResponseUtils.buildSuccess(list);
-        }catch (Exception e){
-            log.error("鏌ヨ浜у搧璁惧鎶ュ簾鍘熷洜寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage());
-        }
+        QueryResultVo<List<PltProductScrappingReason>> list = sv.selectSome(vo) ;
+        return BaseResponseUtils.buildSuccess(list);
     }
 
     /**
@@ -138,12 +119,13 @@
     @PostMapping(path="disabled")
     @SsoPowerAop(power = "10100011")
     @Log("绂佺敤鎴栧惎鐢ㄦ姤搴熷師鍥�")
-    public BaseResponse<BaRole> disabled(@RequestBody PltProductUnqualifiedReason reason){
-        try {
-            return BaseResponseUtils.buildSuccess(sv.disabled(reason.id,reason.disabled));
-        }catch (Exception e){
-            log.error("绂佺敤鎴栧惎鐢ㄦ姤搴熷師鍥犲紓甯�", e);
-            return BaseResponseUtils.buildException(e.getMessage());
+    public BaseResponse<Boolean> disabled(@RequestBody PltProductUnqualifiedReason reason){
+        int count = sv.disabled(reason.id,reason.disabled);
+
+        if (count <= 0) {
+            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+        } else {
+            return BaseResponseUtils.buildSuccess(true);
         }
     }
 

--
Gitblit v1.8.0