Merge remote-tracking branch 'origin/master' into mssw

msss-gis/src/main/resources/bootstrap.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: test
+    active: pro

msss-gis/src/main/resources/mapper/custom/NewHotlineMapper.xml

@@ -230,7 +230,7 @@
         nvl(sum(QTLJ),0) + nvl(sum(XXSJ),0) + nvl(sum(XXQR),0) gtnl,
         nvl(sum(DHJQ),0) + nvl(sum(LCGF),0) zxnl,
         round(
-        sum(PF_FZ) / nullif(count(*),0),2) avg
+        sum(PF_FZ) / ifnull(count(*),0),2) avg
         from TF_YWPN_PFRECORD_W p
         where PF_TYPE = 2
         <choose>
@@ -852,7 +852,7 @@
         as hf_num,
         round((
         <include refid="zz_count_rx"/>
-        / nullif(<include refid="jd_count_rx"/>,0) * 100),2)
+        / ifnull(<include refid="jd_count_rx"/>,0) * 100),2)
         as rate,
         gdlx
         from TF_YWPN_GDINFO_W i
@@ -1359,7 +1359,7 @@
         as hf_num,
         round((
         <include refid="zz_count_rx"/>
-        / (nullif(<include refid="jd_count"/>,0) * 100)),2)
+        / (ifnull(<include refid="jd_count"/>,0) * 100)),2)
         as rate,
         gdlx,
         <include refid="idea_count">
@@ -1386,7 +1386,7 @@
         <include refid="idea_count">
             <property name="pass" value="3"/>
         </include>
-        ) / (nullif(<include refid="hf_count"/>,0)) * 100),2) hfmyl,
+        ) / (ifnull(<include refid="hf_count"/>,0)) * 100),2) hfmyl,
 
         round((((
         (
@@ -1410,7 +1410,7 @@
             <property name="pass" value="0"/>
         </include>
         * 50)
-        ) / (nullif(<include refid="hf_count"/>,0) * 100)),2) mydzs
+        ) / (ifnull(<include refid="hf_count"/>,0) * 100)),2) mydzs
         from TF_YWPN_GDINFO_W i
         where is_rxlx = 1
         <choose>
@@ -1503,7 +1503,7 @@
             <property name="pass" value="0"/>
         </include>
         * 50)
-        ) / (nullif(<include refid="hf_count"/>,0) * 100)),2) mydzs
+        ) / (ifnull(<include refid="hf_count"/>,0) * 100)),2) mydzs
         from TF_YWPN_GDINFO_W i
         where is_rxlx = 1
         <choose>
@@ -2006,7 +2006,7 @@
         wzj_num,
         sum_num,
         DJBM,
-        round((yzj_num / nullif(sum_num,0)) * 100,2) rate
+        round((yzj_num / ifnull(sum_num,0)) * 100,2) rate
         from (select DJRY,DJBM,
         (select USERNAME from TF_MSSS_UDB.TF_SMPN_USER_X where id = DJRY) account,
         (select REAL_NAME from TF_MSSS_UDB.TF_SMPN_USER_X where id = DJRY) name,
@@ -2023,7 +2023,7 @@
         <if test="dto.user != null and dto.user != ''">
             and djry = #{dto.user}
         </if>
-        group by DJRY,DJBM)
+        group by DJRY,DJBM) x
     </select>
     <select id="qualityCount" resultType="map" databaseId="mysql">
         select DJRY,
@@ -2033,7 +2033,7 @@
         wzj_num,
         sum_num,
         DJBM,
-        round((yzj_num / nullif(sum_num,0)) * 100,2) rate
+        round((yzj_num / ifnull(sum_num,0)) * 100,2) rate
         from (select DJRY,DJBM,
         (select USERNAME from TF_MSSS_UDB.TF_SMPN_USER_X where id = DJRY) account,
         (select REAL_NAME from TF_MSSS_UDB.TF_SMPN_USER_X where id = DJRY) name,
@@ -2050,7 +2050,7 @@
         <if test="dto.user != null and dto.user != ''">
             and djry = #{dto.user}
         </if>
-        group by DJRY,DJBM)
+        group by DJRY,DJBM) x
     </select>
 
 </mapper>

msss-scada/src/main/resources/bootstrap-mqtt.yml

@@ -0,0 +1,46 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        # nacos配置中心指定空间
+        namespace: tf_msss
+        # nacos部署IP
+        server-addr: 172.16.0.3:8848
+        # 配置后缀
+        file-extension: yaml
+        # 分组
+        #其他配置信息
+        shared-configs[0]:
+          dataId: public_config_public.yaml
+        shared-configs[1]:
+          dataId: public_config_ftp.yaml
+        shared-configs[2]:
+          dataId: public_config_redis.yaml
+      discovery:
+        # nacos配置中心指定空间
+        namespace: tf_msss
+        # nacos部署IP
+        server-addr: 172.16.0.3:8848
+  application:
+    # 该应用在nacos配置中的名称
+    name: tofly-scada
+logging:
+  level:
+    com.alibaba.nacos.client.config.impl: WARN
+
+  # --------------mqtt配置-----------------------------
+  # 默认接受消息的主题--指定多个多级主题【物联网数据主题、对话主题-聊天室】
+mqtt:
+  receiver:
+    defaultTopic: receive_iot_topic/#,receive_chat_topic/#
+    # mqtt接收者的id-随机id来拼串
+    clientId: ${random:value}
+  # 默认发送消息的主题
+  sender:
+    defaultTopic: test_send
+  # mqtt发送者的id
+    clientId: mqttProducer
+  # 地址和用户名密码
+  url: tcp://192.168.2.238:1883
+  username: guest
+  password: guest