Merge branch 'master' of http://39.105.213.67:3000/hwj_system/psdc

psdc-admin/src/main/resources/application-prod.yml

@@ -54,9 +54,9 @@ spring:
     # 数据库驱动
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
-    url: jdbc:mysql://127.0.0.1:3306/psdc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://127.0.0.1:3308/psdc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true
     username: root
-    password: 123456
+    password: root
   messages:
     # 国际化资源文件路径
     basename: i18n/messages

psdc-admin/src/main/resources/application.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: dev
+    active: prod

psdc-business/src/main/java/com/psdc/mqtt/MyMQTTCallback.java

@@ -83,7 +83,7 @@ public class MyMQTTCallback implements MqttCallback {
                 log.info("实时数据，开始入库!");
                 // 更新实时数据，历史数据
                 dataAndPowerSaveBean.saveDevRtData(jsonObject);
-            } else if ("resulta".equals(str)) {
+            } else if ("result".equals(str)) {
                 log.info("控制结果数据，开始入库！");
                 controlResultSave.saveDevRtData(jsonObject);
             }