tj

microservice-alram/src/main/java/com/devplatform/alarm/modules/alarms/controller/AlarmsInfoController.java

@@ -80,7 +80,8 @@ public class AlarmsInfoController extends AbstractController {
     public R queryGroupUntreated(@RequestParam(required = false) String stationId) {
         AlarmsInfo bean1 = alarmsInfoService.queryGroupByLevel(stationId);
         AlarmsInfo bean2 = alarmsInfoService.queryGroupByStatus(stationId);
-        return R.ok().put("level", bean1).put("status",bean2);
+        List<Map<String,Object>> list = alarmsInfoService.queryGroupByAlarmsType(stationId);
+        return R.ok().put("level", bean1).put("status",bean2).put("list",list);
     }
 
     /**

microservice-alram/src/main/java/com/devplatform/alarm/modules/alarms/dao/AlarmsInfoDao.java

@@ -62,13 +62,6 @@ public interface AlarmsInfoDao extends MyBaseMapper<AlarmsInfo> {
    */
   AlarmsInfo queryGroupByStatus(@Param("stationId") String stationId);
 
-  /**
-   * 查询线路报警信息
-   * @param params
-   * @return
-   */
-  List<AlarmsInfo> queryRoutesAll(@Param("params") Map<String, Object> params);
-
   /**
    * 查询数量
    * @param params
@@ -76,4 +69,5 @@ public interface AlarmsInfoDao extends MyBaseMapper<AlarmsInfo> {
    */
   Integer countNum(@Param("params") Map<String, Object> params);
 
+  List<Map<String, Object>> queryGroupByAlarmsType(@Param("stationId")String stationId);
 }

microservice-alram/src/main/java/com/devplatform/alarm/modules/alarms/service/AlarmsInfoService.java

@@ -55,14 +55,6 @@ public interface AlarmsInfoService extends MyBaseService<AlarmsInfo> {
    */
   List<AlarmsInfo> queryAll(Map<String, Object> params);
 
-  /**
-   * 根据线路id，站点id查询未处理报警数据
-   *
-   * @param params
-   * @return
-   */
-  List<AlarmsInfo> queryRoutesAll(Map<String, Object> params);
-
   /**
    * 查询数量
    * @param params
@@ -70,4 +62,5 @@ public interface AlarmsInfoService extends MyBaseService<AlarmsInfo> {
    */
   Integer countNum(Map<String, Object> params);
 
+  List<Map<String, Object>> queryGroupByAlarmsType(String stationId);
 }

microservice-alram/src/main/java/com/devplatform/alarm/modules/alarms/service/impl/AlarmsInfoServiceImpl.java

@@ -48,13 +48,13 @@ public class AlarmsInfoServiceImpl extends MyBaseServiceImpl<AlarmsInfoDao, Alar
   }
 
   @Override
-  public List<AlarmsInfo> queryRoutesAll(Map<String, Object> params) {
-    return baseMapper.queryRoutesAll(params);
+  public Integer countNum(Map<String, Object> params) {
+    return baseMapper.countNum(params);
   }
 
   @Override
-  public Integer countNum(Map<String, Object> params) {
-    return baseMapper.countNum(params);
+  public List<Map<String, Object>> queryGroupByAlarmsType(String stationId) {
+    return baseMapper.queryGroupByAlarmsType(stationId);
   }
 
 }

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

@@ -181,16 +181,14 @@
     <if test="params.stationId!=null and params.stationId !=''">and lr.station_id = #{params.stationId} and ai.station_id = #{params.stationId}</if>
   </select>
 
-  <select id="queryRoutesAll" parameterType="java.lang.Object" resultType="com.devplatform.alarm.modules.alarms.bean.AlarmsInfo">
-    select ai.id,ai.occurrence_time,ai.event_name,ai.create_time,ai.station_id stationId,lr.line_name lineName,lr.station_name stationName,lsm.name tierName
+  <select id="queryGroupByAlarmsType" resultType="java.util.Map">
+    select le.event_name as eventTypeName,t.num as num
+    from (select ai.event_type,count(1) as num
     from alarms_info ai
-    left join li_resource lr on lr.id = ai.resource_id and lr.station_id = ai.station_id
-    left join li_station_map lsm on lsm.id = lr.tier_id and lsm.station_id = ai.station_id
-    where ai.deleted=0 and ai.`status` in (1,2)
-    <if test="params.stationId!=null and params.stationId !=''">and ai.station_id = #{params.stationId}</if>
-    <if test="params.lineId!=null and params.lineId !=''">and lr.line_id = #{params.lineId}</if>
-    ORDER BY ai.occurrence_time desc
-    LIMIT 0,${params.limit}
+    where ai.deleted=0 and DATE_FORMAT(ai.occurrence_time,'%Y%m')= DATE_FORMAT(CURDATE(),'%Y%m')
+    <if test="stationId!=null and stationId!=''">and ai.station_id=#{stationId}</if>
+    group by ai.event_type) as t
+    left join link_event le on le.id = t.event_type
   </select>
 </mapper>