ソースを参照

+ 北斗园区业务代码

chen.cheng 6 ヶ月 前
コミット
111ca7989f
29 ファイル変更616 行追加290 行削除
  1. 2 3
      bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/engine/impl/FenceBreakInEngine.java
  2. 1 1
      bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/engine/impl/PointFusionEngine.java
  3. 1 1
      bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/bd/BdDevcTrailUwbController.java
  4. 1 1
      bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/bd/BdFenceInfoController.java
  5. 2 1
      bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/bd/BdFenceVioEvtController.java
  6. 6 1
      bd-park/park-backend/park-core/pom.xml
  7. 0 107
      bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/domain/BdFenceInfo.java
  8. 0 146
      bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/domain/BdFenceVioEvt.java
  9. 63 0
      bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/mapper/BdDevcTrailMapper.java
  10. 15 10
      bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/mapper/BdDevcTrailUwbMapper.java
  11. 2 1
      bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/mapper/BdFenceInfoMapper.java
  12. 3 3
      bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/mapper/BdFenceVioEvtMapper.java
  13. 2 2
      bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/IBdDevcTrailUwbService.java
  14. 2 1
      bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/IBdFenceInfoService.java
  15. 2 1
      bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/IBdFenceVioEvtService.java
  16. 1 1
      bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/BdDevcTrailUwbServiceImpl.java
  17. 1 1
      bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/BdFenceInfoServiceImpl.java
  18. 1 1
      bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/BdFenceVioEvtServiceImpl.java
  19. 1 1
      bd-park/park-backend/park-core/src/main/resources/mapper/bd/BdDevcTrailUwbMapper.xml
  20. 1 1
      bd-park/park-backend/park-core/src/main/resources/mapper/bd/BdFenceInfoMapper.xml
  21. 1 1
      bd-park/park-backend/park-core/src/main/resources/mapper/bd/BdFenceVioEvtMapper.xml
  22. 40 0
      bd-park/park-backend/park-domain/pom.xml
  23. 48 0
      bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/dto/UWBAuth.java
  24. 83 0
      bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/BdDevcTrail.java
  25. 3 3
      bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/BdDevcTrailUwb.java
  26. 142 0
      bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/BdFenceInfo.java
  27. 162 0
      bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/BdFenceVioEvt.java
  28. 20 0
      bd-park/park-backend/park-infrastructure/pom.xml
  29. 10 2
      bd-park/park-backend/pom.xml

+ 2 - 3
bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/engine/impl/FenceBreakInEngine.java

@@ -5,14 +5,14 @@ import com.alibaba.fastjson2.JSONObject;
 import com.huashe.park.application.common.DateTimeUtil;
 import com.huashe.park.application.common.geo.GeoUtils;
 import com.huashe.park.application.web.core.config.MqttCfg;
-import com.huashe.park.core.domain.BdFenceInfo;
-import com.huashe.park.core.domain.BdFenceVioEvt;
 import com.huashe.park.core.service.IBdFenceInfoService;
 import com.huashe.park.core.service.IBdFenceVioEvtService;
 import com.huashe.park.application.engine.EvtFusionEngine;
 import com.huashe.park.application.engine.LocationInfo;
 import com.huashe.park.application.bd.socket.FenceVioEvtSocketServer;
 import com.huashe.park.application.common.BDConst;
+import com.huashe.park.domain.entity.BdFenceInfo;
+import com.huashe.park.domain.entity.BdFenceVioEvt;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.huashe.park.application.common.enums.EvtStatus;
 import com.huashe.park.application.common.enums.EvtType;
@@ -27,7 +27,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.LinkedBlockingQueue;

+ 1 - 1
bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/engine/impl/PointFusionEngine.java

@@ -2,13 +2,13 @@ package com.huashe.park.application.engine.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.huashe.park.application.common.DateTimeUtil;
-import com.huashe.park.core.domain.BdDevcTrailUwb;
 import com.huashe.park.core.service.IBdDevcTrailUwbService;
 import com.huashe.park.application.bd.socket.PointWebSocketServer;
 import com.huashe.park.application.common.BDConst;
 import com.huashe.park.application.web.core.config.MqttCfg;
 import com.huashe.park.application.engine.EvtFusionEngine;
 import com.huashe.park.application.engine.LocationInfo;
