From e4bc4f97e837fcf1cb976e92a022c0791c9360a4 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 15 十月 2024 14:05:39 +0800
Subject: [PATCH] 优化代码 控制器查询 最近未报数的取水口 修改密码

---
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java |   12 ++++++------
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml          |   12 ++++++------
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml                |    2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
index 7245604..fbd2fd8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
@@ -217,7 +217,7 @@
         con.protocol,
         inta.remarks,
         rtus.isOnLine,
-        (SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND intakeId = inta.id AND operateType = 1) AS bindNumber,
+        (SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND operateType = 1) AS bindNumber,
         con.findDt AS findDt
     FROM pr_controller con
         LEFT JOIN pr_intake_controller ic ON ic.controllerId = con.id
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml
index 9c251e9..d6dbe83 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml
@@ -428,9 +428,9 @@
         <if test="timeStart != null and timeStart != '' ">
             OR rohrl.rtu_dt  &lt; #{timeStart}
         </if>
-        <if test="timeStop != null and timeStop != '' ">
-            OR rohrl.rtu_dt &gt; #{timeStop}
-        </if>
+<!--        <if test="timeStop != null and timeStop != '' ">-->
+<!--            OR rohrl.rtu_dt &gt; #{timeStop}-->
+<!--        </if>-->
         ORDER BY rtu_dt ASC
     </select>
     <!--鑾峰彇鏈�杩戞湭鎶ユ暟鐨勫彇姘村彛-->
@@ -446,9 +446,9 @@
         <if test="timeStart != null">
             OR rohrl.rtu_dt  &lt; #{timeStart}
         </if>
-        <if test="timeStop != null">
-            OR rohrl.rtu_dt &gt; #{timeStop}
-        </if>
+<!--        <if test="timeStop != null">-->
+<!--            OR rohrl.rtu_dt &gt; #{timeStop}-->
+<!--        </if>-->
         ORDER BY rtu_dt ASC
     </select>
 </mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
index e8b00e6..90fbbba 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
@@ -244,13 +244,13 @@
     @SsoAop()
     public BaseResponse<Boolean> changePassword(String id, String oldPassword, String newPassword) throws Exception {
         if (id == null) {
-            return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖");
+            return BaseResponseUtils.buildErrorMsg("id涓嶈兘涓虹┖");
         }
         if (StringUtils.isNullOrEmpty(oldPassword)) {
-            return BaseResponseUtils.buildFail("鏃у瘑鐮佷笉鑳戒负绌�");
+            return BaseResponseUtils.buildErrorMsg("鏃у瘑鐮佷笉鑳戒负绌�");
         }
         if (StringUtils.isNullOrEmpty(newPassword)) {
-            return BaseResponseUtils.buildFail("鏂板瘑鐮佷笉鑳戒负绌�");
+            return BaseResponseUtils.buildErrorMsg("鏂板瘑鐮佷笉鑳戒负绌�");
         }
         /*
         濡傛灉鍓嶇杩涜浜哹ase64鍔犲瘑
@@ -265,10 +265,10 @@
         try {
             BaUser po = this.sv.selectById(idLg);
             if (Objects.isNull(po)) {
-                return BaseResponseUtils.buildFail("鏈緱鍒扮敤鎴凤紝璇锋眰澶辫触");
+                return BaseResponseUtils.buildErrorMsg("鏈緱鍒扮敤鎴凤紝璇锋眰澶辫触");
             } else {
                 if (!po.password.equalsIgnoreCase(oldPassword)) {
-                    return BaseResponseUtils.buildFail("鏃у瘑鐮佷笉姝ｇ‘锛岃姹傚け璐�");
+                    return BaseResponseUtils.buildErrorMsg("鏃у瘑鐮佷笉姝ｇ‘锛岃姹傚け璐�");
                 } else {
                     count = this.sv.changePassword(idLg, newPassword);
                 }
@@ -278,7 +278,7 @@
             return BaseResponseUtils.buildException(e.getMessage());
         }
         if (count <= 0) {
-            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+            return BaseResponseUtils.buildErrorMsg("鏁版嵁搴撳瓨鍌ㄥけ璐�");
         } else {
             return BaseResponseUtils.buildSuccess(true);
         }

--
Gitblit v1.8.0