From 530385f0901cb838540bc3f83d573686eb3a3bb4 Mon Sep 17 00:00:00 2001
From: liuxm <liuxm@fescotech.com>
Date: 星期四, 16 五月 2024 17:48:47 +0800
Subject: [PATCH] 按功能点添加权限;工站添加生产线关联

---
 pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRCtrl.java |   51 ++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 38 insertions(+), 13 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..80bc77c 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
@@ -39,18 +39,25 @@
      * @return
      */
     @PostMapping(path="save")
-    @SsoPowerAop(power = "10300001")
+    @SsoPowerAop(power = "10300011")
     @Log("淇濆瓨浜у搧璁惧鎶ュ簾鍘熷洜")
-    public BaseResponse<PltProductScrappingReason> save(@RequestBody @Valid PltProductScrappingReason reason,BindingResult bindingResult){
+    public BaseResponse<Boolean> save(@RequestBody @Valid PltProductScrappingReason reason,BindingResult bindingResult){
+        int count;
         try {
             if (bindingResult != null && bindingResult.hasErrors()) {
                 return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
             }
+            reason.disabled = false;
             reason.deleted = false;
-            return BaseResponseUtils.buildSuccess(sv.save(reason));
+            count = sv.save(reason);
         }catch (Exception e){
             log.error("淇濆瓨浜у搧璁惧鎶ュ簾鍘熷洜寮傚父", e);
             return BaseResponseUtils.buildException(e.getMessage());
+        }
+        if (count <= 0) {
+            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+        } else {
+            return BaseResponseUtils.buildSuccess(true);
         }
     }
 
@@ -62,17 +69,23 @@
      * @return
      */
     @PostMapping(path="update")
-    @SsoPowerAop(power = "10300001")
+    @SsoPowerAop(power = "10300011")
     @Log("鏇存柊浜у搧璁惧鎶ュ簾鍘熷洜")
-    public BaseResponse<PltProductScrappingReason> update(@RequestBody @Valid PltProductScrappingReason reason,BindingResult bindingResult){
+    public BaseResponse<Boolean> update(@RequestBody @Valid PltProductScrappingReason reason,BindingResult bindingResult){
+        int count;
         try {
             if (bindingResult != null && bindingResult.hasErrors()) {
                 return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
             }
-            return BaseResponseUtils.buildSuccess(sv.update(reason));
+            count = sv.update(reason);
         }catch (Exception e){
             log.error("鏇存柊浜у搧璁惧鎶ュ簾鍘熷洜寮傚父", e);
             return BaseResponseUtils.buildException(e.getMessage());
+        }
+        if (count <= 0) {
+            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+        } else {
+            return BaseResponseUtils.buildSuccess(true);
         }
     }
 
@@ -82,14 +95,20 @@
      * @return
      */
     @GetMapping(path="delete")
-    @SsoPowerAop(power = "10300001")
+    @SsoPowerAop(power = "10300011")
     @Log("鍒犻櫎浜у搧璁惧鎶ュ簾鍘熷洜")
-    public BaseResponse<PltProductScrappingReason> 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);
         }
     }
 
@@ -100,7 +119,7 @@
      * @return
      */
     @GetMapping(path="one")
-    @SsoPowerAop(power = "10300000") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+    @SsoPowerAop(power = "10300010") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
     @Log("鏍规嵁ID鏌ヨ浜у搧璁惧鎶ュ簾鍘熷洜")
     public BaseResponse<PltProductScrappingReason> one(String id){
         try{
@@ -118,7 +137,7 @@
      * @return
      */
     @PostMapping(path="some")
-    @SsoPowerAop(power = "10300000")
+    @SsoPowerAop(power = "10300010")
     @Log("鏌ヨ浜у搧璁惧鎶ュ簾鍘熷洜")
     public BaseResponse<QueryResultVo<List<PltProductScrappingReason>>> some(@RequestBody QueryVo vo){
         try {
@@ -138,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