From d5594f4054091c5e11a33a9292e7cae641afe061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?=
 <wang.haotian@hzleaper.com>
Date: Tue, 27 Jun 2023 17:03:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B7=E9=81=93=E5=92=8C=E7=90=83=E6=9C=BA?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4=20=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E5=A2=99=E9=A1=BA=E5=BA=8F=E6=8C=89=E7=85=A7=E5=B7=B7=E9=81=93?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/zhehekeji/web/mapper/StreetMapper.java    | 2 +-
 .../main/java/com/zhehekeji/web/service/CameraService.java  | 6 ++++--
 .../main/java/com/zhehekeji/web/service/InitService.java    | 5 ++++-
 web/src/main/resources/mapper/StreetMapper.xml              | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/web/src/main/java/com/zhehekeji/web/mapper/StreetMapper.java b/web/src/main/java/com/zhehekeji/web/mapper/StreetMapper.java
index 786fb1a..da0b8d7 100644
--- a/web/src/main/java/com/zhehekeji/web/mapper/StreetMapper.java
+++ b/web/src/main/java/com/zhehekeji/web/mapper/StreetMapper.java
@@ -15,6 +15,6 @@ public interface StreetMapper extends BaseMapper<Street> {
 
     List<StreetVO> list();
 
-    @Select("select * from street where plc_id = #{plcId} limit 1")
+    @Select("select * from street where plc_id = #{plcId} limit 1 ")
     Street getStreetByPlcId(String plcId);
 }
diff --git a/web/src/main/java/com/zhehekeji/web/service/CameraService.java b/web/src/main/java/com/zhehekeji/web/service/CameraService.java
index c563ee5..1684943 100644
--- a/web/src/main/java/com/zhehekeji/web/service/CameraService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/CameraService.java
@@ -1,6 +1,7 @@
 package com.zhehekeji.web.service;
 
 import com.alibaba.excel.EasyExcel;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.zhehekeji.core.util.Assert;
@@ -107,7 +108,7 @@ public class CameraService {
 
     public PageInfo<Camera> cameras(StreetSearch streetSearch) {
         PageHelper.startPage(streetSearch.getPageNum(), streetSearch.getPageSize());
-        List<Camera> cameras = cameraMapper.selectByMap(new HashMap<>(0));
+        List<Camera> cameras = cameraMapper.selectList(new QueryWrapper<Camera>().orderByAsc("(REPLACE(name,\"巷道\",\"\")+0)"));
         if(cameras.size() > 0){
             if(streetSearch.getSearchType() == null || streetSearch.getSearchType() == 0){
                 CountDownLatch latch = new CountDownLatch(cameras.size());
@@ -163,7 +164,8 @@ public class CameraService {
     }
 
     public List<Camera> allCameras(){
-        return cameraMapper.selectByMap(new HashMap<>());
+        List<Camera> cameras = cameraMapper.selectList(new QueryWrapper<Camera>().orderByAsc("(REPLACE(name,\"巷道\",\"\")+0)"));
+        return cameras;
     }
 
     /**
diff --git a/web/src/main/java/com/zhehekeji/web/service/InitService.java b/web/src/main/java/com/zhehekeji/web/service/InitService.java
index 7c2a73a..aedd8b6 100644
--- a/web/src/main/java/com/zhehekeji/web/service/InitService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/InitService.java
@@ -18,6 +18,7 @@ import com.zhehekeji.web.service.putian.PuTianNettyClient;
 import com.zhehekeji.web.service.robotic.NettyClient;
 import com.zhehekeji.web.service.sick.SickNettyClient;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.util.StringUtil;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.context.annotation.Bean;
@@ -90,7 +91,9 @@ public class InitService implements ApplicationRunner {
         //所有客户端的IP 标识保存到map内存
         List<Street> streets = streetMapper.selectByMap(new HashMap<>());
         streets.forEach(street -> {
-            ClientChanel.putIp(street.getPlcIp(),street.getPlcId());
+            if(street.getPlcIp()!=null && "".equals(street.getPlcIp())) {
+                ClientChanel.putIp(street.getPlcIp(), street.getPlcId());
+            }
         });
         ConfigProperties.KSEC ksec = configProperties.getKsec();
         if(ksec != null){
diff --git a/web/src/main/resources/mapper/StreetMapper.xml b/web/src/main/resources/mapper/StreetMapper.xml
index 8c73b87..0ce385b 100644
--- a/web/src/main/resources/mapper/StreetMapper.xml
+++ b/web/src/main/resources/mapper/StreetMapper.xml
@@ -14,7 +14,7 @@
         left join sensor_gun s1 on s1.street_id = t.id and s1.direction = 1
         left join sensor_gun s2 on s2.street_id = t.id and s2.direction = 2
         left join RFID rf on rf.street_id = t.id
-        order by t.id desc
+        order by  plc_id + 0
     </select>
 
 </mapper>