From ed54f79983889699d6ed8bf934dc6822deb56016 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Fri, 20 Jun 2025 09:10:53 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entrance/src/main/resources/application.yml | 16 ++++++---------- event_smart/pom.xml | 7 ++++++- .../gather/event/EventSmartApplication.java | 2 ++ .../mapper/PqsEventdetailMapper.java | 4 ++-- .../mapper/RmpEventDetailMapper.java | 4 ++-- .../mq/consumer/EventConsumer.java | 0 .../pojo/po/PqsEventdetailPO.java | 2 +- .../pojo/po/RmpEventDetailPO.java | 2 +- .../websocket/WebSocketConfig.java | 2 +- .../websocket/WebSocketServer.java | 2 +- pom.xml | 17 +++++++++++++++++ 11 files changed, 39 insertions(+), 19 deletions(-) rename event_smart/src/main/java/com/njcn/gather/event/{ => transientes}/mapper/PqsEventdetailMapper.java (62%) rename event_smart/src/main/java/com/njcn/gather/event/{ => transientes}/mapper/RmpEventDetailMapper.java (62%) rename event_smart/src/main/java/com/njcn/gather/event/{ => transientes}/mq/consumer/EventConsumer.java (100%) rename event_smart/src/main/java/com/njcn/gather/event/{ => transientes}/pojo/po/PqsEventdetailPO.java (97%) rename event_smart/src/main/java/com/njcn/gather/event/{ => transientes}/pojo/po/RmpEventDetailPO.java (98%) rename event_smart/src/main/java/com/njcn/gather/event/{ => transientes}/websocket/WebSocketConfig.java (95%) rename event_smart/src/main/java/com/njcn/gather/event/{ => transientes}/websocket/WebSocketServer.java (98%) diff --git a/entrance/src/main/resources/application.yml b/entrance/src/main/resources/application.yml index 55fae0bc..cfb2c96a 100644 --- a/entrance/src/main/resources/application.yml +++ b/entrance/src/main/resources/application.yml @@ -6,12 +6,12 @@ spring: datasource: druid: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.1.24:13306/pqs91003?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=CTT + url: jdbc:mysql://192.168.1.24:13306/pqs91003?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + + #url: jdbc:mysql://localhost:3306/pqs9100?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=CTT username: root + #password: root password: njcnpqs -# url: jdbc:mysql://localhost:3306/pqs91001?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=CTT -# username: root -# password: root #初始化建立物理连接的个数、最小、最大连接数 initial-size: 5 min-idle: 5 @@ -50,16 +50,12 @@ phaseAngle: socket: source: ip: 192.168.1.138 + #ip: localhost port: 62000 device: ip: 192.168.1.138 + #ip: localhost port: 61000 -# source: -# ip: 192.168.1.121 -# port: 10086 -# device: -# ip: 192.168.1.121 -# port: 61000 webSocket: port: 7777 diff --git a/event_smart/pom.xml b/event_smart/pom.xml index f36c5849..20e192b6 100644 --- a/event_smart/pom.xml +++ b/event_smart/pom.xml @@ -57,7 +57,12 @@ 0.0.1 - + + + com.oracle.database.jdbc + ojdbc8 + 21.6.0.0 + diff --git a/event_smart/src/main/java/com/njcn/gather/event/EventSmartApplication.java b/event_smart/src/main/java/com/njcn/gather/event/EventSmartApplication.java index 085b05e2..48b6c3ae 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/EventSmartApplication.java +++ b/event_smart/src/main/java/com/njcn/gather/event/EventSmartApplication.java @@ -1,11 +1,13 @@ package com.njcn.gather.event; import lombok.extern.slf4j.Slf4j; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @Slf4j @SpringBootApplication +@MapperScan("com.njcn.**.mapper") public class EventSmartApplication { public static void main(String[] args) { diff --git a/event_smart/src/main/java/com/njcn/gather/event/mapper/PqsEventdetailMapper.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsEventdetailMapper.java similarity index 62% rename from event_smart/src/main/java/com/njcn/gather/event/mapper/PqsEventdetailMapper.java rename to event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsEventdetailMapper.java index 944c860b..9bb621b3 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/mapper/PqsEventdetailMapper.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/PqsEventdetailMapper.java @@ -1,7 +1,7 @@ -package com.njcn.gather.event.mapper; +package com.njcn.gather.event.transientes.mapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.gather.event.pojo.po.PqsEventdetailPO; +import com.njcn.gather.event.transientes.pojo.po.PqsEventdetailPO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/event_smart/src/main/java/com/njcn/gather/event/mapper/RmpEventDetailMapper.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/RmpEventDetailMapper.java similarity index 62% rename from event_smart/src/main/java/com/njcn/gather/event/mapper/RmpEventDetailMapper.java rename to event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/RmpEventDetailMapper.java index ac069863..38be2f89 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/mapper/RmpEventDetailMapper.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/RmpEventDetailMapper.java @@ -1,7 +1,7 @@ -package com.njcn.gather.event.mapper; +package com.njcn.gather.event.transientes.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.gather.event.pojo.po.RmpEventDetailPO; +import com.njcn.gather.event.transientes.pojo.po.RmpEventDetailPO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/event_smart/src/main/java/com/njcn/gather/event/mq/consumer/EventConsumer.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/mq/consumer/EventConsumer.java similarity index 100% rename from event_smart/src/main/java/com/njcn/gather/event/mq/consumer/EventConsumer.java rename to event_smart/src/main/java/com/njcn/gather/event/transientes/mq/consumer/EventConsumer.java diff --git a/event_smart/src/main/java/com/njcn/gather/event/pojo/po/PqsEventdetailPO.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsEventdetailPO.java similarity index 97% rename from event_smart/src/main/java/com/njcn/gather/event/pojo/po/PqsEventdetailPO.java rename to event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsEventdetailPO.java index 61610806..7c9ba529 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/pojo/po/PqsEventdetailPO.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsEventdetailPO.java @@ -1,4 +1,4 @@ -package com.njcn.gather.event.pojo.po; +package com.njcn.gather.event.transientes.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/event_smart/src/main/java/com/njcn/gather/event/pojo/po/RmpEventDetailPO.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/RmpEventDetailPO.java similarity index 98% rename from event_smart/src/main/java/com/njcn/gather/event/pojo/po/RmpEventDetailPO.java rename to event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/RmpEventDetailPO.java index 15722426..5b52cc88 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/pojo/po/RmpEventDetailPO.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/RmpEventDetailPO.java @@ -1,4 +1,4 @@ -package com.njcn.gather.event.pojo.po; +package com.njcn.gather.event.transientes.pojo.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/event_smart/src/main/java/com/njcn/gather/event/websocket/WebSocketConfig.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/websocket/WebSocketConfig.java similarity index 95% rename from event_smart/src/main/java/com/njcn/gather/event/websocket/WebSocketConfig.java rename to event_smart/src/main/java/com/njcn/gather/event/transientes/websocket/WebSocketConfig.java index 724e390d..5deddc88 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/websocket/WebSocketConfig.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/websocket/WebSocketConfig.java @@ -1,4 +1,4 @@ -package com.njcn.gather.event.websocket; +package com.njcn.gather.event.transientes.websocket; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/event_smart/src/main/java/com/njcn/gather/event/websocket/WebSocketServer.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/websocket/WebSocketServer.java similarity index 98% rename from event_smart/src/main/java/com/njcn/gather/event/websocket/WebSocketServer.java rename to event_smart/src/main/java/com/njcn/gather/event/transientes/websocket/WebSocketServer.java index e04db784..d81f3c8c 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/websocket/WebSocketServer.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/websocket/WebSocketServer.java @@ -1,4 +1,4 @@ -package com.njcn.gather.event.websocket; +package com.njcn.gather.event.transientes.websocket; import lombok.extern.slf4j.Slf4j; diff --git a/pom.xml b/pom.xml index 087a5c42..a863b3a1 100644 --- a/pom.xml +++ b/pom.xml @@ -13,6 +13,7 @@ user detection storage + event_smart pom 融合各工具的项目 @@ -29,6 +30,22 @@ + + 2.3.12.RELEASE + + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + +