+ 隔离bd业务表模型

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/engine/EvtFusionEngine.java

@@ -59,13 +59,11 @@ public abstract class EvtFusionEngine implements IFusionEngine {
             threadPoolTaskExecutor.execute(() -> {
                 while (true) {
                     try {
-                        logger.info("{} is running", this.engineName);
                         JSONObject msg = queue.get(finalI).take();
                         LocationInfo locationInfoNew = new LocationInfo(msg.getDouble("latitude"),
                             msg.getDouble("longitude"), msg.getLong("srcTimestamp"));
                         locationInfoNew.setMsg(msg);
                         String key = getKey(locationInfoNew);
-                        logger.info("{} is running {}", this.engineName, key);
                         if (!redisService.hasKey(key)) {
                             getBizId(locationInfoNew);
                             redisService.setCacheObject(key, locationInfoNew);
@@ -98,9 +96,6 @@ public abstract class EvtFusionEngine implements IFusionEngine {
                             break;
                         }
                     }
-                    catch (Exception e) {
-                        logger.error("{} error", this.engineName, e);
-                    }
                 }
             });
         }

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/engine/impl/VideoTrailEngine.java

@@ -123,8 +123,6 @@ public class VideoTrailEngine extends EvtFusionEngine {
         for (VideoFence fenceInfo : cacheList) {
             polygon = GeoUtils.getPolygon(fenceInfo.getPoly());
             String tagId = properties.getString("tag_id");
-            logger.info("?>>>>>fence bool size: {}",
-                GeoUtils.isPointInGeoFence(polygon, properties.getString("pos_x"), properties.getString("pos_y")));
             if (GeoUtils.isPointInGeoFence(polygon, properties.getString("pos_x"), properties.getString("pos_y"))) {
                 location = new JSONObject();
                 location.put("fenceId", fenceInfo.getId());

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/mqtt/UWBLocationListener.java

@@ -1,5 +1,7 @@
 package com.huashe.park.application.mqtt;
 
+import javax.annotation.PostConstruct;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,8 +20,6 @@ import net.dreamlu.iot.mqtt.spring.client.MqttClientSubscribe;
 import net.dreamlu.iot.mqtt.spring.client.event.MqttConnectedEvent;
 import net.dreamlu.iot.mqtt.spring.client.event.MqttDisconnectEvent;
 
-import javax.annotation.PostConstruct;
-
 @Service
 @ConditionalOnBean(MqttCfg.class)
 public class UWBLocationListener {
@@ -53,6 +53,5 @@ public class UWBLocationListener {
     @MqttClientSubscribe(value = BDConst.MQTT_TOPIC.UWB_VIDEO_TRACE_POINT_TOPIC, qos = MqttQoS.QOS0)
     public void subQos1(String topic, byte[] payload) {
         videoTrailEngine.trailTag(JSON.parseObject(payload));
-        logger.debug("topic:{} payload:{}", topic, JSON.parseObject(payload));
     }
 }

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

@@ -28,7 +28,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://172.192.10.105:30002/hs_bds?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://172.192.10.105:30002/ems_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
         password: root
       # 从库数据源

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/BdDevcTrailServiceImpl.java

@@ -1,6 +1,8 @@
 package com.huashe.park.core.service.impl;
 
 
+import com.huashe.common.annotation.DataSource;
+import com.huashe.common.enums.DataSourceType;
 import com.huashe.park.core.mapper.BdDevcTrailMapper;
 import com.huashe.park.core.service.IBdDevcTrailService;
 import com.huashe.park.domain.entity.BdDevcTrail;
@@ -16,6 +18,7 @@ import java.util.List;
  * @date 2024-11-07
  */
 @Service
+@DataSource(DataSourceType.PKB)
 public class BdDevcTrailServiceImpl implements IBdDevcTrailService
 {
     @Autowired

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

@@ -1,5 +1,7 @@
 package com.huashe.park.core.service.impl;
 
+import com.huashe.common.annotation.DataSource;
+import com.huashe.common.enums.DataSourceType;
 import com.huashe.park.common.DateTimeUtil;
 import com.huashe.park.core.mapper.BdDevcTrailUwbMapper;
 import com.huashe.park.core.service.IBdDevcTrailUwbService;
@@ -19,6 +21,7 @@ import java.util.Map;
  * @date 2024-10-16
  */
 @Service
+@DataSource(DataSourceType.PKB)
 public class BdDevcTrailUwbServiceImpl implements IBdDevcTrailUwbService {
     @Autowired
     private BdDevcTrailUwbMapper bdDevcTrailUwbMapper;

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

@@ -1,6 +1,8 @@
 package com.huashe.park.core.service.impl;
 
 
+import com.huashe.common.annotation.DataSource;
+import com.huashe.common.enums.DataSourceType;
 import com.huashe.park.core.mapper.BdFenceVioEvtMapper;
 import com.huashe.park.core.service.IBdFenceVioEvtService;
 import com.huashe.park.domain.entity.BdFenceVioEvt;
@@ -16,6 +18,7 @@ import java.util.List;
  * @date 2024-10-14
  */
 @Service
+@DataSource(DataSourceType.PKB)
 public class BdFenceVioEvtServiceImpl implements IBdFenceVioEvtService
 {
     @Autowired

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/ParkAttendGroupServiceImpl.java

@@ -1,5 +1,7 @@
 package com.huashe.park.core.service.impl;
 
+import com.huashe.common.annotation.DataSource;
+import com.huashe.common.enums.DataSourceType;
 import com.huashe.park.core.mapper.ParkAttendGroupMapper;
 import com.huashe.park.core.service.IParkAttendGroupService;
 import com.huashe.park.domain.entity.ParkAttendGroup;
@@ -15,6 +17,7 @@ import java.util.List;
  * @date 2025-01-08
  */
 @Service
+@DataSource(DataSourceType.PKB)
 public class ParkAttendGroupServiceImpl implements IParkAttendGroupService {
     @Autowired
     private ParkAttendGroupMapper parkAttendGroupMapper;

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/ParkAttendGroupUsrServiceImpl.java

@@ -1,5 +1,7 @@
 package com.huashe.park.core.service.impl;
 
+import com.huashe.common.annotation.DataSource;
+import com.huashe.common.enums.DataSourceType;
 import com.huashe.park.core.mapper.ParkAttendGroupUsrMapper;
 import com.huashe.park.core.service.IParkAttendGroupUsrService;
 import com.huashe.park.domain.entity.ParkAttendGroupUsr;
@@ -15,6 +17,7 @@ import java.util.List;
  * @date 2025-01-08
  */
 @Service
+@DataSource(DataSourceType.PKB)
 public class ParkAttendGroupUsrServiceImpl implements IParkAttendGroupUsrService {
     @Autowired
     private ParkAttendGroupUsrMapper parkAttendGroupUsrMapper;

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/ParkAttendUsrDetailServiceImpl.java

@@ -2,6 +2,8 @@ package com.huashe.park.core.service.impl;
 
 import java.util.List;
 
+import com.huashe.common.annotation.DataSource;
+import com.huashe.common.enums.DataSourceType;
 import com.huashe.park.core.mapper.ParkAttendUsrDetailMapper;
 import com.huashe.park.core.service.IParkAttendUsrDetailService;
 import com.huashe.park.domain.entity.ParkAttendUsrDetail;
@@ -15,6 +17,7 @@ import org.springframework.stereotype.Service;
  * @date 2025-01-08
  */
 @Service
+@DataSource(DataSourceType.PKB)
 public class ParkAttendUsrDetailServiceImpl implements IParkAttendUsrDetailService {
     @Autowired
     private ParkAttendUsrDetailMapper parkAttendUsrDetailMapper;

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/ParkInspectProjServiceImpl.java

@@ -2,6 +2,8 @@ package com.huashe.park.core.service.impl;
 
 import java.util.List;
 
+import com.huashe.common.annotation.DataSource;
+import com.huashe.common.enums.DataSourceType;
 import com.huashe.park.core.mapper.ParkInspectProjMapper;
 import com.huashe.park.core.service.IParkInspectProjService;
 import com.huashe.park.domain.entity.ParkInspectProj;
@@ -15,6 +17,7 @@ import org.springframework.stereotype.Service;
  * @date 2025-01-06
  */
 @Service
+@DataSource(DataSourceType.PKB)
 public class ParkInspectProjServiceImpl implements IParkInspectProjService
 {
     @Autowired

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/ParkInspectTaskServiceImpl.java

@@ -2,6 +2,8 @@ package com.huashe.park.core.service.impl;
 
 import java.util.List;
 
+import com.huashe.common.annotation.DataSource;
+import com.huashe.common.enums.DataSourceType;
 import com.huashe.park.core.mapper.ParkInspectTaskMapper;
 import com.huashe.park.core.service.IParkInspectTaskService;
 import com.huashe.park.domain.entity.ParkInspectTask;
@@ -15,6 +17,7 @@ import org.springframework.stereotype.Service;
  * @date 2025-01-07
  */
 @Service
+@DataSource(DataSourceType.PKB)
 public class ParkInspectTaskServiceImpl implements IParkInspectTaskService {
     @Autowired
     private ParkInspectTaskMapper parkInspectTaskMapper;

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/ParkInspectTaskUsrTrailServiceImpl.java

@@ -1,5 +1,7 @@
 package com.huashe.park.core.service.impl;
 
+import com.huashe.common.annotation.DataSource;
+import com.huashe.common.enums.DataSourceType;
 import com.huashe.park.core.mapper.ParkInspectTaskUsrTrailMapper;
 import com.huashe.park.core.service.IParkInspectTaskUsrTrailService;
 import com.huashe.park.domain.entity.ParkInspectTaskUsrTrail;
@@ -15,6 +17,7 @@ import java.util.List;
  * @date 2025-01-07
  */
 @Service
+@DataSource(DataSourceType.PKB)
 public class ParkInspectTaskUsrTrailServiceImpl implements IParkInspectTaskUsrTrailService {
     @Autowired
     private ParkInspectTaskUsrTrailMapper parkInspectTaskUsrTrailMapper;