+import com.huashe.park.domain.entity.BdDevcTrailUwb;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.stereotype.Service;

+ 1 - 1
bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/bd/BdDevcTrailUwbController.java

@@ -3,8 +3,8 @@ package com.huashe.park.application.web.controller.bd;
 import com.alibaba.fastjson2.JSON;
 import com.huashe.park.application.common.BDConst;
 import com.huashe.park.application.common.DateTimeUtil;
-import com.huashe.park.core.domain.BdDevcTrailUwb;
 import com.huashe.park.core.service.IBdDevcTrailUwbService;
+import com.huashe.park.domain.entity.BdDevcTrailUwb;
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;

+ 1 - 1
bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/bd/BdFenceInfoController.java

@@ -1,8 +1,8 @@
 package com.huashe.park.application.web.controller.bd;
 
 
-import com.huashe.park.core.domain.BdFenceInfo;
 import com.huashe.park.core.service.IBdFenceInfoService;
+import com.huashe.park.domain.entity.BdFenceInfo;
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;

+ 2 - 1
bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/bd/BdFenceVioEvtController.java

@@ -1,7 +1,8 @@
 package com.huashe.park.application.web.controller.bd;
 
-import com.huashe.park.core.domain.BdFenceVioEvt;
+
 import com.huashe.park.core.service.IBdFenceVioEvtService;
+import com.huashe.park.domain.entity.BdFenceVioEvt;
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;

+ 6 - 1
bd-park/park-backend/park-core/pom.xml

@@ -33,7 +33,6 @@
             <artifactId>fastjson2</artifactId>
             <version>${fastjson.version}</version>
         </dependency>
-
         <!-- Apache Lang3 -->
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -65,6 +64,12 @@
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.huashe.park</groupId>
+            <artifactId>park-domain</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

+ 0 - 107
bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/domain/BdFenceInfo.java

@@ -1,107 +0,0 @@
-package com.huashe.park.core.domain;
-
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.locationtech.jts.geom.Polygon;
-
-/**
- * 围栏基础信息对象 bd_fence_info
- *
- * @author ruoyi
- * @date 2024-10-14
- */
-public class BdFenceInfo extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /**  */
-    private Long id;
-
-    /** 围栏名称 */
-    @Excel(name = "围栏名称")
-    private String defenceName;
-
-    /** 围栏图形坐标 */
-    private String poly;
-
-    /** 中心点 */
-    @Excel(name = "中心点")
-    private Double centerLng;
-
-    /** 中心点 */
-    @Excel(name = "中心点")
-    private Double centerLat;
-
-    private Polygon polygon;
-
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-
-    public Long getId()
-    {
-        return id;
-    }
-    public void setDefenceName(String defenceName)
-    {
-        this.defenceName = defenceName;
-    }
-
-    public String getDefenceName()
-    {
-        return defenceName;
-    }
-    public void setPoly(String poly)
-    {
-        this.poly = poly;
-    }
-
-    public String getPoly()
-    {
-        return poly;
-    }
-    public void setCenterLng(Double centerLng)
-    {
-        this.centerLng = centerLng;
-    }
-
-    public Double getCenterLng()
-    {
-        return centerLng;
-    }
-    public void setCenterLat(Double centerLat)
-    {
-        this.centerLat = centerLat;
-    }
-
-    public Double getCenterLat()
-    {
-        return centerLat;
-    }
-
-    public Polygon getPolygon() {
-        return polygon;
-    }
-
-    public void setPolygon(Polygon polygon) {
-        this.polygon = polygon;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("defenceName", getDefenceName())
-            .append("poly", getPoly())
-            .append("centerLng", getCenterLng())
-            .append("centerLat", getCenterLat())
-            .append("updateTime", getUpdateTime())
-            .append("createTime", getCreateTime())
-            .append("createBy", getCreateBy())
-            .append("updateBy", getUpdateBy())
-            .toString();
-    }
-}

