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/station/StationCtrl.java |   67 +++++++++++++++++++++++++--------
 1 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java
index 40ae28b..2e191f5 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java
@@ -37,18 +37,25 @@
      * @return
      */
     @PostMapping(path="save")
-    @SsoPowerAop(power = "10300001")
+    @SsoPowerAop(power = "10300007")
     @Log("淇濆瓨宸ョ珯")
-    public BaseResponse<PltStation> save(@RequestBody @Valid PltStation station,BindingResult bindingResult){
+    public BaseResponse<Boolean> save(@RequestBody @Valid PltStation station,BindingResult bindingResult){
+        if (bindingResult != null && bindingResult.hasErrors()) {
+            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+        }
+        int count;
         try {
-            if (bindingResult != null && bindingResult.hasErrors()) {
-                return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
-            }
             station.deleted = false;
-            return BaseResponseUtils.buildSuccess(sv.save(station));
+            count = sv.save(station);
         }catch (Exception e){
             log.error("淇濆瓨宸ョ珯寮傚父", e);
             return BaseResponseUtils.buildException(e.getMessage());
+        }
+
+        if (count <= 0) {
+            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+        } else {
+            return BaseResponseUtils.buildSuccess(true);
         }
     }
 
@@ -60,17 +67,23 @@
      * @return
      */
     @PostMapping(path="update")
-    @SsoPowerAop(power = "10300001")
+    @SsoPowerAop(power = "10300007")
     @Log("鏇存柊宸ョ珯")
-    public BaseResponse<PltStation> update(@RequestBody @Valid PltStation station,BindingResult bindingResult){
+    public BaseResponse<Boolean> update(@RequestBody @Valid PltStation station,BindingResult bindingResult){
+        int count;
         try {
             if (bindingResult != null && bindingResult.hasErrors()) {
                 return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
             }
-            return BaseResponseUtils.buildSuccess(sv.update(station));
+            count = sv.update(station);
         }catch (Exception e){
             log.error("鏇存柊宸ョ珯寮傚父", e);
             return BaseResponseUtils.buildException(e.getMessage());
+        }
+        if (count <= 0) {
+            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+        } else {
+            return BaseResponseUtils.buildSuccess(true);
         }
     }
 
@@ -80,25 +93,28 @@
      * @return
      */
     @GetMapping(path="delete")
-    @SsoPowerAop(power = "10300001")
+    @SsoPowerAop(power = "10300007")
     @Log("鍒犻櫎宸ョ珯")
-    public BaseResponse<PltStation> 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);
+        }
     }
-
-
-
     /**
      * 鏍规嵁ID鏌ヨ
      * @return
      */
     @GetMapping(path="one")
-    @SsoPowerAop(power = "10300000") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+    @SsoPowerAop(power = "10300006") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
     @Log("鏍规嵁ID鏌ヨ宸ョ珯")
     public BaseResponse<PltStation> one(String id){
         try{
@@ -116,7 +132,7 @@
      * @return
      */
     @PostMapping(path="some")
-    @SsoPowerAop(power = "10300000")
+    @SsoPowerAop(power = "10300006")
     @Log("鍒嗛〉鏌ヨ宸ョ珯")
     public BaseResponse<QueryResultVo<List<PltStation>>> some(@RequestBody QueryVo vo){
         try {
@@ -128,5 +144,22 @@
         }
     }
 
+    @PostMapping(path="disabled")
+    @SsoPowerAop(power = "10100011")
+    @Log("绂佺敤鎴栧惎鐢ㄥ伐绔�")
+    public BaseResponse<Boolean> disabled(@RequestBody PltStation station){
+        int count;
+        try {
+            count = sv.disabled(station.id,station.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