From 986de1ea52ea40a848a8e8ffe478122850bb03a2 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 13 八月 2024 09:36:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proParam/ParamCtrl.java |   75 ++++++++++++++-----------------------
 1 files changed, 28 insertions(+), 47 deletions(-)

diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proParam/ParamCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proParam/ParamCtrl.java
index 0b2ae36..2bb5963 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proParam/ParamCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proParam/ParamCtrl.java
@@ -10,11 +10,9 @@
 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;
 
 /**
  * 浜у搧鎶�鏈弬鏁扮鐞�
@@ -33,22 +31,18 @@
     /**
      * 淇濆瓨浜у搧鎶�鏈弬鏁颁俊鎭�
      * @param param
-     * @param bindingResult
      * @return
      */
     @PostMapping(path="save")
-    @SsoPowerAop(power = "10100011")
+    @SsoPowerAop(power = "10300001")
     @Log("淇濆瓨浜у搧鎶�鏈弬鏁颁俊鎭�")
-    public BaseResponse<PltProductParams> save(@RequestBody @Valid PltProductParams param,BindingResult bindingResult){
-        try {
-            if (bindingResult != null && bindingResult.hasErrors()) {
-                return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
-            }
-            param.deleted = false;
-            return BaseResponseUtils.buildSuccess(sv.save(param));
-        }catch (Exception e){
-            log.error("淇濆瓨浜у搧鎶�鏈弬鏁板紓甯�", e);
-            return BaseResponseUtils.buildException(e.getMessage());
+    public BaseResponse<PltProductParams> save(@RequestBody @Valid PltProductParams param){
+        param.deleted = false;
+        int count = sv.save(param);
+        if (count <= 0) {
+            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+        } else {
+            return BaseResponseUtils.buildSuccess(true);
         }
     }
 
@@ -56,21 +50,18 @@
     /**
      * 鏇存柊浜у搧鎶�鏈弬鏁颁俊鎭�
      * @param param
-     * @param bindingResult
      * @return
      */
     @PostMapping(path="update")
-    @SsoPowerAop(power = "10100011")
+    @SsoPowerAop(power = "10300001")
     @Log("鏇存柊浜у搧鎶�鏈弬鏁颁俊鎭�")
-    public BaseResponse<PltProductParams> update(@RequestBody @Valid PltProductParams param,BindingResult bindingResult){
-        try {
-            if (bindingResult != null && bindingResult.hasErrors()) {
-                return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
-            }
-            return BaseResponseUtils.buildSuccess(sv.update(param));
-        }catch (Exception e){
-            log.error("鏇存柊浜у搧鎶�鏈弬鏁板紓甯�", e);
-            return BaseResponseUtils.buildException(e.getMessage());
+    public BaseResponse<PltProductParams> update(@RequestBody @Valid PltProductParams param){
+        param.deleted = false;
+        int count = sv.update(param);
+        if (count <= 0) {
+            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+        } else {
+            return BaseResponseUtils.buildSuccess(true);
         }
     }
 
@@ -80,14 +71,14 @@
      * @return
      */
     @GetMapping(path="delete")
-    @SsoPowerAop(power = "10100011")
+    @SsoPowerAop(power = "10300001")
     @Log("鍒犻櫎浜у搧鎶�鏈弬鏁颁俊鎭�")
     public BaseResponse<PltProductParams> delete(String id){
-        try {
-            return BaseResponseUtils.buildSuccess(sv.delete(Long.parseLong(id)));
-        }catch (Exception e){
-            log.error("鍒犻櫎浜у搧鎶�鏈弬鏁板紓甯�", e);
-            return BaseResponseUtils.buildException(e.getMessage());
+        int count = sv.delete(Long.parseLong(id));
+        if (count <= 0) {
+            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+        } else {
+            return BaseResponseUtils.buildSuccess(true);
         }
     }
 
@@ -98,16 +89,11 @@
      * @return
      */
     @GetMapping(path="one")
-    @SsoPowerAop(power = "10100010") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+    @SsoPowerAop(power = "10300000") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
     @Log("鏍规嵁ID鏌ヨ浜у搧鎶�鏈弬鏁颁俊鎭�")
     public BaseResponse<PltProductParams> one(String id){
-        try{
-            PltProductParams param=sv.selectById(id);
-            return BaseResponseUtils.buildSuccess(JSON.toJSON(param));
-        }catch (Exception e){
-            log.error("鏌ヨ浜у搧鎶�鏈弬鏁板紓甯�", e);
-            return BaseResponseUtils.buildException(e.getMessage());
-        }
+        PltProductParams param=sv.selectById(id);
+        return BaseResponseUtils.buildSuccess(JSON.toJSON(param));
     }
 
     /**
@@ -116,16 +102,11 @@
      * @return
      */
     @PostMapping(path="some")
-    @SsoPowerAop(power = "10100010")
+    @SsoPowerAop(power = "10300000")
     @Log("鏌ヨ浜у搧鎶�鏈弬鏁颁俊鎭�")
     public BaseResponse<QueryResultVo<List<PltProductParams>>> some(@RequestBody QueryVo vo){
-        try {
-            QueryResultVo<List<PltProductParams>> list = sv.selectSome(vo) ;
-            return BaseResponseUtils.buildSuccess(list);
-        }catch (Exception e){
-            log.error("鏌ヨ浜у搧鎶�鏈弬鏁板紓甯�", e);
-            return BaseResponseUtils.buildException(e.getMessage());
-        }
+        QueryResultVo<List<PltProductParams>> list = sv.selectSome(vo) ;
+        return BaseResponseUtils.buildSuccess(list);
     }
 
 }

--
Gitblit v1.8.0