From 8276c60682d1c69e632ac010988c5ada173a178e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 06 二月 2025 16:28:03 +0800
Subject: [PATCH] 1、大屏展示模块：基本信息统计、当前信息统计、监测信息统计（部分）； 2、优化代码。

---
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskCtrl.java |  112 +++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 94 insertions(+), 18 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskCtrl.java
index 38822a4..3e6cc53 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskCtrl.java
@@ -5,8 +5,8 @@
 import com.dy.common.webUtil.BaseResponseUtils;
 import com.dy.common.webUtil.QueryResultVo;
 import com.dy.common.webUtil.ResultCodeMsg;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuTask;
-import com.dy.pipIrrGlobal.voRm.VoRtuTask;
+import com.dy.pipIrrGlobal.pojoUg.UgRtuTask;
+import com.dy.pipIrrGlobal.voUg.VoRtuTask;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -25,7 +25,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.UnsupportedEncodingException;
-import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
@@ -86,7 +85,7 @@
             return BaseResponseUtils.buildSuccess(res);
         } catch (Exception e) {
             log.error("鏌ヨRTU鍗囩骇浠诲姟寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
+            return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
         }
     }
 
@@ -111,7 +110,7 @@
             return BaseResponseUtils.buildSuccess(res);
         } catch (Exception e) {
             log.error("鏌ヨRTU鍗囩骇浠诲姟寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
+            return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
         }
     }
 
@@ -133,22 +132,20 @@
     @SsoAop()
     public BaseResponse<Boolean> save(@Parameter(description = "form琛ㄥ崟鏁版嵁", required = true) @Valid VoRtuTask vo, @Parameter(hidden = true) BindingResult bindingResult){
         if(bindingResult != null && bindingResult.hasErrors()){
-            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
         }
         UgRtuTask po = new UgRtuTask();
         vo.toPo(po);
-        po.dt = new Date();
-        po.isOver = 0 ;
-        po.deleted = 0 ;
+        po.init();
         int count;
         try {
             count = this.sv.save(po);
         } catch (Exception e) {
             log.error("淇濆瓨RTU鍗囩骇浠诲姟寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
+            return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
         }
         if(count <= 0){
-            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
+            return BaseResponseUtils.buildErrorMsg("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
         }else{
             return BaseResponseUtils.buildSuccess(true) ;
         }
@@ -171,25 +168,104 @@
      @SsoAop()
      public BaseResponse<Boolean> update(@Parameter(description = "form琛ㄥ崟鏁版嵁", required = true) @Valid UgRtuTask po, @Parameter(hidden = true) BindingResult bindingResult){
          if(bindingResult != null && bindingResult.hasErrors()){
-             return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+             return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
          }
          if(po.id == null){
-             return BaseResponseUtils.buildFail("鏃犳暟鎹疄浣揑D") ;
+             return BaseResponseUtils.buildErrorMsg("鏃犳暟鎹疄浣揑D") ;
          }
          int count;
          try {
              count = this.sv.update(po);
          } catch (Exception e) {
              log.error("淇濆瓨瀹炰綋鏁版嵁寮傚父", e);
-             return BaseResponseUtils.buildException(e.getMessage()) ;
+             return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
          }
          if(count <= 0){
-             return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
+             return BaseResponseUtils.buildErrorMsg("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
          }else{
              return BaseResponseUtils.buildSuccess(true) ;
          }
      }
 
+
+    /**
+     * 鎵цRTU鍗囩骇浠诲姟
+     * @param id RTU鍗囩骇浠诲姟ID
+     * @return 鏄惁鎴愬姛
+     */
+    @Operation(summary = "鎵цRTU鍗囩骇浠诲姟", description = "鎻愪氦RTU鍗囩骇浠诲姟ID锛岃繘琛屾墽琛�")
+    @ApiResponses(value = {
+            @ApiResponse(
+                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+                    description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
+                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+                            schema = @Schema(implementation = Boolean.class))}
+            )
+    })
+    @GetMapping(path = "execute")
+    @SsoAop()
+    public BaseResponse<Boolean> execute(Long id){
+        if(id == null){
+            return BaseResponseUtils.buildErrorMsg("id涓嶈兘涓虹┖") ;
+        }
+        int count;
+        try {
+            count = this.sv.isOver(id) ;
+            if(count > 0){
+                return BaseResponseUtils.buildErrorMsg("浠诲姟宸茬粡缁撴潫锛屼笉鑳藉啀鎵ц") ;
+            }
+            count = this.sv.isExecute(id) ;
+            if(count > 0){
+                return BaseResponseUtils.buildErrorMsg("浠诲姟宸茬粡鎵ц锛屼笉鑳藉啀鎵ц") ;
+            }
+            count = this.sv.execute(id);
+        } catch (Exception e) {
+            log.error("鎵цRTU鍗囩骇浠诲姟寮傚父", e);
+            return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
+        }
+        if(count <= 0){
+            return BaseResponseUtils.buildErrorMsg("鏁版嵁搴撴搷浣滃け璐�") ;
+        }else{
+            return BaseResponseUtils.buildSuccess(true) ;
+        }
+    }
+
+    /**
+     * 缁撴潫RTU鍗囩骇浠诲姟
+     * @param id RTU鍗囩骇浠诲姟ID
+     * @return 鏄惁鎴愬姛
+     */
+    @Operation(summary = "缁撴潫RTU鍗囩骇浠诲姟", description = "鎻愪氦RTU鍗囩骇浠诲姟ID锛岃繘琛岀粨鏉�")
+    @ApiResponses(value = {
+            @ApiResponse(
+                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+                    description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
+                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+                            schema = @Schema(implementation = Boolean.class))}
+            )
+    })
+    @GetMapping(path = "over")
+    @SsoAop()
+    public BaseResponse<Boolean> over(Long id){
+        if(id == null){
+            return BaseResponseUtils.buildErrorMsg("id涓嶈兘涓虹┖") ;
+        }
+        int count;
+        try {count = this.sv.isOver(id) ;
+            if(count > 0){
+                return BaseResponseUtils.buildErrorMsg("浠诲姟宸茬粡缁撴潫锛屼笉鐢ㄥ啀缁撴潫") ;
+            }
+            count = this.sv.over(id);
+        } catch (Exception e) {
+            log.error("缁撴潫RTU鍗囩骇浠诲姟寮傚父", e);
+            return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
+        }
+        if(count <= 0){
+            return BaseResponseUtils.buildErrorMsg("鏁版嵁搴撴搷浣滃け璐�") ;
+        }else{
+            return BaseResponseUtils.buildSuccess(true) ;
+        }
+    }
 
     /**
      * 鍒犻櫎RTU鍗囩骇浠诲姟
@@ -209,17 +285,17 @@
     @SsoAop()
     public BaseResponse<Boolean> delete(Long id){
         if(id == null){
-            return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
+            return BaseResponseUtils.buildErrorMsg("id涓嶈兘涓虹┖") ;
         }
         int count;
         try {
             count = this.sv.delete(id);
         } catch (Exception e) {
             log.error("鍒犻櫎RTU鍗囩骇浠诲姟寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
+            return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
         }
         if(count <= 0){
-            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
+            return BaseResponseUtils.buildErrorMsg("鏁版嵁搴撴搷浣滃け璐�") ;
         }else{
             return BaseResponseUtils.buildSuccess(true) ;
         }

--
Gitblit v1.8.0