From 0fe686a39af35f1a78fd0a8bb3552d54c3dd1997 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Thu, 14 Dec 2023 11:11:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- sql/{mqtt-schema.sql => init.sql} | 8 -------- src/main/resources/application-dev.yml | 6 +----- src/main/resources/application-prod.yml | 8 ++------ .../com/xydl/mapper/{OperationDb.xml => OperationDB.xml} | 0 5 files changed, 4 insertions(+), 20 deletions(-) rename sql/{mqtt-schema.sql => init.sql} (98%) rename src/main/resources/com/xydl/mapper/{OperationDb.xml => OperationDB.xml} (100%) diff --git a/pom.xml b/pom.xml index e841483..266305f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.xydl mqtt - 1.0-SNAPSHOT + 1.0.0 org.springframework.boot diff --git a/sql/mqtt-schema.sql b/sql/init.sql similarity index 98% rename from sql/mqtt-schema.sql rename to sql/init.sql index 86c6dcf..acf994d 100644 --- a/sql/mqtt-schema.sql +++ b/sql/init.sql @@ -1,9 +1,6 @@ - - -- ---------------------------- -- Table structure for sync_tables_info -- ---------------------------- -DROP TABLE IF EXISTS `sync_tables_info`; CREATE TABLE `sync_tables_info` ( `client_id` int UNSIGNED NOT NULL, `table_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '', @@ -32,7 +29,6 @@ INSERT INTO `sync_tables_info` VALUES (10, 'data_sf6env_h', 'SELECT t2.equipment INSERT INTO `sync_tables_info` VALUES (10, 'data_sf6_h', 'SELECT t2.equipmentid AS SubDeviceID, t2.sensorid,t1.d_time, t1.temp1, t1.md1, t1.pressure1+900, t1.pressure1, t1.pm1, t2.phase FROM `data_sf6_h` AS t1 JOIN i2relation AS t2 ON t1.eqmid=t2.eqmid WHERE t1.eqmid=%%DEVID%% AND t1.d_time>%%KEYVALUE%% ORDER BY t1.d_time LIMIT 1000', 'eqmid', 'sensorid', 'capturetime', 3, '2023-12-13 09:42:12'); -DROP TABLE IF EXISTS `sync_fields_info`; CREATE TABLE `sync_fields_info` ( `id` int UNSIGNED NOT NULL AUTO_INCREMENT, `client_id` int UNSIGNED NOT NULL, @@ -107,7 +103,6 @@ INSERT INTO `sync_fields_info` VALUES (69, 10, 'arrester_assessment_result', 'fu -- ---------------------------- -- Table structure for sync_records -- ---------------------------- -DROP TABLE IF EXISTS `sync_records`; CREATE TABLE `sync_records` ( `client_id` int UNSIGNED NOT NULL, `table_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '', @@ -118,6 +113,3 @@ CREATE TABLE `sync_records` ( PRIMARY KEY (`client_id`, `table_name`, `devid_val`) USING BTREE ); - - - diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 588dfb1..3be8685 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -14,11 +14,7 @@ spring: mybatis: configuration: map-underscore-to-camel-case: true - #mybatis: - #指定mybatis配置文件的位置 - #config-location: classpath:mybatis/mybatis-config.xml - #指定映射文件的位置 -# mapper-locations: classpath:mybatis/mapper/*.xml + mqtt: publish: diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 8af1c4f..428ca4e 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,6 +1,6 @@ #端口号 server: - port: 8099 + port: 8098 #数据源配置 spring: @@ -14,11 +14,7 @@ spring: mybatis: configuration: map-underscore-to-camel-case: true - #mybatis: - #指定mybatis配置文件的位置 - #config-location: classpath:mybatis/mybatis-config.xml - #指定映射文件的位置 -# mapper-locations: classpath:mybatis/mapper/*.xml + mqtt: publish: diff --git a/src/main/resources/com/xydl/mapper/OperationDb.xml b/src/main/resources/com/xydl/mapper/OperationDB.xml similarity index 100% rename from src/main/resources/com/xydl/mapper/OperationDb.xml rename to src/main/resources/com/xydl/mapper/OperationDB.xml