Browse Source

Merge branch 'upstream4-5' into dev-V0.4.5

chenhui 1 year ago
parent
commit
aba262dcb0

+ 9 - 6
README.md

@@ -79,7 +79,7 @@ Vertx event-bus(内置)、RocketMQ,通过扩展模块可接入其它任意
 
 ##### 时序数据库切换为TDengein方法
 
-1、注释掉iot-standalone/pom.xml中的 iot-temporal-serviceImpl-es,并打开iot-td-temporal-service的注释
+1、注释掉iot-starter/pom.xml中的 iot-temporal-serviceImpl-es,并打开iot-td-temporal-service的注释
 
 2、application.xml中注释掉elasticsearch配置,并打开td-datasource配置
 
@@ -90,6 +90,7 @@ Vertx event-bus(内置)、RocketMQ,通过扩展模块可接入其它任意
 2、application.xml中打开rocketmq配置
 
 #### 项目结构
+```
 
 ├data	初始化数据
 │  ├components
@@ -135,6 +136,7 @@ Vertx event-bus(内置)、RocketMQ,通过扩展模块可接入其它任意
 │  ├iot-test-mqtt
 │  ├iot-virtual-device
 
+```
 
 #### 运行步骤
 1、安装jdk11
@@ -145,11 +147,12 @@ Vertx event-bus(内置)、RocketMQ,通过扩展模块可接入其它任意
 
 4、若出现报错,可能是数据没有初始化完或重复初始化,把项目根目录下.init文件和data/iotkit.xx文件删除后重启
 
-在配置好相应的jdk11环境后,推荐使用idea拉取代码,等待项目加载完成以后,先在Terminal里执行mvn clean install,然后在idea的maven操作框上点击下刷新![image-20230702173737805](doc\image-20230702173737805.png)
+在配置好相应的jdk11环境后,推荐使用idea拉取代码,等待项目加载完成以后,先在Terminal里执行mvn clean install,然后在idea的maven操作框上点击下刷新
+![1](doc/image-20230702173737805.png)
 
 然后就点击启动,看到如下所示日志即表示启动成功:
 
-![image-20230702174747305](doc\image-20230702174747305.png)
+![image-20230702174747305](doc/image-20230702174747305.png)
 
 #### 后端常见问题以及处理方式
 
@@ -157,7 +160,7 @@ Vertx event-bus(内置)、RocketMQ,通过扩展模块可接入其它任意
 
 删除以下标红的几个文件以及文件夹后,重复下上面启动项目的操作:
 
-![image-20230702173852342](doc\image-20230702173852342.png)
+![image-20230702173852342](doc/image-20230702173852342.png)
 
 切换成外置中间件数据库时,也注意删除相关库以及数据。
 
@@ -165,7 +168,7 @@ Vertx event-bus(内置)、RocketMQ,通过扩展模块可接入其它任意
 
 在Terminal里执行mvn clean install,再刷新下,这个出现的原因是因为采用了querydsl插件,打包时会生成相关的类,有可能idea的扫描不及时,导致未识别到
 
-![image-20230702173737805](doc\image-20230702173737805.png)
+![111](doc/image-20230702173737805.png)
 
 ##### 3,启动提示xxMapperxxx类bean重复
 
@@ -174,7 +177,7 @@ Vertx event-bus(内置)、RocketMQ,通过扩展模块可接入其它任意
 
 #### 服务器部署
 
-执行maven打包在iot-standalone模块中将打包后的iot-standalone.xx.zip上传到服务器,解压后进入bin目录,执行start.sh或start.bat启动。
+执行maven打包在iot-starter模块中将打包后的iot-starter.xx.zip上传到服务器,解压后进入bin目录,执行start.sh或start.bat启动。
 
 
 #### 文档

+ 18 - 18
iot-common/iot-common-dao/iot-temporal-serviceImpl-ts/src/main/java/cc/iotkit/temporal/ts/service/ThingModelMessageDataImpl.java

