1.安全态势接口

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/DateUtils.java

@@ -709,6 +709,7 @@ public class DateUtils {
 
     /**
      * 根据两个日期返回相差的时分秒
+     *
      * @param newTime 靠后时间
      * @param oldTime 靠前时间
      * @return
@@ -718,7 +719,7 @@ public class DateUtils {
         Long oldTimes = oldTime.getTime();
         // 不改时间会多加八个小时
         timeSdf.setTimeZone(TimeZone.getTimeZone("GMT+00:00"));
-        return timeSdf.format(newTimes-oldTimes);
+        return timeSdf.format(newTimes - oldTimes);
     }
 
     /**
@@ -748,11 +749,12 @@ public class DateUtils {
 
     /**
      * 通过月份计算季度
+     *
      * @param month
      * @return
      */
     public static int getQuarter(int month) {
-        if(month < 1 || month > 12) {
+        if (month < 1 || month > 12) {
             throw new IllegalArgumentException("month is invalid.");
         }
         return (month - 1) / 3 + 1;
@@ -760,11 +762,12 @@ public class DateUtils {
 
     /**
      * 通过月份计算季度
+     *
      * @param month
      * @return
      */
     public static String getQuarterStr(int month) {
-        if(month < 1 || month > 12) {
+        if (month < 1 || month > 12) {
             throw new IllegalArgumentException("month is invalid.");
         }
         return (month - 1) / 3 + 1 + "";
@@ -772,6 +775,7 @@ public class DateUtils {
 
     /**
      * 获取指定时间所在周的第一天日期
+     *
      * @param date
      * @return
      */
@@ -785,8 +789,25 @@ public class DateUtils {
         return getDate(calendar.getTime());
     }
 
+    public static Date beginDateOfWeek(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setFirstDayOfWeek(Calendar.MONDAY);
+        calendar.setTime(date);
+        calendar.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
+        return calendar.getTime();
+    }
+
+    public static Date endDateOfWeek(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setFirstDayOfWeek(Calendar.MONDAY);
+        calendar.setTime(date);
+        calendar.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);
+        return calendar.getTime();
+    }
+
     /**
      * 获取指定时间所在周的最后一天日期
+     *
      * @param date
      * @return
      */
@@ -802,18 +823,19 @@ public class DateUtils {
 
     /**
      * 将秒数转换为时分秒格式
+     *
      * @param times
      * @return
      */
     public static String secondsToTimeStr(int times) {
-        if(times <= 0){
+        if (times <= 0) {
             return "00:00:00";
         }
-        int h = times/3600;
-        int m = (times-h*3600)/60;
-        int s = times - h*3600-m*60;
+        int h = times / 3600;
+        int m = (times - h * 3600) / 60;
+        int s = times - h * 3600 - m * 60;
         String time = "%02d:%02d:%02d";
-        time = String.format(time,h,m,s);
+        time = String.format(time, h, m, s);
         return time;
     }
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/dto/FireBuildingDto.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * 消防建筑表
  *
@@ -43,6 +45,9 @@ public class FireBuildingDto extends BaseDto {
     @ApiModelProperty(value = "父级mrid")
     private String parentMrid;
 
+    @ApiModelProperty(value = "树形mrids，包括自己，冗余用于树形查询")
+    private String treeMrids;
+
     @ApiModelProperty(value = "类型（建筑、楼层、房间）")
     private String type;
 
@@ -54,4 +59,7 @@ public class FireBuildingDto extends BaseDto {
 
     @ApiModelProperty(value = "纬度")
     private String lat;
+
+    @ApiModelProperty(value = "子节点")
+    private List<FireBuildingDto> children;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/dto/FireVideoDto.java

 package com.yeejoin.amos.boot.module.ccs.api.dto;
 
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/dto/FireWaterDto.java

 package com.yeejoin.amos.boot.module.ccs.api.dto;
 
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/entity/BaseEntity.java

@@ -20,13 +20,13 @@ public class BaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "id", type = IdType.ID_WORKER)
-    protected Long id;
+    protected String id;
 
     /**
      * 同步日期
      */
     @TableField(value = "syn_date", fill = FieldFill.INSERT_UPDATE)
-    protected Date recDate;
+    protected Date synDate;
 
     /**
      * 业务创建日期

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/entity/FireBuilding.java

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.ccs.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -68,6 +67,12 @@ public class FireBuilding extends BaseEntity {
     @TableField("parent_mrid")
     private String parentMrid;
 
+
+    /**
+     * 树形mrids，包括自己，冗余用于树形查询
+     */
+    private String treeMrids;
+
     /**
      * 类型（建筑、楼层、房间）
      */

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/mapper/FireAlarmDayStatisticsMapper.java

 package com.yeejoin.amos.boot.module.ccs.api.mapper;
 
-import com.yeejoin.amos.boot.module.ccs.api.entity.FireAlarmDayStatistics;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.ccs.api.entity.FireAlarmDayStatistics;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 换流站告警日统计 Mapper 接口
@@ -11,4 +14,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface FireAlarmDayStatisticsMapper extends BaseMapper<FireAlarmDayStatistics> {
 
+    /**
+     * 告警次数-折线图使用
+     *
+     * @param stationCode 换流程code
+     * @param beginDate   开始日期
+     * @param endDate     结束日期
+     * @return List<String>
+     */
+    List<String> queryAlarmTimesTrend(@Param("stationCode") String stationCode, @Param("beginDate") String beginDate, @Param("endDate") String endDate);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/mapper/FireDangerDayStatisticsMapper.java

 package com.yeejoin.amos.boot.module.ccs.api.mapper;
 
-import com.yeejoin.amos.boot.module.ccs.api.entity.FireDangerDayStatistics;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.ccs.api.entity.FireDangerDayStatistics;
+
+import java.util.List;
 
 /**
  * 换流站隐患日统计 Mapper 接口
@@ -11,4 +13,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface FireDangerDayStatisticsMapper extends BaseMapper<FireDangerDayStatistics> {
 
+    /**
+     * 隐患增长趋势
+     *
+     * @param stationCode 换流站code
+     * @param beginDate   开始日期
+     * @param endDate     结束日期
+     * @return List<String>
+     */
+    List<String> queryDangerTimesTrend(String stationCode, String beginDate, String endDate);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/mapper/FireLatentDangerMapper.java

 package com.yeejoin.amos.boot.module.ccs.api.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.ccs.api.dto.FireLatentDangerDto;
 import com.yeejoin.amos.boot.module.ccs.api.entity.FireLatentDanger;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 隐患信息 Mapper 接口
@@ -16,10 +17,18 @@ import java.util.List;
 public interface FireLatentDangerMapper extends BaseMapper<FireLatentDanger> {
     /**
      * 隐患列表倒序列表
-     * @param top 限制w
+     *
+     * @param top         限制w
      * @param stationCode 站code
      * @return List<FireLatentDangerDto>
      */
     List<FireLatentDangerDto> queryDangerList(@Param("top") Long top, @Param("stationCode") String stationCode);
 
+    /**
+     * 隐患分组列表
+     *
+     * @param stationCode 换流站编号
+     * @return List<Map < String, Object>>
+     */
+    List<Map<String, Object>> dangerStateGroupMap(String stationCode);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/service/IFireBuildingService.java

 package com.yeejoin.amos.boot.module.ccs.api.service;
 
 
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireBuildingDto;
+
+import java.util.List;
+
 /**
  * 消防建筑表接口类
  *
@@ -8,5 +12,4 @@ package com.yeejoin.amos.boot.module.ccs.api.service;
  * @date 2021-11-09
  */
 public interface IFireBuildingService {
-
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/service/IStatisticsService.java

+package com.yeejoin.amos.boot.module.ccs.api.service;
+
+import java.text.ParseException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author DELL
+ */
+public interface IStatisticsService {
+    /**
+     * 告警隐患统计
+     * @param stationCode 站编号
+     * @return Map<String, Object>
+     */
+    Map<String, Object> alarmAndDangerNumCount(String stationCode) throws ParseException;
+
+    /**
+     * 告警和隐患趋势
+     * @param stationCode 换流站编号
+     * @param beginDate 开始日期
+     * @param endDate 结束日期
+     * @return Map<String, Object>
+     */
+    Map<String, Object> alarmAndDangerTrend(String stationCode, String beginDate, String endDate);
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/resources/mapper/FireAlarmDayStatisticsMapper.xml

@@ -2,4 +2,28 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.ccs.api.mapper.FireAlarmDayStatisticsMapper">
 
+    <select id="queryAlarmTimesTrend" resultType="java.lang.String">
+        select
+        (SELECT
+        IFNULL(sum(s.alarm_times),0)
+        FROM `asf_fire_alarm_day_statistics` s
+        <where>
+            <if test="stationCode != null and stationCode != ''">
+                s.station_code = #{stationCode}
+            </if>
+            s.collect_date = t.date
+        </where>
+        ) as times
+        from
+        (SELECT
+        DATE_FORMAT(DATE( DATE_ADD( #{beginDate}, INTERVAL @s DAY )),'%Y-%m-%d') AS date,
+        @s := @s + 1 AS `index`
+        FROM
+        mysql.help_topic,
+        ( SELECT @s := 0 ) temp
+        WHERE
+        @s <![CDATA[<=]]>
+        DATEDIFF(#{endDate},#{beginDate})) t
+        GROUP BY t.date
+    </select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/resources/mapper/FireDangerDayStatisticsMapper.xml

@@ -2,4 +2,28 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.ccs.api.mapper.FireDangerDayStatisticsMapper">
 
+    <select id="queryDangerTimesTrend" resultType="java.lang.String">
+        select
+        (SELECT
+        IFNULL(sum(s.danger_times),0)
+        FROM `asf_fire_danger_day_statistics` s
+        <where>
+            <if test="stationCode != null and stationCode != ''">
+                s.station_code = #{stationCode}
+            </if>
+            s.collect_date = t.date
+        </where>
+        ) as times
+        from
+        (SELECT
+        DATE_FORMAT(DATE( DATE_ADD( #{beginDate}, INTERVAL @s DAY )),'%Y-%m-%d') AS date,
+        @s := @s + 1 AS `index`
+        FROM
+        mysql.help_topic,
+        ( SELECT @s := 0 ) temp
+        WHERE
+        @s <![CDATA[<=]]>
+        DATEDIFF(#{endDate},#{beginDate})) t
+        GROUP BY t.date
+    </select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/resources/mapper/FireEquipmentAlarmLogMapper.xml

@@ -14,8 +14,16 @@
             s.name as station_name,
             a.station_code,
             a.location,
-            a.lat,
-            a.lng,
+            <choose>
+                <when test="stationCode != null and stationCode != ''">
+                    a.lat,
+                    a.lng,
+                </when>
+                <otherwise>
+                    s.lng,
+                    s.lat,
+                </otherwise>
+            </choose>
             s.lat as stationLat,
             s.lng as stationLng
         from

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/resources/mapper/FireLatentDangerMapper.xml

@@ -4,19 +4,27 @@
 
     <select id="queryDangerList" resultType="com.yeejoin.amos.boot.module.ccs.api.dto.FireLatentDangerDto">
         select
-            d.id,
-            d.danger_name,
-            d.danger_state,
-            d.danger_state_name,
-            d.danger_level,
-            d.danger_level_name,
-            s.name as station_name,
-            d.station_code,
-            d.discovery_date,
-            d.lat,
-            d.lng,
-            s.lat as stationLat,
-            s.lng as stationLng
+        d.id,
+        d.danger_name,
+        d.danger_state,
+        d.danger_state_name,
+        d.danger_level,
+        d.danger_level_name,
+        s.name as station_name,
+        d.station_code,
+        d.discovery_date,
+        <choose>
+            <when test="stationCode != null and stationCode != ''">
+                d.lat,
+                d.lng,
+            </when>
+            <otherwise>
+                s.lng,
+                s.lat,
+            </otherwise>
+        </choose>
+        s.lng as stationLng,
+        s.lat as stationLat
         from
         asf_fire_latent_danger d,
         asf_fire_station_info s
@@ -27,7 +35,19 @@
         </if>
         order by d.discovery_date desc
         <if test="top != null">
-         limit ${top}
+            limit ${top}
         </if>
     </select>
+    <select id="dangerStateGroupMap" resultType="java.util.Map">
+        SELECT
+        d.danger_state as dangerState,
+        count(1) as num
+        FROM `asf_fire_latent_danger` d
+        <where>
+            <if test="stationCode != null and stationCode != ''">
+                d.station_code = #{stationCode}
+            </if>
+        </where>
+        GROUP BY d.danger_state
+    </select>
 </mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireAlarmDayStatisticsController.java

@@ -31,77 +31,6 @@ public class FireAlarmDayStatisticsController extends BaseController {
     FireAlarmDayStatisticsServiceImpl fireAlarmDayStatisticsServiceImpl;
 
     /**
-     * 新增换流站告警日统计
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/save")
-    @ApiOperation(httpMethod = "POST", value = "新增换流站告警日统计", notes = "新增换流站告警日统计")
-    public ResponseModel<FireAlarmDayStatisticsDto> save(@RequestBody FireAlarmDayStatisticsDto model) {
-        model = fireAlarmDayStatisticsServiceImpl.createWithModel(model);
-        return ResponseHelper.buildResponse(model);
-    }
-
-    /**
-     * 根据sequenceNbr更新
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PutMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新换流站告警日统计", notes = "根据sequenceNbr更新换流站告警日统计")
-    public ResponseModel<FireAlarmDayStatisticsDto> updateBySequenceNbrFireAlarmDayStatistics(@RequestBody FireAlarmDayStatisticsDto model, @PathVariable(value = "sequenceNbr") String sequenceNbr) {
-        model.setId(sequenceNbr);
-        return ResponseHelper.buildResponse(fireAlarmDayStatisticsServiceImpl.updateWithModel(model));
-    }
-
-    /**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除换流站告警日统计", notes = "根据sequenceNbr删除换流站告警日统计")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(fireAlarmDayStatisticsServiceImpl.removeById(sequenceNbr));
-    }
-
-    /**
-     * 根据sequenceNbr查询
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个换流站告警日统计", notes = "根据sequenceNbr查询单个换流站告警日统计")
-    public ResponseModel<FireAlarmDayStatisticsDto> selectOne(@PathVariable Long sequenceNbr) {
-        return ResponseHelper.buildResponse(fireAlarmDayStatisticsServiceImpl.queryBySeq(sequenceNbr));
-    }
-
-    /**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/page")
-    @ApiOperation(httpMethod = "GET", value = "换流站告警日统计分页查询", notes = "换流站告警日统计分页查询")
-    public ResponseModel<Page<FireAlarmDayStatisticsDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size) {
-        Page<FireAlarmDayStatisticsDto> page = new Page<FireAlarmDayStatisticsDto>();
-        page.setCurrent(current);
-        page.setSize(size);
-        return ResponseHelper.buildResponse(fireAlarmDayStatisticsServiceImpl.queryForFireAlarmDayStatisticsPage(page));
-    }
-
-    /**
      * 列表全部数据查询
      *
      * @return

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireBuildingController.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.ccs.api.dto.FireBuildingDto;
 import com.yeejoin.amos.boot.module.ccs.biz.service.impl.FireBuildingServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -36,16 +37,24 @@ public class FireBuildingController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "{stationCode}/page")
+    @GetMapping(value = "/{stationCode}/page")
     @ApiOperation(httpMethod = "GET", value = "消防建筑表分页查询", notes = "消防建筑表分页查询")
     public ResponseModel<Page<FireBuildingDto>> queryForPage(
-            @RequestParam(value = "name", required = false) String name,
-            @RequestParam(value = "current") int current,
-            @RequestParam(value = "size") int size,
-            @PathVariable String stationCode) {
+            @ApiParam(value = "建筑名称") @RequestParam(value = "name", required = false) String name,
+            @ApiParam(value = "当前页", required = true) @RequestParam(value = "current") int current,
+            @ApiParam(value = "页大小", required = true) @RequestParam(value = "size") int size,
+            @ApiParam(value = "换流站code", required = true) @PathVariable String stationCode) {
         Page<FireBuildingDto> page = new Page<FireBuildingDto>();
         page.setCurrent(current);
         page.setSize(size);
         return ResponseHelper.buildResponse(fireBuildingServiceImpl.queryForFireBuildingPage(page, name, stationCode));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{stationCode}/tree")
+    @ApiOperation(httpMethod = "GET", value = "指定换流站的消防建筑树", notes = "指定换流站的消防建筑树")
+    public ResponseModel buildingTree(
+            @ApiParam(value = "换流站code") @PathVariable String stationCode) {
+        return ResponseHelper.buildResponse(fireBuildingServiceImpl.buildingTree(stationCode));
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireDangerDayStatisticsController.java

 package com.yeejoin.amos.boot.module.ccs.biz.controller;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.ccs.api.dto.FireDangerDayStatisticsDto;
 import com.yeejoin.amos.boot.module.ccs.biz.service.impl.FireDangerDayStatisticsServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -31,63 +31,6 @@ public class FireDangerDayStatisticsController extends BaseController {
     FireDangerDayStatisticsServiceImpl fireDangerDayStatisticsServiceImpl;
 
     /**
-     * 新增换流站隐患日统计
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/save")
-    @ApiOperation(httpMethod = "POST", value = "新增换流站隐患日统计", notes = "新增换流站隐患日统计")
-    public ResponseModel<FireDangerDayStatisticsDto> save(@RequestBody FireDangerDayStatisticsDto model) {
-        model = fireDangerDayStatisticsServiceImpl.createWithModel(model);
-        return ResponseHelper.buildResponse(model);
-    }
-
-    /**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除换流站隐患日统计", notes = "根据sequenceNbr删除换流站隐患日统计")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(fireDangerDayStatisticsServiceImpl.removeById(sequenceNbr));
-    }
-
-    /**
-     * 根据sequenceNbr查询
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个换流站隐患日统计", notes = "根据sequenceNbr查询单个换流站隐患日统计")
-    public ResponseModel<FireDangerDayStatisticsDto> selectOne(@PathVariable Long sequenceNbr) {
-        return ResponseHelper.buildResponse(fireDangerDayStatisticsServiceImpl.queryBySeq(sequenceNbr));
-    }
-
-    /**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/page")
-    @ApiOperation(httpMethod = "GET", value = "换流站隐患日统计分页查询", notes = "换流站隐患日统计分页查询")
-    public ResponseModel<Page<FireDangerDayStatisticsDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size) {
-        Page<FireDangerDayStatisticsDto> page = new Page<FireDangerDayStatisticsDto>();
-        page.setCurrent(current);
-        page.setSize(size);
-        return ResponseHelper.buildResponse(fireDangerDayStatisticsServiceImpl.queryForFireDangerDayStatisticsPage(page));
-    }
-
-    /**
      * 列表全部数据查询
      *
      * @return

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireLatentDangerController.java

@@ -45,4 +45,17 @@ public class FireLatentDangerController extends BaseController {
             @ApiParam(value = "换流站编号") @RequestParam(required = false) String stationCode) {
         return ResponseHelper.buildResponse(fireLatentDangerServiceImpl.queryForFireLatentDangerList(top, stationCode));
     }
+
+    /**
+     * 隐患分组列表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "隐患分组", notes = "隐患分组")
+    @GetMapping(value = "/state/group")
+    public ResponseModel dangerStateGroupMap(
+            @ApiParam(value = "换流站编号") @RequestParam(required = false) String stationCode) {
+        return ResponseHelper.buildResponse(fireLatentDangerServiceImpl.dangerStateGroupMap(stationCode));
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireVehicleController.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.ccs.api.dto.FireVehicleDto;
 import com.yeejoin.amos.boot.module.ccs.biz.service.impl.FireVehicleServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -35,13 +36,13 @@ public class FireVehicleController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "{stationCode}/page")
+    @GetMapping(value = "/{stationCode}/page")
     @ApiOperation(httpMethod = "GET", value = "消防车辆信息分页查询", notes = "消防车辆信息分页查询")
     public ResponseModel<Page<FireVehicleDto>> queryForPage(
-            @RequestParam(value = "name", required = false) String name,
-            @RequestParam(value = "current") int current,
-            @RequestParam(value = "size") int size,
-            @PathVariable String stationCode) {
+            @ApiParam(value = "建筑名称") @RequestParam(value = "name", required = false) String name,
+            @ApiParam(value = "当前页", required = true) @RequestParam(value = "current") int current,
+            @ApiParam(value = "页大小", required = true) @RequestParam(value = "size") int size,
+            @ApiParam(value = "换流站code", required = true) @PathVariable String stationCode) {
         Page<FireVehicleDto> page = new Page<FireVehicleDto>();
         page.setCurrent(current);
         page.setSize(size);

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireVideoController.java

@@ -6,6 +6,8 @@ import com.yeejoin.amos.boot.module.ccs.api.dto.FireVideoDto;
 import com.yeejoin.amos.boot.module.ccs.biz.service.impl.FireVideoServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -13,6 +15,11 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 消防视频表
  *
@@ -36,17 +43,22 @@ public class FireVideoController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "{stationCode}/page")
+    @GetMapping(value = "/{stationCode}/page")
     @ApiOperation(httpMethod = "GET", value = "消防视频表分页查询", notes = "消防视频表分页查询")
     public ResponseModel<Page<FireVideoDto>> queryForPage(
-            @RequestParam(value = "name", required = false) String name,
-            @RequestParam(value = "current") int current,
-            @RequestParam(value = "size") int size,
-            @PathVariable String stationCode) {
+            @ApiParam(value = "建筑名称") @RequestParam(value = "name", required = false) String name,
+            @ApiParam(value = "当前页", required = true) @RequestParam(value = "current") int current,
+            @ApiParam(value = "页大小", required = true) @RequestParam(value = "size") int size,
+            @ApiParam(value = "换流站code", required = true) @PathVariable String stationCode,
+            @ApiParam(value = "所在建筑,多个用逗号分隔") @RequestParam(value = "buildingMrids", required = false) String buildingMrids) {
+        List<String> buildingMridList = new ArrayList<>();
+        if(StringUtils.isNotBlank(buildingMrids)){
+            buildingMridList = Arrays.stream(buildingMrids.split(",")).collect(Collectors.toList());
+        }
         Page<FireVideoDto> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(fireVideoServiceImpl.queryForFireVideoPage(page, name, stationCode));
+        return ResponseHelper.buildResponse(fireVideoServiceImpl.queryForFireVideoPage(page, name, stationCode,buildingMridList));
     }
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireWaterController.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.ccs.api.dto.FireWaterDto;
 import com.yeejoin.amos.boot.module.ccs.biz.service.impl.FireWaterServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -13,8 +14,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.util.List;
-
 /**
  * 消防水源表
  *
@@ -37,28 +36,16 @@ public class FireWaterController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "{stationCode}/page")
+    @GetMapping(value = "/{stationCode}/page")
     @ApiOperation(httpMethod = "GET", value = "消防水源表分页查询", notes = "消防水源表分页查询")
     public ResponseModel<Page<FireWaterDto>> queryForPage(
-            @RequestParam(value = "name", required = false) String name,
-            @RequestParam(value = "current") int current,
-            @RequestParam(value = "size") int size,
-            @PathVariable String stationCode) {
+            @ApiParam(value = "建筑名称") @RequestParam(value = "name", required = false) String name,
+            @ApiParam(value = "当前页", required = true) @RequestParam(value = "current") int current,
+            @ApiParam(value = "页大小", required = true) @RequestParam(value = "size") int size,
+            @ApiParam(value = "换流站code", required = true) @PathVariable String stationCode) {
         Page<FireWaterDto> page = new Page<FireWaterDto>();
         page.setCurrent(current);
         page.setSize(size);
         return ResponseHelper.buildResponse(fireWaterServiceImpl.queryForFireWaterPage(page, name, stationCode));
     }
-
-    /**
-     * 列表全部数据查询
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "消防水源表列表全部数据查询", notes = "消防水源表列表全部数据查询")
-    @GetMapping(value = "/list")
-    public ResponseModel<List<FireWaterDto>> selectForList() {
-        return ResponseHelper.buildResponse(fireWaterServiceImpl.queryForFireWaterList());
-    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/StatisticsController.java

+package com.yeejoin.amos.boot.module.ccs.biz.controller;
+
+import com.yeejoin.amos.boot.module.ccs.api.service.IStatisticsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.text.ParseException;
+
+/**
+ * @author DELL
+ */
+@RestController
+@Api(tags = "融合统计")
+@RequestMapping(value = "/statistics")
+public class StatisticsController {
+
+    @Autowired
+    IStatisticsService iStatisticsService;
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "告警隐患", notes = "告警隐患")
+    @GetMapping(value = "/alarmAndDangerNumCount")
+    public ResponseModel alarmAndDangerNumCount(
+            @ApiParam(value = "换流站编号") @RequestParam(required = false) String stationCode) throws ParseException {
+        return ResponseHelper.buildResponse(iStatisticsService.alarmAndDangerNumCount(stationCode));
+    }
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "查询指定区间的告警隐患趋势", notes = "查询指定区间的告警隐患趋势")
+    @GetMapping(value = "/alarmAndDangerTrend")
+    public ResponseModel alarmAndDangerTrend(
+            @ApiParam(value = "开始日期", required = true) @RequestParam(value = "beginDate") String beginDate,
+            @ApiParam(value = "结束日期", required = true) @RequestParam(value = "endDate") String endDate,
+            @ApiParam(value = "换流站编号") @RequestParam(required = false) String stationCode) {
+        return ResponseHelper.buildResponse(iStatisticsService.alarmAndDangerTrend(stationCode, beginDate, endDate));
+    }
+
+
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireAlarmDayStatisticsServiceImpl.java

 package com.yeejoin.amos.boot.module.ccs.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireAlarmDayStatisticsDto;
 import com.yeejoin.amos.boot.module.ccs.api.entity.FireAlarmDayStatistics;
 import com.yeejoin.amos.boot.module.ccs.api.mapper.FireAlarmDayStatisticsMapper;
 import com.yeejoin.amos.boot.module.ccs.api.service.IFireAlarmDayStatisticsService;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireAlarmDayStatisticsDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import java.util.List;
 
 /**
@@ -16,18 +18,25 @@ import java.util.List;
  * @date 2021-11-09
  */
 @Service
-public class FireAlarmDayStatisticsServiceImpl extends BaseService<FireAlarmDayStatisticsDto,FireAlarmDayStatistics,FireAlarmDayStatisticsMapper> implements IFireAlarmDayStatisticsService {
-    /**
-     * 分页查询
-     */
-    public Page<FireAlarmDayStatisticsDto> queryForFireAlarmDayStatisticsPage(Page<FireAlarmDayStatisticsDto> page)   {
-        return this.queryForPage(page, null, false);
-    }
+public class FireAlarmDayStatisticsServiceImpl extends BaseService<FireAlarmDayStatisticsDto, FireAlarmDayStatistics, FireAlarmDayStatisticsMapper> implements IFireAlarmDayStatisticsService {
 
     /**
      * 列表查询 示例
      */
-    public List<FireAlarmDayStatisticsDto> queryForFireAlarmDayStatisticsList()   {
-        return this.queryForList("" , false);
+    public List<FireAlarmDayStatisticsDto> queryForFireAlarmDayStatisticsList() {
+        return this.queryForList("", false);
+    }
+
+    public int alarmTimesCount(String stationCode, String beginDate, String endDate) {
+        LambdaQueryWrapper<FireAlarmDayStatistics> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(stationCode), FireAlarmDayStatistics::getStationCode, stationCode);
+        wrapper.ge(FireAlarmDayStatistics::getCollectDate, beginDate);
+        wrapper.le(FireAlarmDayStatistics::getCollectDate, endDate);
+        List<FireAlarmDayStatistics> list = this.list(wrapper);
+        return list.stream().mapToInt(FireAlarmDayStatistics::getAlarmTimes).sum();
+    }
+
+    public List<String> alarmTimesTrend(String stationCode, String beginDate, String endDate) {
+        return this.baseMapper.queryAlarmTimesTrend(stationCode, beginDate, endDate);
     }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireBuildingServiceImpl.java

 package com.yeejoin.amos.boot.module.ccs.biz.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.ccs.api.dto.BaseDto;
 import com.yeejoin.amos.boot.module.ccs.api.dto.FireBuildingDto;
 import com.yeejoin.amos.boot.module.ccs.api.entity.FireBuilding;
 import com.yeejoin.amos.boot.module.ccs.api.mapper.FireBuildingMapper;
 import com.yeejoin.amos.boot.module.ccs.api.service.IFireBuildingService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.annotation.Condition;
 import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 消防建筑表服务实现类
@@ -23,15 +27,17 @@ public class FireBuildingServiceImpl extends BaseService<FireBuildingDto, FireBu
     /**
      * 分页查询
      */
-    public Page<FireBuildingDto> queryForFireBuildingPage(Page<FireBuildingDto> page, @Condition(Operator.like) String name,@Condition String stationCode) {
-        return this.queryForPage(page, "createDate", false, name, stationCode);
+    public Page<FireBuildingDto> queryForFireBuildingPage(Page<FireBuildingDto> page, @Condition(Operator.like) String name, @Condition String stationCode) {
+        return this.queryForPage(page, "create_date", false, name, stationCode);
     }
 
 
-    /**
-     * 列表查询 示例
-     */
-    public List<FireBuildingDto> queryForFireBuildingList() {
-        return this.queryForList("", false);
+    public List<FireBuildingDto> buildingTree(String stationCode) {
+        List<FireBuildingDto> dtoList = this.queryForList("create_date", true, stationCode);
+        return dtoList.stream().filter(d -> StringUtils.isBlank(d.getParentMrid()) || "0".equals(d.getParentMrid()) || "-1".equals(d.getParentMrid())).peek(s -> s.setChildren(this.getChildren(s.getMrid(), dtoList))).sorted(Comparator.comparing(BaseDto::getCreateDate)).collect(Collectors.toList());
+    }
+
+    private List<FireBuildingDto> getChildren(String mrid, List<FireBuildingDto> dtoList) {
+        return dtoList.stream().filter(d -> StringUtils.isNotBlank(d.getParentMrid()) && d.getParentMrid().equals(mrid)).peek(s -> s.setChildren(this.getChildren(s.getMrid(), dtoList))).sorted(Comparator.comparing(BaseDto::getCreateDate)).collect(Collectors.toList());
     }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireDangerDayStatisticsServiceImpl.java

 package com.yeejoin.amos.boot.module.ccs.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireDangerDayStatisticsDto;
 import com.yeejoin.amos.boot.module.ccs.api.entity.FireDangerDayStatistics;
 import com.yeejoin.amos.boot.module.ccs.api.mapper.FireDangerDayStatisticsMapper;
 import com.yeejoin.amos.boot.module.ccs.api.service.IFireDangerDayStatisticsService;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireDangerDayStatisticsDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import java.util.List;
 
 /**
@@ -16,18 +18,25 @@ import java.util.List;
  * @date 2021-11-09
  */
 @Service
-public class FireDangerDayStatisticsServiceImpl extends BaseService<FireDangerDayStatisticsDto,FireDangerDayStatistics,FireDangerDayStatisticsMapper> implements IFireDangerDayStatisticsService {
-    /**
-     * 分页查询
-     */
-    public Page<FireDangerDayStatisticsDto> queryForFireDangerDayStatisticsPage(Page<FireDangerDayStatisticsDto> page)   {
-        return this.queryForPage(page, null, false);
-    }
+public class FireDangerDayStatisticsServiceImpl extends BaseService<FireDangerDayStatisticsDto, FireDangerDayStatistics, FireDangerDayStatisticsMapper> implements IFireDangerDayStatisticsService {
 
     /**
      * 列表查询 示例
      */
-    public List<FireDangerDayStatisticsDto> queryForFireDangerDayStatisticsList()   {
-        return this.queryForList("" , false);
+    public List<FireDangerDayStatisticsDto> queryForFireDangerDayStatisticsList() {
+        return this.queryForList("", false);
+    }
+
+    public int createDangerTimesCount(String stationCode, String beginDate, String endDate) {
+        LambdaQueryWrapper<FireDangerDayStatistics> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(stationCode),FireDangerDayStatistics::getStationCode, stationCode);
+        wrapper.ge(FireDangerDayStatistics::getCollectDate, beginDate);
+        wrapper.le(FireDangerDayStatistics::getCollectDate, endDate);
+        List<FireDangerDayStatistics> list = this.list(wrapper);
+        return list.stream().mapToInt(FireDangerDayStatistics::getDangerTimes).sum();
+    }
+
+    public List<String> dangerTimesTrend(String stationCode, String beginDate, String endDate) {
+        return this.baseMapper.queryDangerTimesTrend(stationCode,beginDate,endDate);
     }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireLatentDangerServiceImpl.java

 package com.yeejoin.amos.boot.module.ccs.biz.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.yeejoin.amos.boot.module.ccs.api.dto.BaseDto;
-import com.yeejoin.amos.boot.module.ccs.api.entity.BaseEntity;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireLatentDangerDto;
 import com.yeejoin.amos.boot.module.ccs.api.entity.FireLatentDanger;
 import com.yeejoin.amos.boot.module.ccs.api.mapper.FireLatentDangerMapper;
 import com.yeejoin.amos.boot.module.ccs.api.service.IFireLatentDangerService;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireLatentDangerDto;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -22,20 +20,30 @@ import java.util.stream.Collectors;
  * @date 2021-11-09
  */
 @Service
-public class FireLatentDangerServiceImpl extends BaseService<FireLatentDangerDto,FireLatentDanger,FireLatentDangerMapper> implements IFireLatentDangerService {
+public class FireLatentDangerServiceImpl extends BaseService<FireLatentDangerDto, FireLatentDanger, FireLatentDangerMapper> implements IFireLatentDangerService {
     /**
      * 分页查询
      */
-    public Page<FireLatentDangerDto> queryForFireLatentDangerPage(Page<FireLatentDangerDto> page)   {
+    public Page<FireLatentDangerDto> queryForFireLatentDangerPage(Page<FireLatentDangerDto> page) {
         return this.queryForPage(page, null, false);
     }
 
     /**
      * 列表查询 示例
-     * @param top 取值
+     *
+     * @param top         取值
      * @param stationCode 站code
      */
-    public List<FireLatentDangerDto> queryForFireLatentDangerList(Long top, String stationCode )   {
-       return this.getBaseMapper().queryDangerList(top,stationCode);
+    public List<FireLatentDangerDto> queryForFireLatentDangerList(Long top, String stationCode) {
+        return this.baseMapper.queryDangerList(top, stationCode);
+    }
+
+    public Map<String, Object> dangerStateGroupMap(String stationCode) {
+        List<Map<String, Object>> list = this.baseMapper.dangerStateGroupMap(stationCode);
+        Map<String, Object> result = new LinkedHashMap<>();
+        list.forEach(m -> {
+            result.put(m.get("dangerState").toString(), m.get("num"));
+        });
+        return result;
     }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireVehicleServiceImpl.java

@@ -10,8 +10,6 @@ import org.typroject.tyboot.core.rdbms.annotation.Condition;
 import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-import java.util.List;
-
 /**
  * 消防车辆信息服务实现类
  *
@@ -24,13 +22,6 @@ public class FireVehicleServiceImpl extends BaseService<FireVehicleDto, FireVehi
      * 分页查询
      */
     public Page<FireVehicleDto> queryForFireVehiclePage(Page<FireVehicleDto> page, @Condition(Operator.like) String name, String stationCode) {
-        return this.queryForPage(page, "createDate", false, name, stationCode);
-    }
-
-    /**
-     * 列表查询 示例
-     */
-    public List<FireVehicleDto> queryForFireVehicleList() {
-        return this.queryForList("", false);
+        return this.queryForPage(page, "create_date", false, name, stationCode);
     }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireVideoServiceImpl.java

@@ -23,14 +23,8 @@ public class FireVideoServiceImpl extends BaseService<FireVideoDto, FireVideo, F
     /**
      * 分页查询
      */
-    public Page<FireVideoDto> queryForFireVideoPage(Page<FireVideoDto> page, @Condition(Operator.like) String name, String stationCode) {
-        return this.queryForPage(page, "createDate", false, name, stationCode);
+    public Page<FireVideoDto> queryForFireVideoPage(Page<FireVideoDto> page, @Condition(Operator.like) String name, String stationCode, @Condition(Operator.in) List<String> buildingMrid) {
+        return this.queryForPage(page, "create_date", false, name, stationCode, buildingMrid);
     }
 
-    /**
-     * 列表查询 示例
-     */
-    public List<FireVideoDto> queryForFireVideoList() {
-        return this.queryForList("", false);
-    }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireWaterServiceImpl.java

@@ -24,7 +24,7 @@ public class FireWaterServiceImpl extends BaseService<FireWaterDto, FireWater, F
      * 分页查询
      */
     public Page<FireWaterDto> queryForFireWaterPage(Page<FireWaterDto> page, @Condition(Operator.like) String name, String stationCode) {
-        return this.queryForPage(page, "createDate", false, name, stationCode);
+        return this.queryForPage(page, "create_date", false, name, stationCode);
     }
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/StatisticsServiceImpl.java

+package com.yeejoin.amos.boot.module.ccs.biz.service.impl;
+
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.module.ccs.api.service.IStatisticsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author DELL
+ */
+@Service
+public class StatisticsServiceImpl implements IStatisticsService {
+
+    @Autowired
+    FireAlarmDayStatisticsServiceImpl fireAlarmDayStatisticsService;
+
+    @Autowired
+    FireDangerDayStatisticsServiceImpl fireDangerDayStatisticsService;
+
+
+    @Override
+    public Map<String, Object> alarmAndDangerNumCount(String stationCode) throws ParseException {
+        //本周开始日期
+        Date weekBegin = DateUtils.beginDateOfWeek(new Date());
+        //今日告警
+        Integer todayAddAlarm = fireAlarmDayStatisticsService.alarmTimesCount(stationCode, DateUtils.dateFormat(new Date(), DateUtils.DATE_PATTERN), DateUtils.dateFormat(new Date(), DateUtils.DATE_PATTERN));
+        //本周告警数量
+        Integer weekAddAlarm = fireAlarmDayStatisticsService.alarmTimesCount(stationCode, DateUtils.dateFormat(weekBegin, DateUtils.DATE_PATTERN), DateUtils.dateFormat(new Date(), DateUtils.DATE_PATTERN));
+        //今日新增隐患
+        Integer todayAddDanger = fireDangerDayStatisticsService.createDangerTimesCount(stationCode, DateUtils.dateFormat(new Date(), DateUtils.DATE_PATTERN), DateUtils.dateFormat(new Date(), DateUtils.DATE_PATTERN));
+        //本周新增隐患
+        Integer weekAddDanger = fireDangerDayStatisticsService.createDangerTimesCount(stationCode, DateUtils.dateFormat(weekBegin, DateUtils.DATE_PATTERN), DateUtils.dateFormat(new Date(), DateUtils.DATE_PATTERN));
+        Map<String, Object> result = new HashMap<>();
+        result.put("todayAddAlarm", todayAddAlarm);
+        result.put("weekAddAlarm", weekAddAlarm);
+        result.put("todayAddDanger", todayAddDanger);
+        result.put("weekAddDanger", weekAddDanger);
+        return result;
+    }
+
+    @Override
+    public Map<String, Object> alarmAndDangerTrend(String stationCode, String beginDate, String endDate) {
+        //告警增长趋势
+        List<String> alarmTrend = fireAlarmDayStatisticsService.alarmTimesTrend(stationCode, beginDate, endDate);
+        //隐患增加趋势
+        List<String> dangerTrend = fireDangerDayStatisticsService.dangerTimesTrend(stationCode, beginDate, endDate);
+        Map<String, Object> result = new HashMap<>();
+        result.put("alarmTrend", alarmTrend);
+        result.put("dangerTrend", dangerTrend);
+        return result;
+    }
+}

amos-boot-system-ccs/src/main/resources/application.properties

-spring.application.name=AMOS-BIZ-API-CCS
+spring.application.name=AMOS-BIZ-CCS-API
 server.servlet.context-path=/ccs
 server.port=8807
 spring.profiles.active=dev