接口调整

microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/controller/LiResourceController.java

@@ -429,6 +429,7 @@ public class LiResourceController extends AbstractController {
                     Map<String, Object> mapResource = new HashMap<>(16);
                     mapResource.put("id", resource.getId());
                     mapResource.put("resourceName", resource.getName());
+                    mapResource.put("mapStationName",resource.getStationName()+resource.getTierName());
                     childrenDic.add(mapResource);
                     iterator.remove();
                 }

microservice-admin/src/main/resources/mapper/liResource/LiResourceMapper.xml

@@ -217,7 +217,7 @@
     LEFT JOIN li_resource_camera lic on lic.resource_id = li.id and lic.station_id = li.station_id
     <include refid="queryPageByListClause2"></include>
     GROUP BY li.id
-    ORDER BY li.create_time DESC
+    ORDER BY li.station_id,li.create_time DESC
   </select>
 
   <select id="getBeanById" parameterType="Object" resultMap="BaseResultMap">

microservice-admin/src/main/resources/mapper/liResource/LiStationMapMapper.xml

@@ -76,6 +76,7 @@
       select lsm.id,lsm.name,ls.station_name as stationName
       from li_station_map lsm
       left join li_station ls on ls.id = lsm.station_id
+      where lsm.deleted=0
       order by lsm.station_id,lsm.order_num
     </select>
 

microservice-alram/src/main/resources/mapper/alarms/AlarmsInfoMapper.xml

@@ -63,6 +63,9 @@
   <!-- 分页查询条件 -->
   <sql id="queryPageByListClause">
     where ai.deleted=0
+    <if test="type != null">
+      and ai.type = #{type}
+    </if>
     <if test="eventType != null and eventType !='' ">
       and ai.event_type = #{eventType}
     </if>