@@ -47,7 +47,7 @@ public class ThingModelMessageDataImpl implements IThingModelMessageData {
         Condition whereConditions = field("device_id").eq(deviceId);
         SelectJoinStep<Record9<Object, Object, Object, Object, Object, Object, Object, Object, Object>> step = TableManager.getSqlBuilder().select(field("time"), field("mid"),
                 field("product_key"), field("device_name"), field("type"),
-                field(zhe "identifier"), field("code"), field("data"),
+                field("identifier"), field("code"), field("data"),
                 field("report_time")).from(table);
 
 
@@ -68,11 +68,11 @@ public class ThingModelMessageDataImpl implements IThingModelMessageData {
         Long count = tsTemplate.queryForObject(countSql, Long.class);
 
         return new Paging<>(count, ruleLogs.stream().map(r ->
-                        new ThingModelMessage(r.getTime().toString(), r.getMid(),
-                                deviceId, r.getProductKey(), r.getDeviceName(),
-                                r.getUid(), r.getType(), r.getIdentifier(), r.getCode(),
-                                r.getData(),
-                                r.getTime().getTime(), r.getReportTime()))
+                new ThingModelMessage(r.getTime().toString(), r.getMid(),
+                        deviceId, r.getProductKey(), r.getDeviceName(),
+                        r.getUid(), r.getType(), r.getIdentifier(), r.getCode(),
+                        r.getData(),
+                        r.getTime().getTime(), r.getReportTime()))
                 .collect(Collectors.toList()));
     }
 
@@ -82,11 +82,11 @@ public class ThingModelMessageDataImpl implements IThingModelMessageData {
         Table<Record> table = table("thing_model_message");
 
         Condition con = field("time").greaterOrEqual(new Date(start)).and(field("time").lessOrEqual(new Date(end)));
-        if(StringUtils.isNotBlank(uid)){
+        if (StringUtils.isNotBlank(uid)) {
             con.and(field("uid").eq(uid));
         }
 
-        String sql = TableManager.getSqlBuilder().select(field("date_trunc('hour', \"time\")").as("time"),field("count(*)").as("data"))
+        String sql = TableManager.getSqlBuilder().select(field("date_trunc('hour', \"time\")").as("time"), field("count(*)").as("data"))
                 .from(table).where(con).groupBy(field("date_trunc('hour', \"time\")")).orderBy(field("time").asc()).getSQL(ParamType.INLINED);
 
 
@@ -105,16 +105,16 @@ public class ThingModelMessageDataImpl implements IThingModelMessageData {
         Table<Record> table = table("thing_model_message");
 
         String sql = TableManager.getSqlBuilder().insertInto(table,
-                        field("time"),
-                        field("device_id"),
-                        field("mid"),
-                        field("product_key"),
-                        field("device_name"),
-                        field("uid"),
-                        field("type"),
-                        field("identifier"),
-                        field("code"),
-                        field("data"), field("report_time"))
+                field("time"),
+                field("device_id"),
+                field("mid"),
+                field("product_key"),
+                field("device_name"),
+                field("uid"),
+                field("type"),
+                field("identifier"),
+                field("code"),
+                field("data"), field("report_time"))
                 .values(new Date(msg.getOccurred()), msg.getDeviceId(), msg.getMid(),
                         msg.getProductKey(), msg.getDeviceName(),
                         msg.getUid(), msg.getType(),

+ 1 - 6
iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/OtaService.java

@@ -28,12 +28,7 @@ import java.util.UUID;
 /**
  * @Author: 石恒
  * @Date: 2023/5/19 20:49
- * @Description: oss:
- * region: tb3321.oss-cn-shanghai.aliyuncs.com
- * endpoint: oss-cn-shanghai.aliyuncs.com
- * accessKey: LTAI5tAq5Db5eHt5DTYmXLF4
- * secretKey: bPbHQbeXPSRtyNxxCsw5uRVGJTxNHK
- * buckName: tb3321
+ * @Description:
  */
 @Slf4j
 @Service