From 5bb85f603e7f568d2cf7ec22a287661ef5ff7b62 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 27 Jun 2025 10:28:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97=E5=8F=8A?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NuIotTqApiRequestLogController.java       | 22 +++++++++++++--
 .../service/impl/WaterMeterServiceImpl.java   | 28 +++++++++----------
 2 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java
index 3042018..c26a000 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java
@@ -84,8 +84,26 @@ public class NuIotTqApiRequestLogController extends JeecgController<NuIotTqApiRe
 			}
 			//如果返回状态为空并且超过了5分钟则返回抄表失败
 			if(StringUtils.isBlank(par.getResolveStatus()) && fiveMinutesAgo.getTime() > date.getTime()){
-				par.setResolveStatus("抄表失败");
-			//判断返回状态为空并且没有超过了5分钟则返回抄表中
+				//9清零 3抄表 10电表拉闸 11电表合闸  49水表清零 42水表抄表 43水表开闸 53水表关闸
+				if(StringUtils.equals("9",par.getType())){
+					par.setResolveStatus("清零失败");
+				}else if (StringUtils.equals("3",par.getType())){
+					par.setResolveStatus("抄表失败");
+				}else if(StringUtils.equals("10",par.getType())){
+					par.setResolveStatus("拉闸失败");
+				}else if (StringUtils.equals("11",par.getType())){
+					par.setResolveStatus("合闸失败");
+				}else if(StringUtils.equals("49",par.getType())){
+					par.setResolveStatus("清零失败");
+				}else if (StringUtils.equals("42",par.getType())){
+					par.setResolveStatus("抄表失败");
+				}else if (StringUtils.equals("43",par.getType())){
+					par.setResolveStatus("开阀失败");
+				}else if (StringUtils.equals("53",par.getType())){
+					par.setResolveStatus("关阀失败");
+				}
+
+				//判断返回状态为空并且没有超过了5分钟则返回抄表中
 			}else if(StringUtils.isBlank(par.getResolveStatus())){
 				par.setResolveStatus(par.getRequestStatus());
 			}
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java
index bcc9171..1ccb480 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java
@@ -139,7 +139,7 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
     }
 
     /**
-     * 开关闸
+     * 开关阀
      */
     @Override
     public Result<String> waterControl(WaterMeter waterMeter){
@@ -147,9 +147,9 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
         WaterMeter entity = baseMapper.getWaterMeter(waterMeter);
         if(entity == null){
             if(type.equals(43)){
-                return Result.error("请先同步水表设备信息后再进行开闸");
+                return Result.error("请先同步水表设备信息后再进行开阀");
             }else{
-                return Result.error("请先同步水表设备信息后再进行关闸");
+                return Result.error("请先同步水表设备信息后再进行关阀");
             }
         }
         List<Map<String, Object>> req = new ArrayList<>();
@@ -181,9 +181,9 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
                     tqApiLog.setRequestTime(DateUtil.now());
                     tqApiLog.setRequestStatus(status);
                     if(type.equals(43)){
-                        tqApiLog.setRequestStatus("开闸中");
+                        tqApiLog.setRequestStatus("开阀中");
                     }else{
-                        tqApiLog.setRequestStatus("关闸中");
+                        tqApiLog.setRequestStatus("关阀中");
                     }
                     logService.insert(tqApiLog);
                 }else{
@@ -195,9 +195,9 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
                     tqApiLog.setType(waterMeter.getType());
                     tqApiLog.setRequestTime(DateUtil.now());
                     if(type.equals(43)){
-                        tqApiLog.setRequestStatus("开闸失败");
+                        tqApiLog.setRequestStatus("开阀失败");
                     }else{
-                        tqApiLog.setRequestStatus("关闸失败");
+                        tqApiLog.setRequestStatus("关阀失败");
                     }
                     tqApiLog.setRequestRemark(errorMsg);
                     logService.insert(tqApiLog);
@@ -212,18 +212,18 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
             tqApiLog.setType(waterMeter.getType());
             tqApiLog.setRequestTime(DateUtil.now());
             if(type.equals(43)){
-                tqApiLog.setRequestStatus("开闸失败");
+                tqApiLog.setRequestStatus("开阀失败");
             }else{
-                tqApiLog.setRequestStatus("关闸失败");
+                tqApiLog.setRequestStatus("关阀失败");
             }
             tqApiLog.setRequestRemark(errorMsg);
             logService.insert(tqApiLog);
             return Result.error(errorMsg);
         }
         if(type.equals(43)){
-            return Result.OK("开闸成功");
+            return Result.OK("开阀成功");
         }else{
-            return Result.OK("关闸成功");
+            return Result.OK("关阀成功");
         }
     }
 
@@ -349,7 +349,7 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
     }
 
     /**
-     * 开关闸回调通知
+     * 开关阀回调通知
      */
     @Override
     public String waterControlNotify(String response_content, String timestamp, String sign){
@@ -373,9 +373,9 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
                     Integer type = logEntity.getType();
                     String typeStr = "";
                     if(type.equals(43)){
-                        typeStr = "开闸";
+                        typeStr = "开阀";
                     }else {
-                        typeStr = "关闸";
+                        typeStr = "关阀";
                     }
                     if(status.equals("SUCCESS")){
                         tqApiLog.setResolveStatus(typeStr+"成功");