From 4d7775ecb9d52da2558cef3f19bd5fab1746afae Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 16 五月 2024 17:53:55 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pms-SV

---
 pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsCtrl.java |   50 +++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsCtrl.java
index ffd39ed..8abe361 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsCtrl.java
@@ -40,19 +40,25 @@
      * @return
      */
     @PostMapping(path="save")
-    @SsoPowerAop(power = "10300001")
+    @SsoPowerAop(power = "10300003")
     @Log("淇濆瓨浜у搧鍝佽川妫�鏌ラ」鐩俊鎭�")
-    public BaseResponse<PltProductParams> save(@RequestBody @Valid PltProductQualityInspectionItems item, BindingResult bindingResult){
+    public BaseResponse<Boolean> save(@RequestBody @Valid PltProductQualityInspectionItems item, BindingResult bindingResult){
+        int count = 0;
         try {
             if (bindingResult != null && bindingResult.hasErrors()) {
                 return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
             }
             item.deleted = false;
             item.disabled = false;
-            return BaseResponseUtils.buildSuccess(sv.save(item));
+            count =sv.save(item);
         }catch (Exception e){
             log.error("淇濆瓨浜у搧鍝佽川妫�鏌ラ」鐩紓甯�", e);
             return BaseResponseUtils.buildException(e.getMessage());
+        }
+        if (count <= 0) {
+            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+        } else {
+            return BaseResponseUtils.buildSuccess(true);
         }
     }
 
@@ -64,17 +70,23 @@
      * @return
      */
     @PostMapping(path="update")
-    @SsoPowerAop(power = "10300001")
+    @SsoPowerAop(power = "10300003")
     @Log("鏇存柊浜у搧鍝佽川妫�鏌ラ」鐩俊鎭�")
-    public BaseResponse<PltProductParams> update(@RequestBody @Valid PltProductQualityInspectionItems item,BindingResult bindingResult){
+    public BaseResponse<Boolean> update(@RequestBody @Valid PltProductQualityInspectionItems item,BindingResult bindingResult){
+        int count ;
         try {
             if (bindingResult != null && bindingResult.hasErrors()) {
                 return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
             }
-            return BaseResponseUtils.buildSuccess(sv.update(item));
+            count = sv.update(item);
         }catch (Exception e){
             log.error("鏇存柊浜у搧鍝佽川妫�鏌ラ」鐩紓甯�", e);
             return BaseResponseUtils.buildException(e.getMessage());
+        }
+        if (count <= 0) {
+            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+        } else {
+            return BaseResponseUtils.buildSuccess(true);
         }
     }
 
@@ -84,14 +96,20 @@
      * @return
      */
     @GetMapping(path="delete")
-    @SsoPowerAop(power = "10300001")
+    @SsoPowerAop(power = "10300003")
     @Log("鍒犻櫎浜у搧鍝佽川妫�鏌ラ」鐩俊鎭�")
-    public BaseResponse<PltProductQualityInspectionItems> delete(String id){
+    public BaseResponse<Boolean> delete(String id){
+        int count;
         try {
-            return BaseResponseUtils.buildSuccess(sv.delete(Long.parseLong(id)));
+            count = sv.delete(Long.parseLong(id));
         }catch (Exception e){
             log.error("鍒犻櫎浜у搧鍝佽川妫�鏌ラ」鐩紓甯�", e);
             return BaseResponseUtils.buildException(e.getMessage());
+        }
+        if (count <= 0) {
+            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+        } else {
+            return BaseResponseUtils.buildSuccess(true);
         }
     }
 
@@ -102,7 +120,7 @@
      * @return
      */
     @GetMapping(path="one")
-    @SsoPowerAop(power = "10300000") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+    @SsoPowerAop(power = "10300002") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
     @Log("鏍规嵁ID鏌ヨ浜у搧鍝佽川妫�鏌ラ」鐩俊鎭�")
     public BaseResponse<PltProductQualityInspectionItems> one(String id){
         try{
@@ -120,7 +138,7 @@
      * @return
      */
     @PostMapping(path="some")
-    @SsoPowerAop(power = "10300000")
+    @SsoPowerAop(power = "10300002")
     @Log("鏌ヨ浜у搧鍝佽川妫�鏌ラ」鐩俊鎭�")
     public BaseResponse<QueryResultVo<List<PltProductQualityInspectionItems>>> some(@RequestBody QueryVo vo){
         try {
@@ -139,13 +157,19 @@
     @PostMapping(path="disabled")
     @SsoPowerAop(power = "10100011")
     @Log("绂佺敤鎴栧惎鐢ㄨ川妫�椤圭洰")
-    public BaseResponse<BaRole> disabled(@RequestBody PltProductUnqualifiedReason reason){
+    public BaseResponse<Boolean> disabled(@RequestBody PltProductUnqualifiedReason reason){
+        int count;
         try {
-            return BaseResponseUtils.buildSuccess(sv.disabled(reason.id,reason.disabled));
+            count = sv.disabled(reason.id,reason.disabled);
         }catch (Exception e){
             log.error("绂佺敤鎴栧惎鐢ㄨ川妫�椤圭洰寮傚父", e);
             return BaseResponseUtils.buildException(e.getMessage());
         }
+        if (count <= 0) {
+            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+        } else {
+            return BaseResponseUtils.buildSuccess(true);
+        }
     }
 
 }

--
Gitblit v1.8.0