+ 上海测试

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

@@ -39,8 +39,8 @@ spring:
         username:
         password:
       # 初始连接数
-      initialSize: 5
-      # 最小连接池数量
+      initialSiz
+
       minIdle: 10
       # 最大连接池数量
       maxActive: 20

bd-park/park-backend/park-collect/src/main/resources/application-pre.yml

@@ -0,0 +1,93 @@
+## MQTT##
+aliyun:
+  mqtt:
+    uri: tcp://8.219.137.9:1883
+
+
+# 数据源配置
+spring:
+  # redis 配置
+  redis:
+    # 地址
+    host: 127.0.0.1
+    # 端口，默认为6379
+    port: 16379
+    # 数据库索引
+    database: 1
+    # 密码
+    password:
+    # 连接超时时间
+    timeout: 10s
+    lettuce:
+      pool:
+        # 连接池中的最小空闲连接
+        min-idle: 0
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池的最大数据库连接数
+        max-active: 8
+        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: 3s
+  cache:
+    cache-names:
+      - pileHoleList
+      - pileMachineList
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: com.mysql.cj.jdbc.Driver
+    druid:
+      # 主库数据源
+      master:
+        url: jdbc:mysql://127.0.0.1:3306/hs_bds?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: root
+        password: 123456
+      # 从库数据源
+      pkb:
+        # 从数据源开关/默认关闭
+        enabled: true
+        url: jdbc:mysql://127.0.0.1:3306/hs_bds?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: root
+        password: 123456
+      # 初始连接数
+      initialSize: 5
+      # 最小连接池数量
+      minIdle: 10
+      # 最大连接池数量
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置连接超时时间
+      connectTimeout: 30000
+      # 配置网络超时时间
+      socketTimeout: 60000
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      # 配置一个连接在池中最大生存的时间，单位是毫秒
+      maxEvictableIdleTimeMillis: 900000
+      # 配置检测连接是否有效
+      validationQuery: SELECT 1 FROM DUAL
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: true
+        # 设置白名单，不填则允许所有访问
+        allow:
+        url-pattern: /druid/*
+        # 控制台管理用户名和密码
+        login-username: ruoyi
+        login-password: 123456
+      filter:
+        stat:
+          enabled: true
+          # 慢SQL记录
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true

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

@@ -3,7 +3,7 @@ spring:
   application:
     name: ems-collect
   profiles:
-    active: locale
+    active: pre
     include:
       - topic
       - schedule

bd-park/park-backend/park-collect/src/test/java/com/huashe/park/collect/controller/TopicControllerTest.java

@@ -54,7 +54,7 @@ class TopicControllerTest {
                 try {
                     Thread.sleep(1000);
                     machineProcess.setId(null);
-                    machineProcess.setPileId("talv1qmq");
+                    machineProcess.setPileId("6qgonb40");
                     machineProcess.setMachineId("wi4mdee7");
                     machineProcess.setDataTime(System.currentTimeMillis());
                     machineProcess.setUuid(Long.toString(System.currentTimeMillis()));
@@ -62,8 +62,8 @@ class TopicControllerTest {
                         latch.countDown(); // 发送信号（计数减1）
                     }
                     bytes = ByteArrayUtil.serializeObject(machineProcess);
-                    mqttTemplate.sendByte("/gl41DkJLD3N/123457", "/gl41DkJLD3N/123457/machine/piling/process", bytes, 0,
-                        false);
+                    mqttTemplate.sendByte("110DS98412300212/TEST002", "110DS98412300212/TEST002/machine/piling/process",
+                        bytes, 0, false);
 
                 }
                 catch (Exception e) {
@@ -82,17 +82,17 @@ class TopicControllerTest {
                 machineProcessResults.forEach(result -> {
                     byte[] bytes;
                     try {
+                        System.out.println(">>>>>>>>>>>>>>>>>" + result.getId());
                         result.setId(null);
-                        result.setPileId("talv1qmq");
-
+                        result.setPileId("6qgonb40");
                         result.setMachineId("wi4mdee7");
                         result.setDataTime(System.currentTimeMillis());
                         result.setStartTime(l);
                         result.setEndTime(System.currentTimeMillis());
                         result.setUuid(Long.toString(System.currentTimeMillis()));
                         bytes = ByteArrayUtil.serializeObject(result);
-                        mqttTemplate.sendByte("/gl41DkJLD3N/123457", "/gl41DkJLD3N/123457/machine/piling/result", bytes,
-                            0, false);
+                        mqttTemplate.sendByte("110DS98412300212/TEST002",
+                            "110DS98412300212/TEST002/machine/piling/result", bytes, 0, false);
                     }
                     catch (Exception e) {
                         throw new RuntimeException(e);

bd-park/park-backend/park-core/src/main/resources/mapper/cons/MachineProcessResultMapper.xml

@@ -141,6 +141,7 @@
             <if test="sendEndTime != null">and send_end_time = #{sendEndTime}</if>
             <if test="pullingStartTime != null">and pulling_start_time = #{pullingStartTime}</if>
             <if test="pullingEndTime != null">and pulling_end_time = #{pullingEndTime}</if>
+            <if test="pileId !=null">and pile_id = #{pileId}</if>
         </where>
     </select>