+ 增加uwb定位上图代码

bd-park/park-backend/park-application/src/main/resources/application-hm.yml

@@ -84,7 +84,7 @@ spring:
 
 mqtt:
   client:
-    enabled: false
+    enabled: true
     ip: xt.wenhq.top
     port: 8581
     name: uwb-location-client
@@ -104,3 +104,10 @@ mqtt:
 bd:
   mqtt:
     enabled: true
+
+evt-fusion:
+  thread-pool-size: 2
+  video-trail-engine:
+    enable: false
+  uwb-tag-listener:
+    enable: true

bd-park/park-backend/park-application/src/main/resources/application.yml

@@ -98,11 +98,11 @@ forest:
     holiday: https://raw.githubusercontent.com
     uwb:
       enabled: true
-      uwb-socket: ws://172.192.13.80:2223/socket/websocket/pollingArea
+      uwb-socket: ws://172.192.13.95:2223/socket/websocket/pollingArea
       test-tag: 845D3
       uwb-usr: admin
       uwb-pwd: admin123
-      uwb-host: http://172.192.13.80:2223
+      uwb-host: http://172.192.13.95:2223
     cad:
       cad-biz-param: cad.biz.param
       cad-server: http://127.0.0.1:18080

bd-park/park-backend/park-collect/src/main/java/com/huashe/park/collect/handle/RootMsgHandler.java

@@ -111,7 +111,7 @@ public class RootMsgHandler extends TopicMsgEngine {
                 DateTimeUtil.getDateFromMills(machineProcess.getDataTime(), DateTimeUtil.DateFormatter.yyyyMMdd));
             // 结合下行深度effectiveDown 以及 开始和结束时间 sendStartTime sendEndTime，计算平均下行速度
             machineProcess.setAvgSpeed(machineProcess.getEffectiveDown()
-                / (machineProcess.getEndTime() - machineProcess.getStartTime()) * 1000);
+                / (machineProcess.getSendEndTime() - machineProcess.getSendStartTime()) * 1000);
             // 结合下行深度effectiveDown 以及 开始和结束时间 pullingStartTime pullingEndTime， 计算平均拔管速度。并且保留两位小数
             machineProcess.setAvgUpSpeed(machineProcess.getEffectiveDown()
                 / (machineProcess.getPullingEndTime() - machineProcess.getPullingStartTime()) * 1000);

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/mapper/BdCameraInfoMapper.java

@@ -2,6 +2,7 @@ package com.huashe.park.core.mapper;
 
 import java.util.List;
 
+import com.huashe.common.annotation.mybatis.IgnoreTenant;
 import com.huashe.park.domain.dto.VideoFence;
 import com.huashe.park.domain.entity.BdCameraInfo;
 
@@ -11,6 +12,7 @@ import com.huashe.park.domain.entity.BdCameraInfo;
  * @author ruoyi
  * @date 2025-01-21
  */
