From 88e0e20994bf9ea1cc5a24ac98f52e8b344c7bf1 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期二, 11 十月 2022 18:58:11 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java      |    7 +++++++
 src/main/java/com/zy/core/netty/handle/PackageServerHandler.java |    6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index adf2da1..fbbc607 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2136,6 +2136,13 @@
                                 }
                             }
                         }else { }
+                        TestMast testMast0101804 = testMastService.selectOne(new EntityWrapper<TestMast>()
+                                .eq("loc_no","0101804"));//鏌ユ壘鍘熸潵鐨勭姸鎬�
+                        if (!Cools.isEmpty(testMast0101804)){
+                            if (testMast0101804.getChannel()>10240){
+
+                            }
+                        }
 
                     }
 
diff --git a/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java b/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
index 73ea874..8db7df1 100644
--- a/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
+++ b/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
@@ -45,11 +45,11 @@
                 ChannelCache.setChannel(String.valueOf(fire3030.getNo()), ctx.channel());
                 Constant.errorMap.remove(fire3030.getNo());
                 LocMastService locMastService2 = SpringUtils.getBean(LocMastService.class);
-                LocMast locMast2 = locMastService2.selectOne(new EntityWrapper<LocMast>().eq("loc_no","01001804"));
+                LocMast locMast2 = locMastService2.selectOne(new EntityWrapper<LocMast>().eq("loc_no","0101804"));
                 if(null != locMast2) {
-                    locMast2.setChannel(1000);
+                    locMast2.setChannel(10000);
                     locMast2.setModiTime(new Date());
-                    locMastService2.update(locMast2, new EntityWrapper<LocMast>().eq("loc_no", "01001804"));
+                    locMastService2.update(locMast2, new EntityWrapper<LocMast>().eq("loc_no", "0101804"));
                 }
                 break;
             case FIRE_ALARM:

--
Gitblit v1.9.1