tjf 6 dienas atpakaļ
vecāks
revīzija
99b849aa23

+ 2 - 2
ruoyi-admin/src/main/resources/application.yml

@@ -77,8 +77,8 @@ xss:
 # MQTT配置
 mqtt:
 #  server-uri: tcp://13.229.167.76:1883
-#  server-uri: tcp://60.171.161.56:20009
-  server-uri: tcp://127.0.0.1:1883
+  server-uri: tcp://60.171.161.56:20009
+#  server-uri: tcp://127.0.0.1:1883
 #  server-uri: tcp://192.168.101.147:1883
 #  server-uri: tcp://127.0.0.1:1883
   client-id: JavaClientBoMan

+ 1 - 0
ruoyi-system/src/main/resources/mapper/manage/ChannelNumberMapper.xml

@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="protocolType != null  and protocolType != ''"> and protocol_type = #{protocolType}</if>
             <if test="channelDetails != null  and channelDetails != ''"> and channel_details = #{channelDetails}</if>
         </where>
+        order by create_time DESC
     </select>
     
     <select id="selectChannelNumberByChannelId" parameterType="ChannelNumber" resultMap="ChannelNumberResult">

+ 1 - 0
ruoyi-system/src/main/resources/mapper/manage/EquipmentManageMapper.xml

@@ -62,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null  "> and dept_id = #{deptId}</if>
             <if test="deptName != null  and deptName != ''"> and dept_name = #{deptName}</if>
         </where>
+        order by create_time DESC
     </select>
 
     <select id="selectEquipmentManageByEquipmentIp" parameterType="EquipmentManage" resultMap="EquipmentManageResult">

+ 1 - 0
ruoyi-system/src/main/resources/mapper/manage/ParameterSetMapper.xml

@@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="leaveRate != null  and leaveRate != ''"> and leave_rate = #{leaveRate}</if>
             <if test="playRate != null  and playRate != ''"> and play_rate = #{playRate}</if>
         </where>
+        order by create_time DESC
     </select>
     
     <select id="selectParameterSetByParameterId" parameterType="Long" resultMap="ParameterSetResult">

+ 1 - 0
ruoyi-system/src/main/resources/mapper/manage/WarnManageMapper.xml

@@ -77,6 +77,7 @@
                 AND date_format(w.warn_time,'%Y') = #{params.year}
             </if>
         </where>
+        order by w.create_time DESC
     </select>
 
     <select id="selectWarnManageDeptListByTime" parameterType="WarnManage" resultMap="WarnManageResult">