Merge remote-tracking branch 'origin/20210716' into 20210716

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/AlarmTypeMapper.xml

@@ -71,6 +71,7 @@ rt.type_desc, rt.tenant_id, rt.alarm_status    </sql>
             </if>
 
         </where>
+        order by rt.create_date desc
     </select>
 
     <!-- 新增所有列 -->
@@ -157,7 +158,7 @@ rt.type_desc, rt.tenant_id, rt.alarm_status    </sql>
     <select id="selectTypesWithRules" resultType="com.zcxk.rmcp.api.dto.alarm.AlarmTypeDto">
         select  <include refid="Base_Column_List"/>,rule.cn
         from rmcp_alarm_type rt left join (select ifnull(count(*),0)cn,alarm_type_id
-        from rmcp_device_alarm_rule group by alarm_type_id ) rule
+        from rmcp_device_alarm_rule where status=1 group by alarm_type_id ) rule
         on rt.id=rule.alarm_type_id
         where  rule.cn>0 and rt.id in
         <foreach collection="list" item="item" open="(" close=")" separator=",">

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/DeviceAlarmRuleMapper.xml

@@ -67,6 +67,7 @@ a.update_date,a. update_by,a. rule_desc, a.value1,a. value2,a. measuring_data_ty
 
 
         </where>
+        order by a.create_date desc
     </select>
 
     <!-- 新增所有列 -->