diff --git a/data-storage/src/main/java/com/huaxing/IotDataBridgeApplication.java b/data-storage/src/main/java/com/huaxing/IotDataBridgeApplication.java index 1aaf980..ebebd9e 100644 --- a/data-storage/src/main/java/com/huaxing/IotDataBridgeApplication.java +++ b/data-storage/src/main/java/com/huaxing/IotDataBridgeApplication.java @@ -1,16 +1,21 @@ package com.huaxing; -import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.ComponentScan; @SpringBootApplication public class IotDataBridgeApplication { public static void main(String[] args) { SpringApplication.run(IotDataBridgeApplication.class, args); - System.out.println("================= iot-data-bridge started! ================="); + String banner = + "===========================================\n" + + " 中联创信低碳科技有限公司 \n" + + " http://localhost:8088 \n" + + " iot-data-bridge started! \n" + + "===========================================\n"; + System.out.println(banner); + } } diff --git a/data-storage/src/main/java/com/huaxing/data/tablemanagement/service/ITableTemplateService.java b/data-storage/src/main/java/com/huaxing/data/tablemanagement/service/ITableTemplateService.java new file mode 100644 index 0000000..922e81d --- /dev/null +++ b/data-storage/src/main/java/com/huaxing/data/tablemanagement/service/ITableTemplateService.java @@ -0,0 +1,21 @@ +package com.huaxing.data.tablemanagement.service; + +/** + * 表创建模板 + * @author 孟剑 + * @date 2025-01-20 10:32 + */ +public interface ITableTemplateService { + + // 创建dfs表模板 + String createDfsTableTemplate(String tableName, String columnName, String columnDefinition); + + // 创建流表模板 + String createStreamTableTemplate(String tableName, String columnName, String columnDefinition); + + // 取消订阅流表模板 + String unsubscribeStreamTableTemplate(String tableName, String columnName, String columnDefinition); + + // 订阅流表模板 + String subscribeStreamTableTemplate(String tableName, String columnName, String columnDefinition); +} diff --git a/data-storage/src/main/java/com/huaxing/data/tablemanagement/service/impl/TableTemplateServiceImpl.java b/data-storage/src/main/java/com/huaxing/data/tablemanagement/service/impl/TableTemplateServiceImpl.java new file mode 100644 index 0000000..4c1e0f0 --- /dev/null +++ b/data-storage/src/main/java/com/huaxing/data/tablemanagement/service/impl/TableTemplateServiceImpl.java @@ -0,0 +1,61 @@ +package com.huaxing.data.tablemanagement.service.impl; + +import com.huaxing.data.tablemanagement.service.ITableTemplateService; + +/** + * @ProjectName: data-bridge + * @Package: com.huaxing.data.tablemanagement.service.impl + * @ClassName: TableTemplateServiceImpl + * @Author: swordmeng8@163.com + * @Description: 表操作模板 + * @Date: 2025/1/20 10:38 + * @Version: 1.0 + */ + +public class TableTemplateServiceImpl implements ITableTemplateService { + + /** + * @Description 创建 DFS 表模板 + * @Author swordmeng8@163.com + * @Date 2025/1/20 10:46 + * @Version v1.0 + **/ + @Override + public String createDfsTableTemplate(String tableName, String columnName, String columnDefinition) { + + return null; + } + + /** + * @Description 创建流表模板 + * @Author swordmeng8@163.com + * @Date 2025/1/20 10:46 + * @Version v1.0 + **/ + @Override + public String createStreamTableTemplate(String tableName, String columnName, String columnDefinition) { + return null; + } + + /** + * @Description 取消订阅流表模板 + * @Author swordmeng8@163.com + * @Date 2025/1/20 10:46 + * @Version v1.0 + **/ + @Override + public String unsubscribeStreamTableTemplate(String tableName, String columnName, String columnDefinition) { + return null; + } + + /** + * @Description 订阅流表模板 + * @Author swordmeng8@163.com + * @Date 2025/1/20 10:46 + * @Version v1.0 + **/ + @Override + public String subscribeStreamTableTemplate(String tableName, String columnName, String columnDefinition) { + return null; + } +} diff --git a/data-storage/src/main/java/com/huaxing/data/storage/controller/TestController.java b/data-storage/src/main/java/com/huaxing/data/test/controller/TestController.java similarity index 83% rename from data-storage/src/main/java/com/huaxing/data/storage/controller/TestController.java rename to data-storage/src/main/java/com/huaxing/data/test/controller/TestController.java index 82a9e3e..cb3f316 100644 --- a/data-storage/src/main/java/com/huaxing/data/storage/controller/TestController.java +++ b/data-storage/src/main/java/com/huaxing/data/test/controller/TestController.java @@ -1,4 +1,4 @@ -package com.huaxing.data.storage.controller; +package com.huaxing.data.test.controller; import com.huaxing.data.storage.domain.DataAnalysisDTO; import com.huaxing.data.storage.service.IDeviceDataQueryDfsService; @@ -49,7 +49,8 @@ public class TestController { this.tableStructureService = tableStructureService; } - // 测试插入数据 + + // =============================================== 测试插入数据 ====================================== @GetMapping(value = "/testInsert") // 成功 public void testInsert() { String sql = "INSERT INTO ZbWaterMeter1Stream (time, projectId, deviceId, WM_WFA, WM_WFA_Unit) VALUES (2024.11.01 00:00:00,'48', '0jZU2102_0806_0011', 124.656, 'm³')"; @@ -57,7 +58,7 @@ public class TestController { log.info("SUCCESS"); } - // 测试Dfs表查询 + // =============================================== 测试Dfs表查询 ====================================== @GetMapping(value = "/testSelectDfs") public List> testSelectDfs() { String dbPath = "dfs://ZbDB"; @@ -65,15 +66,14 @@ public class TestController { return dataQueryDfsService.selectList(sql); } - // 测试订阅流表查询 + // =============================================== 测试订阅流表查询 ====================================== @GetMapping(value = "/testSelectStream") public List> testSelectStream() { String sql = "select * from ZbWaterMeter1Stream"; return dataQueryStreamService.selectList(sql); } - - // 给指定的流表增加列字段 + // =============================================== 给指定的流表增加列字段 ====================================== @GetMapping(value = "/testStreamAddColumn") public void testStreamAddColumn() { String tableName = "ZbWaterMeter1Stream"; @@ -88,6 +88,7 @@ public class TestController { } } + // =============================================== 给指定的Dfs表增加列字段 ====================================== @GetMapping(value = "/testDfsAddColumn") public void testDfsAddColumn() { String tableName = "ZbWaterMeter1Dfs"; @@ -103,7 +104,7 @@ public class TestController { } - // 向消息队列中发送100W条数据 + // ===================================== mqtt消息发送-测试数据入库 START ============================== @GetMapping(value = "/testSendMessage") public void testSendMessage() { for (int i = 0; i < 2; i++) { @@ -124,6 +125,8 @@ public class TestController { return map; } + // =============================================== 创建Dfs表 Stream流表 创建 ====================================== + diff --git a/data-storage/src/main/resources/banner.txt b/data-storage/src/main/resources/banner.txt new file mode 100644 index 0000000..6b056d1 --- /dev/null +++ b/data-storage/src/main/resources/banner.txt @@ -0,0 +1,8 @@ + ________ ________ _________ ________ ________ _________ ________ ________ ________ ________ _______ +|\ ___ \|\ __ \|\___ ___\\ __ \ |\ ____\|\___ ___\\ __ \|\ __ \|\ __ \|\ ____\|\ ___ \ +\ \ \_|\ \ \ \|\ \|___ \ \_\ \ \|\ \ ____________\ \ \___|\|___ \ \_\ \ \|\ \ \ \|\ \ \ \|\ \ \ \___|\ \ __/| + \ \ \ \\ \ \ __ \ \ \ \ \ \ __ \|\____________\ \_____ \ \ \ \ \ \ \\\ \ \ _ _\ \ __ \ \ \ __\ \ \_|/__ + \ \ \_\\ \ \ \ \ \ \ \ \ \ \ \ \ \|____________|\|____|\ \ \ \ \ \ \ \\\ \ \ \\ \\ \ \ \ \ \ \|\ \ \ \_|\ \ + \ \_______\ \__\ \__\ \ \__\ \ \__\ \__\ ____\_\ \ \ \__\ \ \_______\ \__\\ _\\ \__\ \__\ \_______\ \_______\ + \|_______|\|__|\|__| \|__| \|__|\|__| |\_________\ \|__| \|_______|\|__|\|__|\|__|\|__|\|_______|\|_______| + \|_________| diff --git a/data-storage/src/main/resources/补水箱.script b/data-storage/src/main/resources/补水箱.script index 7f27abe..c4d9d98 100644 --- a/data-storage/src/main/resources/补水箱.script +++ b/data-storage/src/main/resources/补水箱.script @@ -63,9 +63,11 @@ def createPT(dbPath,ptName){ //createDB(dbPath) //创建分区表 createPT(dbPath,ptName) -//创建流表 +// 取消订阅流表 unsubscribeTable(tableName=stName, actionName=`WaterMeterTsetChgTime) +// 删除流表 // dropStreamTable(stName) +//创建流表 createST(stName) //订阅流表 subscribeTable(tableName=stName, actionName=`WaterMeterTsetChgTime, offset=-1, handler=loadTable(dbPath,ptName), msgAsTable=true) \ No newline at end of file