+ 0 - 146
bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/domain/BdFenceVioEvt.java

@@ -1,146 +0,0 @@
-package com.huashe.park.core.domain;
-
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 围栏闯禁事件对象 bd_fence_vio_evt
- *
- * @author ruoyi
- * @date 2024-10-14
- */
-public class BdFenceVioEvt extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /**  */
-    private Long id;
-
-    /**  */
-    @Excel(name = "")
-    private String evtKey;
-
-    /** 事件类型
-01 围栏闯禁事件 */
-    @Excel(name = "事件类型01 围栏闯禁事件")
-    private String evtType;
-
-    /** 事件描述 */
-    @Excel(name = "事件描述")
-    private String evtDesc;
-
-    /** 经度 */
-    @Excel(name = "经度")
-    private Double lng;
-
-    /** 维度 */
-    @Excel(name = "维度")
-    private Double lat;
-
-    /** 围栏id */
-    @Excel(name = "围栏id")
-    private Long fenceId;
-
-    private String evtStatus;
-
-    private String evtTime;
-
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-
-    public Long getId()
-    {
-        return id;
-    }
-    public void setEvtKey(String evtKey)
-    {
-        this.evtKey = evtKey;
-    }
-
-    public String getEvtKey()
-    {
-        return evtKey;
-    }
-    public void setEvtType(String evtType)
-    {
-        this.evtType = evtType;
-    }
-
-    public String getEvtType()
-    {
-        return evtType;
-    }
-    public void setEvtDesc(String evtDesc)
-    {
-        this.evtDesc = evtDesc;
-    }
-
-    public String getEvtDesc()
-    {
-        return evtDesc;
-    }
-    public void setLng(Double lng)
-    {
-        this.lng = lng;
-    }
-
-    public Double getLng()
-    {
-        return lng;
-    }
-    public void setLat(Double lat)
-    {
-        this.lat = lat;
-    }
-
-    public Double getLat()
-    {
-        return lat;
-    }
-    public void setFenceId(Long fenceId)
-    {
-        this.fenceId = fenceId;
-    }
-
-    public Long getFenceId()
-    {
-        return fenceId;
-    }
-
-    public String getEvtStatus() {
-        return evtStatus;
-    }
-
-    public void setEvtStatus(String evtStatus) {
-        this.evtStatus = evtStatus;
-    }
-
-    public String getEvtTime() {
-        return evtTime;
-    }
-
-    public void setEvtTime(String evtTime) {
-        this.evtTime = evtTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("evtKey", getEvtKey())
-            .append("evtType", getEvtType())
-            .append("evtDesc", getEvtDesc())
-            .append("lng", getLng())
-            .append("lat", getLat())
-            .append("fenceId", getFenceId())
-            .append("updateTime", getUpdateTime())
-            .append("createTime", getCreateTime())
-            .append("createBy", getCreateBy())
-            .append("updateBy", getUpdateBy())
-            .toString();
-    }
-}

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

