Merge branch 'master' of http://60.171.161.56:20000/tjf/deviceManage

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

@@ -18,7 +18,7 @@ ruoyi:
 # 开发环境配置
 server:
     # 服务器的HTTP端口，默认为8080
-    port: 8099
+    port: 8056
     servlet:
         # 应用的访问路径
         context-path: /

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

@@ -19,8 +19,8 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-          active: druid
-#         active: prod
+#          active: druid
+          active: prod
   # 文件上传
   servlet:
     multipart:

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">

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">

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">

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">