1

smart-steward-api/src/main/java/com/smartSteward/web/controller/security/SecurityStatisticsController.java

@@ -17,11 +17,12 @@ import org.springframework.web.bind.annotation.RestController;
  * @author smart-steward
  */
 @RestController
-@Api(value = "摄像头安全统计",tags = "摄像头安全统计")
+@Api(value = "摄像头安全统计", tags = "摄像头安全统计")
 @RequestMapping("/security/statistics")
 public class SecurityStatisticsController extends BaseController {
     @Autowired
-   private ISecurityStatisticsService securityStatisticsService;
+    private ISecurityStatisticsService securityStatisticsService;
+
     /**
      * 检测统计
      *
@@ -29,10 +30,10 @@ public class SecurityStatisticsController extends BaseController {
      */
     @ApiOperation("查询检测统计")
     @GetMapping("/detect")
-    public AjaxResult detect(@RequestParam(required = false) Long stationId)
-    {
+    public AjaxResult detect(@RequestParam(required = false) Long stationId) {
         return success(securityStatisticsService.selectDetectStatistics(stationId));
     }
+
     /**
      * 查询每个分类的预警未处理数量
      *
@@ -40,8 +41,7 @@ public class SecurityStatisticsController extends BaseController {
      */
     @ApiOperation("查询每个分类的预警未处理数量")
     @GetMapping("/warning")
-    public AjaxResult warning(@RequestParam(required = false) Long stationId)
-    {
+    public AjaxResult warning(@RequestParam(required = false) Long stationId) {
         return success(securityStatisticsService.selectWarningStatistics(stationId));
     }
 }

smart-steward-mapper/src/main/java/com/smartSteward/mapper/security/SecurityAlertMapper.java

@@ -87,4 +87,12 @@ public interface SecurityAlertMapper
       */
     @DataSource(DataSourceType.SLAVE)
     public List<HashMap<String, Object>> selectWarningStatistics(@Param("stationId") Long stationId);
+     /**
+      * 查询本月每个分类的预警未处理数量
+      *
+      * @param stationId 站点ID
+      * @return 结果
+      */
+    @DataSource(DataSourceType.SLAVE)
+    public List<HashMap<String, Object>> selectMonthWarningStatistics(@Param("stationId") Long stationId);
 }

smart-steward-mapper/src/main/resources/mapper/security/SecurityAlertMapper.xml

@@ -225,6 +225,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         group by alert_type
     </select>
 
+    <select id="selectMonthWarningStatistics" parameterType="Long" resultType="HashMap">
+        select alert_type as alertType, count(*) as count from security_alert
+         <where>
+            and  status='unhandled'
+             <if test="stationId != null">and station_id = #{stationId}</if>
+             and alert_time between date_format(now(), '%Y-%m-01') and date_format(now(), '%Y-%m-%d')
+         </where>
+        group by alert_type
+    </select>
+
 
 
 

smart-steward-service/src/main/java/com/smartSteward/service/security/impl/SecurityStatisticsServiceImpl.java

@@ -55,6 +55,8 @@ public class SecurityStatisticsServiceImpl implements ISecurityStatisticsService
     public List<HashMap<String, Object>> selectWarningStatistics(Long stationId) {
         List<HashMap<String, Object>> statistics =new ArrayList<>();
         List<HashMap<String, Object>> warningStatistics = alertMapper.selectWarningStatistics(stationId);
+        //查询本月每个类型的数量
+        List<HashMap<String, Object>> monthStatistics = alertMapper.selectMonthWarningStatistics(stationId);
         List<SysDictData > alertTypes = DictUtils.getDictCache("warning_type");
         if (alertTypes != null) {
            for (SysDictData alertType : alertTypes) {
@@ -62,6 +64,14 @@ public class SecurityStatisticsServiceImpl implements ISecurityStatisticsService
                map.put("alertType", alertType.getDictValue());
                map.put("alertTypeName", alertType.getDictLabel());
                map.put("count", 0);
+               map.put("monthCount", 0);
+               //查询本月每个类型的数量
+               for (HashMap<String, Object> monthStatistic : monthStatistics) {
+                   if (monthStatistic.get("alertType").equals(alertType.getDictValue())) {
+                       map.put("monthCount", monthStatistic.get("count"));
+                       break;
+                   }
+               }
                for (HashMap<String, Object> warningStatistic : warningStatistics) {
                    if (warningStatistic.get("alertType").equals(alertType.getDictValue())) {
                        map.put("count", warningStatistic.get("count"));