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/material/MaterialCtrl.java |   64 +++++++++++---------------------
 1 files changed, 22 insertions(+), 42 deletions(-)

diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/material/MaterialCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/material/MaterialCtrl.java
index db3bf6f..bba69ff 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/material/MaterialCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/material/MaterialCtrl.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 material
-     * @param bindingResult
      * @return
      */
     @PostMapping(path="save")
     @SsoPowerAop(power = "10300001")
     @Log("淇濆瓨鐗╂枡淇℃伅")
-    public BaseResponse<PltMaterial> save(@RequestBody @Valid PltMaterial material,BindingResult bindingResult){
-        try {
-            if (bindingResult != null && bindingResult.hasErrors()) {
-                return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
-            }
-            material.deleted = false;
-            return BaseResponseUtils.buildSuccess(sv.save(material));
-        }catch (Exception e){
-            log.error("淇濆瓨鐗╂枡寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage());
+    public BaseResponse<PltMaterial> save(@RequestBody @Valid PltMaterial material){
+        material.deleted = false;
+        int count = sv.save(material);
+        if (count <= 0) {
+            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+        } else {
+            return BaseResponseUtils.buildSuccess(true);
         }
     }
 
@@ -56,21 +50,17 @@
     /**
      * 鏇存柊鐗╂枡淇℃伅
      * @param material
-     * @param bindingResult
      * @return
      */
     @PostMapping(path="update")
     @SsoPowerAop(power = "10300001")
     @Log("鏇存柊鐗╂枡淇℃伅")
-    public BaseResponse<PltMaterial> update(@RequestBody @Valid PltMaterial material,BindingResult bindingResult){
-        try {
-            if (bindingResult != null && bindingResult.hasErrors()) {
-                return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
-            }
-            return BaseResponseUtils.buildSuccess(sv.update(material));
-        }catch (Exception e){
-            log.error("鏇存柊鐗╂枡寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage());
+    public BaseResponse<PltMaterial> update(@RequestBody @Valid PltMaterial material){
+        int count = sv.update(material);
+        if (count <= 0) {
+            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+        } else {
+            return BaseResponseUtils.buildSuccess(true);
         }
     }
 
@@ -83,11 +73,11 @@
     @SsoPowerAop(power = "10300001")
     @Log("鍒犻櫎鐗╂枡淇℃伅")
     public BaseResponse<PltMaterial> 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);
         }
     }
 
@@ -101,13 +91,8 @@
     @SsoPowerAop(power = "10300000") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
     @Log("鏍规嵁ID鏌ヨ鐗╂枡淇℃伅")
     public BaseResponse<PltMaterial> one(String id){
-        try{
-            PltMaterial material=sv.selectById(id);
-            return BaseResponseUtils.buildSuccess(JSON.toJSON(material));
-        }catch (Exception e){
-            log.error("鏌ヨ鐗╂枡寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage());
-        }
+        PltMaterial material=sv.selectById(id);
+        return BaseResponseUtils.buildSuccess(JSON.toJSON(material));
     }
 
     /**
@@ -119,13 +104,8 @@
     @SsoPowerAop(power = "10300000")
     @Log("鏌ヨ鐗╂枡淇℃伅")
     public BaseResponse<QueryResultVo<List<PltMaterial>>> some(@RequestBody QueryVo vo){
-        try {
-            QueryResultVo<List<PltMaterial>> list = sv.selectSome(vo) ;
-            return BaseResponseUtils.buildSuccess(list);
-        }catch (Exception e){
-            log.error("鏌ヨ鐗╂枡寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage());
-        }
+        QueryResultVo<List<PltMaterial>> list = sv.selectSome(vo) ;
+        return BaseResponseUtils.buildSuccess(list);
     }
 
 }

--
Gitblit v1.8.0