+@IgnoreTenant
 public interface BdCameraInfoMapper {
     /**
      * 查询视频设备

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/mapper/BdDevcTrailMapper.java

@@ -2,6 +2,7 @@ package com.huashe.park.core.mapper;
 
 
 
+import com.huashe.common.annotation.mybatis.IgnoreTenant;
 import com.huashe.park.domain.entity.BdDevcTrail;
 
 import java.util.List;
@@ -12,6 +13,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2024-11-07
  */
+@IgnoreTenant
 public interface BdDevcTrailMapper 
 {
     /**

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/mapper/BdDevcTrailUwbMapper.java

@@ -1,6 +1,7 @@
 package com.huashe.park.core.mapper;
 
 
+import com.huashe.common.annotation.mybatis.IgnoreTenant;
 import com.huashe.park.domain.entity.BdDevcTrailUwb;
 
 import java.util.List;
@@ -11,6 +12,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2024-10-16
  */
+@IgnoreTenant
 public interface BdDevcTrailUwbMapper {
     /**
      * 查询室内坐标定位

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/mapper/BdFenceInfoMapper.java

@@ -1,5 +1,6 @@
 package com.huashe.park.core.mapper;
 
+import com.huashe.common.annotation.mybatis.IgnoreTenant;
 import com.huashe.park.domain.entity.BdFenceInfo;
 
 import java.util.List;
@@ -10,6 +11,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2024-10-14
  */
+@IgnoreTenant
 public interface BdFenceInfoMapper
 {
     /**

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/mapper/BdFenceVioEvtMapper.java

@@ -1,6 +1,7 @@
 package com.huashe.park.core.mapper;
 
 
+import com.huashe.common.annotation.mybatis.IgnoreTenant;
 import com.huashe.park.domain.entity.BdFenceVioEvt;
 
 import java.util.List;
@@ -11,6 +12,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2024-10-14
  */
+@IgnoreTenant
 public interface BdFenceVioEvtMapper
 {
     /**

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/mapper/MachineProcessResultMapper.java

@@ -1,22 +1,21 @@
 package com.huashe.park.core.mapper;
 
-import java.util.List;
-
 import com.huashe.common.annotation.mybatis.IgnoreTenant;
-import com.huashe.common.annotation.mybatis.Tenant;
 import com.huashe.park.domain.dto.cons.ConsUnitResult;
 import com.huashe.park.domain.entity.MachineProcessResult;
 
+import java.util.List;
+
 /**
  * 桩机施工结果数据（2025-02-26版协议）Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2025-02-26
  */
 public interface MachineProcessResultMapper {
     /**
      * 查询桩机施工结果数据（2025-02-26版协议）
-     * 
+     *
      * @param id 桩机施工结果数据（2025-02-26版协议）主键
      * @return 桩机施工结果数据（2025-02-26版协议）
      */
@@ -25,7 +24,7 @@ public interface MachineProcessResultMapper {
 
     /**
      * 查询桩机施工结果数据（2025-02-26版协议）列表
-     * 
+     *
      * @param machineProcessResult 桩机施工结果数据（2025-02-26版协议）
      * @return 桩机施工结果数据（2025-02-26版协议）集合
      */
@@ -34,7 +33,7 @@ public interface MachineProcessResultMapper {
 
     /**
      * 新增桩机施工结果数据（2025-02-26版协议）
-     * 
+     *
      * @param machineProcessResult 桩机施工结果数据（2025-02-26版协议）
      * @return 结果
      */
@@ -44,7 +43,7 @@ public interface MachineProcessResultMapper {
 
     /**
      * 修改桩机施工结果数据（2025-02-26版协议）
-     * 
+     *
      * @param machineProcessResult 桩机施工结果数据（2025-02-26版协议）
      * @return 结果
      */
@@ -52,7 +51,7 @@ public interface MachineProcessResultMapper {
 
     /**
      * 删除桩机施工结果数据（2025-02-26版协议）
-     * 
+     *
      * @param id 桩机施工结果数据（2025-02-26版协议）主键
      * @return 结果
      */
@@ -60,13 +59,13 @@ public interface MachineProcessResultMapper {
 
     /**
      * 批量删除桩机施工结果数据（2025-02-26版协议）
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteMachineProcessResultByIds(Long[] ids);
 
-    @Tenant(tableAlias = "cphir")
+    @IgnoreTenant
     List<ConsUnitResult> qeyConsUnitResult(Long consUnitId);
 
 }

bd-park/park-backend/park-core/src/main/resources/mapper/cons/MachineProcessResultMapper.xml

@@ -451,6 +451,7 @@
             #{id}
         </foreach>
     </delete>
+
     <select id="qeyConsUnitResult" parameterType="Long" resultType="com.huashe.park.domain.dto.cons.ConsUnitResult">
         select cmpr.*,
                cphir.forward_tilt_angle,

bd-park/park-backend/park-infrastructure/src/main/java/com/huashe/park/infrastructure/socket/server/UwbLocationSocketServer.java

@@ -0,0 +1,39 @@
+package com.huashe.park.infrastructure.socket.server;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson2.JSONPath;
+import com.huashe.park.common.websocket.SocketEndPoint;
+import com.huashe.park.common.websocket.SocketHandle;
+import org.springframework.web.socket.WebSocketSession;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@SocketEndPoint(url = "/pkb/uwb/location")
+public class UwbLocationSocketServer extends SocketHandle {
+    private static final String SESSION_KEY_TEMPLATE = "%s-%s";
+
+    private static final String UWB_KEY = "deviceId";
+
+    private static final String CLIENT = "client";
+
+    @Override
+    public String custSessionKey(WebSocketSession session) {
+        Map<String, Object> attributes = session.getAttributes();
+        return String.format(SESSION_KEY_TEMPLATE, attributes.get(CLIENT), attributes.get(UWB_KEY));
+    }
+
+    @Override
+    public void sendMessage(String sessionKey, JSONObject message) {
+        JSONObject msg = (JSONObject)JSONPath.eval(message, "$.msg");
+        super.sendMessage(msg.getString("key"), message);
+    }
+
+    @Override
+    public List<WebSocketSession> filterSession(String sessionKey, Map<String, WebSocketSession> webSocketSessionMap) {
+        return webSocketSessionMap.entrySet().stream().filter(entry -> entry.getKey().contains(sessionKey))
+            .map(Map.Entry::getValue).collect(Collectors.toList());
+    }
+
+}