@@ -0,0 +1,63 @@
+package com.huashe.park.core.mapper;
+
+
+
+import com.huashe.park.domain.entity.BdDevcTrail;
+
+import java.util.List;
+
+/**
+ * 设备轨迹Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-11-07
+ */
+public interface BdDevcTrailMapper {
+    /**
+     * 查询设备轨迹
+     *
+     * @param id 设备轨迹主键
+     * @return 设备轨迹
+     */
+    public BdDevcTrail selectBdDevcTrailById(Long id);
+
+    /**
+     * 查询设备轨迹列表
+     *
+     * @param bdDevcTrail 设备轨迹
+     * @return 设备轨迹集合
+     */
+    public List<BdDevcTrail> selectBdDevcTrailList(BdDevcTrail bdDevcTrail);
+
+    /**
+     * 新增设备轨迹
+     *
+     * @param bdDevcTrail 设备轨迹
+     * @return 结果
+     */
+    public int insertBdDevcTrail(BdDevcTrail bdDevcTrail);
+
+    /**
+     * 修改设备轨迹
+     *
+     * @param bdDevcTrail 设备轨迹
+     * @return 结果
+     */
+    public int updateBdDevcTrail(BdDevcTrail bdDevcTrail);
+
+    /**
+     * 删除设备轨迹
+     *
+     * @param id 设备轨迹主键
+     * @return 结果
+     */
+    public int deleteBdDevcTrailById(Long id);
+
+    /**
+     * 批量删除设备轨迹
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBdDevcTrailByIds(Long[] ids);
+}

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

@@ -1,19 +1,22 @@
 package com.huashe.park.core.mapper;
 
+
+
+
+import com.huashe.park.domain.entity.BdDevcTrailUwb;
+
 import java.util.List;
-import com.huashe.park.core.domain.BdDevcTrailUwb;
 
 /**
  * 室内坐标定位Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2024-10-16
  */
-public interface BdDevcTrailUwbMapper 
-{
+public interface BdDevcTrailUwbMapper {
     /**
      * 查询室内坐标定位
-     * 
+     *
      * @param id 室内坐标定位主键
      * @return 室内坐标定位
      */
@@ -21,7 +24,7 @@ public interface BdDevcTrailUwbMapper
 
     /**
      * 查询室内坐标定位列表
-     * 
+     *
      * @param bdDevcTrailUwb 室内坐标定位
      * @return 室内坐标定位集合
      */
@@ -29,7 +32,7 @@ public interface BdDevcTrailUwbMapper
 
     /**
      * 新增室内坐标定位
-     * 
+     *
      * @param bdDevcTrailUwb 室内坐标定位
      * @return 结果
      */
@@ -37,7 +40,7 @@ public interface BdDevcTrailUwbMapper
 
     /**
      * 修改室内坐标定位
-     * 
+     *
      * @param bdDevcTrailUwb 室内坐标定位
      * @return 结果
      */
@@ -45,7 +48,7 @@ public interface BdDevcTrailUwbMapper
 
     /**
      * 删除室内坐标定位
-     * 
+     *
      * @param id 室内坐标定位主键
      * @return 结果
      */
@@ -53,9 +56,11 @@ public interface BdDevcTrailUwbMapper
 
     /**
      * 批量删除室内坐标定位
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteBdDevcTrailUwbByIds(Long[] ids);
+
+    void saveObjTail(String dt);
 }

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

@@ -1,6 +1,7 @@
 package com.huashe.park.core.mapper;
 
-import com.huashe.park.core.domain.BdFenceInfo;
+
+import com.huashe.park.domain.entity.BdFenceInfo;
 
 import java.util.List;
 

+ 3 - 3
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.park.core.domain.BdFenceVioEvt;
+
+import com.huashe.park.domain.entity.BdFenceVioEvt;
 
 import java.util.List;
 
@@ -10,8 +11,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2024-10-14
  */
-public interface BdFenceVioEvtMapper
-{
+public interface BdFenceVioEvtMapper {
     /**
      * 查询围栏闯禁事件
      *

+ 2 - 2
bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/IBdDevcTrailUwbService.java

@@ -1,8 +1,8 @@
 package com.huashe.park.core.service;
 
-import java.util.List;
+import com.huashe.park.domain.entity.BdDevcTrailUwb;
 
-import com.huashe.park.core.domain.BdDevcTrailUwb;
+import java.util.List;
 
 /**
  * 室内坐标定位Service接口

+ 2 - 1
bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/IBdFenceInfoService.java

@@ -1,6 +1,7 @@
 package com.huashe.park.core.service;
 
-import com.huashe.park.core.domain.BdFenceInfo;
+
+import com.huashe.park.domain.entity.BdFenceInfo;
 
 import java.util.List;
 

+ 2 - 1
bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/IBdFenceVioEvtService.java

@@ -1,6 +1,7 @@
 package com.huashe.park.core.service;
 
-import com.huashe.park.core.domain.BdFenceVioEvt;
+
+import com.huashe.park.domain.entity.BdFenceVioEvt;
 
 import java.util.List;
 

+ 1 - 1
bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/BdDevcTrailUwbServiceImpl.java

@@ -2,9 +2,9 @@ package com.huashe.park.core.service.impl;
 
 import java.util.List;
 
-import com.huashe.park.core.domain.BdDevcTrailUwb;
 import com.huashe.park.core.mapper.BdDevcTrailUwbMapper;
 import com.huashe.park.core.service.IBdDevcTrailUwbService;
+import com.huashe.park.domain.entity.BdDevcTrailUwb;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+ 1 - 1
bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/BdFenceInfoServiceImpl.java

@@ -1,9 +1,9 @@
 package com.huashe.park.core.service.impl;
 
 import com.huashe.park.application.common.geo.GeoUtils;
-import com.huashe.park.core.domain.BdFenceInfo;
 import com.huashe.park.core.mapper.BdFenceInfoMapper;
 import com.huashe.park.core.service.IBdFenceInfoService;
+import com.huashe.park.domain.entity.BdFenceInfo;
 import com.ruoyi.common.utils.DateUtils;
 import org.locationtech.jts.geom.Point;
 import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/BdFenceVioEvtServiceImpl.java

@@ -1,8 +1,8 @@
 package com.huashe.park.core.service.impl;
 
-import com.huashe.park.core.domain.BdFenceVioEvt;
 import com.huashe.park.core.mapper.BdFenceVioEvtMapper;
 import com.huashe.park.core.service.IBdFenceVioEvtService;
+import com.huashe.park.domain.entity.BdFenceVioEvt;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+ 1 - 1
bd-park/park-backend/park-core/src/main/resources/mapper/bd/BdDevcTrailUwbMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.application.bd.mapper.BdDevcTrailUwbMapper">
+<mapper namespace="com.huashe.park.core.mapper.BdDevcTrailUwbMapper">
     
     <resultMap type="BdDevcTrailUwb" id="BdDevcTrailUwbResult">
         <result property="id"    column="id"    />

+ 1 - 1
bd-park/park-backend/park-core/src/main/resources/mapper/bd/BdFenceInfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.application.bd.mapper.BdFenceInfoMapper">
+<mapper namespace="com.huashe.park.core.mapper.BdFenceInfoMapper">
 
     <resultMap type="BdFenceInfo" id="BdFenceInfoResult">
         <result property="id"    column="id"    />

+ 1 - 1
bd-park/park-backend/park-core/src/main/resources/mapper/bd/BdFenceVioEvtMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.application.bd.mapper.BdFenceVioEvtMapper">
+<mapper namespace="com.huashe.park.core.mapper.BdFenceVioEvtMapper">
 
     <resultMap type="BdFenceVioEvt" id="BdFenceVioEvtResult">
         <result property="id" column="id"/>

+ 40 - 0
bd-park/park-backend/park-domain/pom.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.huashe.park</groupId>
+        <artifactId>bd-park</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>park-domain</artifactId>
+    <name>park-domain</name>
+    <version>${park.version}</version>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+        <!-- 阿里JSON解析器 -->
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+        </dependency>
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.huashe.application</groupId>
+            <artifactId>ruoyi-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.locationtech.jts</groupId>
+            <artifactId>jts-core</artifactId>
+        </dependency>
+
+    </dependencies>
+
+
+</project>

+ 48 - 0
bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/dto/UWBAuth.java

@@ -0,0 +1,48 @@
+package com.huashe.park.domain.dto;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+
+public class UWBAuth {
+    @JSONField(name = "token")
+    private String accessToken;
+
+    @JSONField(name = "register")
+    private String register;
+
+    @JSONField(name = "key")
+    private String key;
+
+    private String tagId;
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+
+    public void setAccessToken(String accessToken) {
+        this.accessToken = accessToken;
+    }
+
+    public String getRegister() {
+        return register;
+    }
+
+    public void setRegister(String register) {
+        this.register = register;
+    }
+
+    public void setTagId(String tagId) {
+        this.tagId = tagId;
+    }
+
+    public String getTagId() {
+        return tagId;
+    }
+
+    public String getKey() {
+        return this.register;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+}

+ 83 - 0
bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/BdDevcTrail.java

@@ -0,0 +1,83 @@
+package com.huashe.park.domain.entity;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 设备轨迹对象 bd_devc_trail
+ * 
+ * @author ruoyi
+ * @date 2024-11-07
+ */
+public class BdDevcTrail extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    private Long id;
+
+    /** 设备唯一键 */
+    @Excel(name = "设备唯一键")
+    private String devcKey;
+
+    /**  */
+    @Excel(name = "")
+    private String dt;
+
+    /**  */
+    @Excel(name = "")
+    private String poly;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setDevcKey(String devcKey) 
+    {
+        this.devcKey = devcKey;
+    }
+
+    public String getDevcKey() 
+    {
+        return devcKey;
+    }
+    public void setDt(String dt) 
+    {
+        this.dt = dt;
+    }
+
+    public String getDt() 
+    {
+        return dt;
+    }
+    public void setPoly(String poly) 
+    {
+        this.poly = poly;
+    }
+
+    public String getPoly() 
+    {
+        return poly;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("devcKey", getDevcKey())
+            .append("dt", getDt())
+            .append("poly", getPoly())
+            .append("updateTime", getUpdateTime())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateBy", getUpdateBy())
+            .toString();
+    }
+}

+ 3 - 3
bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/domain/BdDevcTrailUwb.java → bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/BdDevcTrailUwb.java

@@ -1,9 +1,9 @@
-package com.huashe.park.core.domain;
+package com.huashe.park.domain.entity;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 室内坐标定位对象 bd_devc_trail_uwb

+ 142 - 0
bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/BdFenceInfo.java

@@ -0,0 +1,142 @@
+package com.huashe.park.domain.entity;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.locationtech.jts.geom.Polygon;
+
+/**
+ * 围栏基础信息对象 bd_fence_info
+ *
+ * @author ruoyi
+ * @date 2024-10-14
+ */
+public class BdFenceInfo extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    private Long id;
+
+    /**
+     * 围栏名称
+     */
+    @Excel(name = "围栏名称")
+    private String defenceName;
+
+    /**
+     * 围栏图形坐标
+     */
+    private String poly;
+
+    /**
+     * 中心点
+     */
+    @Excel(name = "中心点")
+    private Double centerLng;
+
+    /**
+     * 中心点
+     */
+    @Excel(name = "中心点")
+    private Double centerLat;
+
+    private Polygon polygon;
+
+    private String fenceType;
+
+    private String locationId;
+
+    private Integer altitude;
+
+
+    public String getLocationId() {
+        return locationId;
+    }
+
+    public void setLocationId(String locationId) {
+        this.locationId = locationId;
+    }
+
+    public Integer getAltitude() {
+        return altitude;
+    }
+
+    public void setAltitude(Integer altitude) {
+        this.altitude = altitude;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setDefenceName(String defenceName) {
+        this.defenceName = defenceName;
+    }
+
+    public String getDefenceName() {
+        return defenceName;
+    }
+
+    public void setPoly(String poly) {
+        this.poly = poly;
+    }
+
+    public String getPoly() {
+        return poly;
+    }
+
+    public void setCenterLng(Double centerLng) {
+        this.centerLng = centerLng;
+    }
+
+    public Double getCenterLng() {
+        return centerLng;
+    }
+
+    public void setCenterLat(Double centerLat) {
+        this.centerLat = centerLat;
+    }
+
+    public Double getCenterLat() {
+        return centerLat;
+    }
+
+    public Polygon getPolygon() {
+        return polygon;
+    }
+
+    public void setPolygon(Polygon polygon) {
+        this.polygon = polygon;
+    }
+
+    public String getFenceType() {
+        return fenceType;
+    }
+
+    public void setFenceType(String fenceType) {
+        this.fenceType = fenceType;
+    }
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("defenceName", getDefenceName())
+                .append("poly", getPoly())
+                .append("centerLng", getCenterLng())
+                .append("centerLat", getCenterLat())
+                .append("updateTime", getUpdateTime())
+                .append("createTime", getCreateTime())
+                .append("createBy", getCreateBy())
+                .append("updateBy", getUpdateBy())
+                .toString();
+    }
+}

+ 162 - 0
bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/BdFenceVioEvt.java

@@ -0,0 +1,162 @@
+package com.huashe.park.domain.entity;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 围栏闯禁事件对象 bd_fence_vio_evt
+ *
+ * @author ruoyi
+ * @date 2024-10-14
+ */
+public class BdFenceVioEvt extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    private Long id;
+
+    /**
+     *
+     */
+    @Excel(name = "")
+    private String evtKey;
+
+    /**
+     * 事件类型
+     * 01 围栏闯禁事件
+     */
+    @Excel(name = "事件类型01 围栏闯禁事件")
+    private String evtType;
+
+    /**
+     * 事件描述
+     */
+    @Excel(name = "事件描述")
+    private String evtDesc;
+
+    /**
+     * 经度
+     */
+    @Excel(name = "经度")
+    private Double lng;
+
+    /**
+     * 维度
+     */
+    @Excel(name = "维度")
+    private Double lat;
+
+    /**
+     * 围栏id
+     */
+    @Excel(name = "围栏id")
+    private Long fenceId;
+
+    private String evtStatus;
+
+    private String evtTime;
+
+    private Long locationId;
+
+    public Long getLocationId() {
+        return locationId;
+    }
+
+    public void setLocationId(Long locationId) {
+        this.locationId = locationId;
+    }
+
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setEvtKey(String evtKey) {
+        this.evtKey = evtKey;
+    }
+
+    public String getEvtKey() {
+        return evtKey;
+    }
+
+    public void setEvtType(String evtType) {
+        this.evtType = evtType;
+    }
+
+    public String getEvtType() {
+        return evtType;
+    }
+
+    public void setEvtDesc(String evtDesc) {
+        this.evtDesc = evtDesc;
+    }
+
+    public String getEvtDesc() {
+        return evtDesc;
+    }
+
+    public void setLng(Double lng) {
+        this.lng = lng;
+    }
+
+    public Double getLng() {
+        return lng;
+    }
+
+    public void setLat(Double lat) {
+        this.lat = lat;
+    }
+
+    public Double getLat() {
+        return lat;
+    }
+
+    public void setFenceId(Long fenceId) {
+        this.fenceId = fenceId;
+    }
+
+    public Long getFenceId() {
+        return fenceId;
+    }
+
+    public String getEvtStatus() {
+        return evtStatus;
+    }
+
+    public void setEvtStatus(String evtStatus) {
+        this.evtStatus = evtStatus;
+    }
+
+    public String getEvtTime() {
+        return evtTime;
+    }
+
+    public void setEvtTime(String evtTime) {
+        this.evtTime = evtTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("evtKey", getEvtKey())
+                .append("evtType", getEvtType())
+                .append("evtDesc", getEvtDesc())
+                .append("lng", getLng())
+                .append("lat", getLat())
+                .append("fenceId", getFenceId())
+                .append("updateTime", getUpdateTime())
+                .append("createTime", getCreateTime())
+                .append("createBy", getCreateBy())
+                .append("updateBy", getUpdateBy())
+                .toString();
+    }
+}

+ 20 - 0
bd-park/park-backend/park-infrastructure/pom.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.huashe.park</groupId>
+        <artifactId>bd-park</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>park-infrastructure</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>

+ 10 - 2
bd-park/park-backend/pom.xml

@@ -8,11 +8,13 @@
     <artifactId>bd-park</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    
+
     <modules>
         <module>park-application</module>
-		<module>park-core</module>
+        <module>park-core</module>
         <module>park-common</module>
+        <module>park-infrastructure</module>
+        <module>park-domain</module>
     </modules>
 
     <description>
@@ -42,6 +44,7 @@
         <jts.version>1.18.2</jts.version>
         <mqttstarter.version>2.3.7</mqttstarter.version>
         <math.version>3.6.1</math.version>
+        <park.version>1.0-SNAPSHOT</park.version>
     </properties>
 
     <!-- 依赖声明 -->
@@ -218,6 +221,11 @@
                 <artifactId>commons-math3</artifactId>
                 <version>${math.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.huashe.park</groupId>
+                <artifactId>park-domain</artifactId>
+                <version>${park.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <repositories>