首页

src/main/java/com/iden/bms/controller/HomePageController.java

@@ -30,12 +30,12 @@ public class HomePageController {
     @Autowired
     private HomePageService homePageService;
 
-    @GetMapping("/queryHomPageCount")
+    @GetMapping("/queryHomPageTotal")
     @ApiOperation(value = "查询首页汇总值")
-    public Result<HomPageCountVO> queryHomPageCount(HttpServletRequest request, @RequestHeader(value = "token") String token){
+    public Result<HomPageStaVO> queryHomPageTotal(HttpServletRequest request, @RequestHeader(value = "token") String token){
         try {
             UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            HomPageCountVO datas = this.homePageService.queryHomPageCount(loginUser);
+            HomPageStaVO datas = this.homePageService.queryHomPageTotal(loginUser);
             return Result.success(datas);
         }catch (Exception e) {
             log.error("首页管理: 查询首页汇总值出现异常",e);
@@ -43,40 +43,40 @@ public class HomePageController {
         }
     }
 
-    @GetMapping("/queryWarningPersonRate")
-    @ApiOperation(value = "查询预警人员占比")
-    public Result<HomePageWarningPersonRateVO> queryWarningPersonRate(HttpServletRequest request, @RequestHeader(value = "token") String token){
+    @GetMapping("/queryWarningPersonRateStat")
+    @ApiOperation(value = "查询预警人员占比统计")
+    public Result<List<HomePageWarningStaVO>> queryWarningPersonRateStat(HttpServletRequest request, @RequestHeader(value = "token") String token){
         try {
             UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            HomePageWarningPersonRateVO datas = this.homePageService.queryWarningPersonRate(loginUser);
+            List<HomePageWarningStaVO> datas = this.homePageService.queryWarningPersonRateStat(loginUser);
             return Result.success(datas);
         }catch (Exception e) {
-            log.error("首页管理: 查询预警人员占比出现异常",e);
+            log.error("首页管理: 查询预警人员占比统计出现异常",e);
             return Result.error( "获取数据失败");
         }
     }
 
 
-    @GetMapping("/queryWarningEventRate")
-    @ApiOperation(value = "查询预警事件占比")
-    public Result<HomePageWarningEventRateVO> queryWarningEventRate(HttpServletRequest request, @RequestHeader(value = "token") String token){
+    @GetMapping("/queryWarningEventRateStat")
+    @ApiOperation(value = "查询预警事件占比统计")
+    public Result<List<HomePageWarningStaVO>> queryWarningEventRateStat(HttpServletRequest request, @RequestHeader(value = "token") String token){
         try {
             UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            HomePageWarningEventRateVO datas = this.homePageService.queryWarningEventRate(loginUser);
+            List<HomePageWarningStaVO> datas = this.homePageService.queryWarningEventRateStat(loginUser);
             return Result.success(datas);
         }catch (Exception e) {
-            log.error("首页管理: 查询预警事件占比出现异常",e);
+            log.error("首页管理: 查询预警事件占比统计出现异常",e);
             return Result.error( "获取数据失败");
         }
     }
 
 
-    @GetMapping("/listLastWeekSta")
-    @ApiOperation(value = "查询上周统计")
-    public Result<List<HomPageLastWeekCountVO>> listLastWeekSta(HttpServletRequest request, @RequestHeader(value = "token") String token){
+    @GetMapping("/listLastWeekFaceImageSta")
+    @ApiOperation(value = "查询上周人脸抓拍统计")
+    public Result<List<HomPageLastWeekFaceImageStatVO>> listLastWeekFaceImageSta(HttpServletRequest request, @RequestHeader(value = "token") String token){
         try {
             UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            List<HomPageLastWeekCountVO> datas = this.homePageService.listLastWeekSta(loginUser);
+            List<HomPageLastWeekFaceImageStatVO> datas = this.homePageService.listLastWeekFaceImageSta(loginUser);
             return Result.success(datas);
         }catch (Exception e) {
             log.error("首页管理: 查询上周统计出现异常",e);
@@ -84,6 +84,43 @@ public class HomePageController {
         }
     }
 
+    @GetMapping("/listLastWeekStrangerFaceImageSta")
+    @ApiOperation(value = "查询上周陌生人脸抓拍统计")
+    public Result<List<HomPageLastWeekFaceImageStatVO>> listLastWeekStrangerFaceImageSta(HttpServletRequest request, @RequestHeader(value = "token") String token){
+        try {
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            List<HomPageLastWeekFaceImageStatVO> datas = this.homePageService.listLastWeekStrangerFaceImageSta(loginUser);
+            return Result.success(datas);
+        }catch (Exception e) {
+            log.error("首页管理: 查询上周陌生人脸抓拍统计出现异常",e);
+            return Result.error( "获取列表失败");
+        }
+    }
+
+    @GetMapping("/listLastWeekKeynoteFaceImageSta")
+    @ApiOperation(value = "查询上周重点人脸抓拍统计")
+    public Result<List<HomPageLastWeekFaceImageStatVO>> listLastWeekKeynoteFaceImageSta(HttpServletRequest request, @RequestHeader(value = "token") String token){
+        try {
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            List<HomPageLastWeekFaceImageStatVO> datas = this.homePageService.listLastWeekKeynoteFaceImageSta(loginUser);
+            return Result.success(datas);
+        }catch (Exception e) {
+            log.error("首页管理: 查询上周重点人脸抓拍统计出现异常",e);
+            return Result.error( "获取列表失败");
+        }
+    }
 
+    @GetMapping("/listLastWeekStrangerFaceImageSta")
+    @ApiOperation(value = "查询上周昼伏夜出人脸抓拍统计")
+    public Result<List<HomPageLastWeekFaceImageStatVO>> listLastWeekEventComingFaceImageSta(HttpServletRequest request, @RequestHeader(value = "token") String token){
+        try {
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            List<HomPageLastWeekFaceImageStatVO> datas = this.homePageService.listLastWeekEventComingFaceImageSta(loginUser);
+            return Result.success(datas);
+        }catch (Exception e) {
+            log.error("首页管理: 查询上周昼伏夜出人脸抓拍统计出现异常",e);
+            return Result.error( "获取列表失败");
+        }
+    }
 
 }

src/main/java/com/iden/bms/controller/WarningStaController.java

@@ -41,6 +41,7 @@ public class WarningStaController {
     @GetMapping("/listWarningSta")
     @ApiOperation(value = "预警统计列表分页 ")
     @ApiImplicitParams(value = {
+            @ApiImplicitParam(paramType = "query", name = "type", value = "预警类型，1 陌生人员预警 2重点人员预警 3常住人员预警 4昼伏夜出人员预警"),
             @ApiImplicitParam(paramType = "query", name = "district", value = "所属区域"),
             @ApiImplicitParam(paramType = "query", name = "subdistrict", value = "所属街道"),
             @ApiImplicitParam(paramType = "query", name = "communityName", value = "小区名称"),
@@ -49,6 +50,7 @@ public class WarningStaController {
 
     })
     public PageResult<List<WarningStaVO>> listWarningSta(HttpServletRequest request, @RequestHeader(value = "token") String token,
+                                                         @RequestParam(value = "type", required = true) String type,
                                                          @RequestParam(value = "district", required = false) String district,
                                                          @RequestParam(value = "subdistrict", required = false) String subdistrict,
                                                          @RequestParam(value = "communityName", required = false) String communityName,
@@ -57,7 +59,7 @@ public class WarningStaController {
                                                          PageReqVO pageReqVo){
         try {
             UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<WarningStaVO> pageResponse = this.warningStaService.listWarningSta(district,subdistrict,communityName,beginDate,endDate,loginUser ,pageReqVo);
+            IPage<WarningStaVO> pageResponse = this.warningStaService.listWarningSta(type,district,subdistrict,communityName,beginDate,endDate,loginUser ,pageReqVo);
             return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
         }catch (BDException e) {
             log.error("预警统计列表查询-分页列表出现异常",e);

src/main/java/com/iden/bms/service/HomePageService.java

@@ -2,11 +2,13 @@ package com.iden.bms.service;
 
 
 
+import com.iden.common.service.IdenFaceImageService;
+import com.iden.common.service.IdenWarningEventService;
+import com.iden.common.service.IdenWarningStaService;
 import com.iden.common.vo.*;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -16,34 +18,53 @@ import java.util.List;
  */
 @Service
 public class HomePageService {
+    @Resource
+    private IdenFaceImageService idenFaceImageService;
+    @Resource
+    private IdenWarningStaService idenWarningStaService;
+    @Resource
+    private IdenWarningEventService idenWarningEventService;
+
+    public HomPageStaVO queryHomPageTotal(UserLoginedConvertVO loginUser){
+        HomPageStaVO homPageStaVO = new HomPageStaVO();
+        idenFaceImageService.queryHomPageTotal();
+        return homPageStaVO;
+    }
 
+    public List<HomePageWarningStaVO> queryWarningPersonRateStat(UserLoginedConvertVO loginUser){
+        List<HomePageWarningStaVO> homePageWarningStaVOList = idenWarningStaService.queryWarningPersonRateSta();
 
-    public HomPageCountVO queryHomPageCount(UserLoginedConvertVO loginUser){
-        HomPageCountVO homPageCountVO = new HomPageCountVO();
-
-        return homPageCountVO;
+        return homePageWarningStaVOList;
     }
 
-    public HomePageWarningPersonRateVO queryWarningPersonRate(UserLoginedConvertVO loginUser){
-        HomePageWarningPersonRateVO homePageWarningPersonRateVO = new HomePageWarningPersonRateVO();
+    public List<HomePageWarningStaVO> queryWarningEventRateStat(UserLoginedConvertVO loginUser){
+        List<HomePageWarningStaVO> homePageWarningStaVOList = idenWarningEventService.queryWarningEventRateStat();
 
-        return homePageWarningPersonRateVO;
+        return homePageWarningStaVOList;
     }
 
-    public HomePageWarningEventRateVO queryWarningEventRate(UserLoginedConvertVO loginUser){
-        HomePageWarningEventRateVO homePageWarningEventRateVO = new HomePageWarningEventRateVO();
+    public List<HomPageLastWeekFaceImageStatVO> listLastWeekFaceImageSta(UserLoginedConvertVO loginUser){
+        List<HomPageLastWeekFaceImageStatVO> lastWeekCountVOS = idenFaceImageService.listLastWeekFaceImageSta();
 
-        return homePageWarningEventRateVO;
+        return lastWeekCountVOS;
     }
 
-    public List<HomPageLastWeekCountVO> listLastWeekSta(UserLoginedConvertVO loginUser){
-        List<HomPageLastWeekCountVO> lastWeekCountVOS = new ArrayList<>();
-
+    public List<HomPageLastWeekFaceImageStatVO> listLastWeekStrangerFaceImageSta(UserLoginedConvertVO loginUser){
+        List<HomPageLastWeekFaceImageStatVO> lastWeekCountVOS = idenFaceImageService.listLastWeekStrangerFaceImageSta();
 
+        return lastWeekCountVOS;
+    }
 
+    public List<HomPageLastWeekFaceImageStatVO> listLastWeekKeynoteFaceImageSta(UserLoginedConvertVO loginUser){
+        List<HomPageLastWeekFaceImageStatVO> lastWeekCountVOS = idenFaceImageService.listLastWeekKeynoteFaceImageSta();
 
         return lastWeekCountVOS;
     }
 
+    public List<HomPageLastWeekFaceImageStatVO> listLastWeekEventComingFaceImageSta(UserLoginedConvertVO loginUser){
+        List<HomPageLastWeekFaceImageStatVO> lastWeekCountVOS = idenFaceImageService.listLastWeekEventComingFaceImageSta();
+
+        return lastWeekCountVOS;
+    }
 
 }

src/main/java/com/iden/bms/service/WarningStaService.java

@@ -35,10 +35,11 @@ public class WarningStaService {
      * 查询预警统计列表
      * @return
              */
-    public IPage<WarningStaVO> listWarningSta(String district, String subdistrict, String communityName, String beginDate, String endDate, UserLoginedConvertVO loginUser, PageReqVO pageReqVo) {
+    public IPage<WarningStaVO> listWarningSta(String type,String district, String subdistrict, String communityName, String beginDate, String endDate, UserLoginedConvertVO loginUser, PageReqVO pageReqVo) {
             IPage<IdenWarningSta> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
             QueryWrapper<IdenWarningSta> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().like(StrUtil.isNotEmpty(communityName),IdenWarningSta::getCommunityName,communityName)
+            queryWrapper.lambda().eq(IdenWarningSta::getType,type)
+                    .like(StrUtil.isNotEmpty(communityName),IdenWarningSta::getCommunityName,communityName)
                     .eq(StrUtil.isNotEmpty(district),IdenWarningSta::getDistrict,district)
                     .eq(StrUtil.isNotEmpty(subdistrict),IdenWarningSta::getSubdistrict,subdistrict)
                     .ge(StrUtil.isNotEmpty(beginDate),IdenWarningSta::getDataDate,beginDate)
@@ -53,10 +54,7 @@ public class WarningStaService {
                 "max(district) district",
                 "max(subdistrict) subdistrict",
                 "max(data_date) dataDate",
-                "IFNULL(SUM(evening_come_count),0) eveningComeCount",
-                "IFNULL(SUM(keynote_count),0) keynoteCount",
-                "IFNULL(SUM(permanent_count),0) permanentCount",
-                "IFNULL(SUM(stranger_count),0) strangerCount"
+                "IFNULL(SUM(total),0) total"
         );
 
             IPage<IdenWarningSta> pageRes = this.idenWarningStaService.page(page, queryWrapper);

src/main/java/com/iden/common/entity/IdenWarningSta.java

@@ -22,7 +22,7 @@ import lombok.experimental.Accessors;
  * 预警统计表(IdenWarningSta)实体类
  *
  * @author makejava
- * @since 2021-12-27 01:27:16
+ * @since 2021-12-27 13:48:29
  */
 
 @Data
@@ -31,12 +31,17 @@ import lombok.experimental.Accessors;
 @TableName("iden_warning_sta")
 @ApiModel(value = "预警统计表", description = "")
 public class IdenWarningSta implements Serializable {
-    private static final long serialVersionUID = 220466040459159324L;
+    private static final long serialVersionUID = -62702795432580583L;
 
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
 
 
+    @ApiModelProperty("数据日期")
+    @TableField("DATA_DATE")
+    private Date dataDate;
+
+
     @ApiModelProperty("所属小区id")
     @TableField("COMMUNITY_ID")
     private Long communityId;
@@ -62,29 +67,14 @@ public class IdenWarningSta implements Serializable {
     private String subdistrict;
 
 
-    @ApiModelProperty("重点人员总数")
-    @TableField("KEYNOTE_COUNT")
-    private Long keynoteCount;
-
-
-    @ApiModelProperty("大于7天未出现常住人总数")
-    @TableField("PERMANENT_COUNT")
-    private Long permanentCount;
+    @ApiModelProperty("预警类型，1 陌生人员预警 2重点人员预警 3常住人员预警 4昼伏夜出人员预警")
+    @TableField("TYPE")
+    private String type;
 
 
-    @ApiModelProperty("昼伏夜出人员总数")
-    @TableField("EVENING_COME_COUNT")
-    private Long eveningComeCount;
-
-
-    @ApiModelProperty("陌生人总数")
-    @TableField("STRANGER_COUNT")
-    private Long strangerCount;
-
-
-    @ApiModelProperty("数据日期")
-    @TableField("DATA_DATE")
-    private Date dataDate;
+    @ApiModelProperty("人员总数")
+    @TableField("TOTAL")
+    private Long total;
 
 
     @ApiModelProperty("createTime")

src/main/java/com/iden/common/enums/PersonTypeEnum.java

@@ -13,7 +13,8 @@ public enum PersonTypeEnum {
      */
     STRANGER("0","陌生人员"),
     KEYNOTE("1","重点人员"),
-    COMMUNITY("2","小区人员");
+    COMMUNITY("2","小区人员"),
+    EVENT_COMMING("3","昼伏夜出人员");
     private String value;
     private String name;
     PersonTypeEnum(String value, String name) {
@@ -31,7 +32,7 @@ public enum PersonTypeEnum {
 
         String names = "";
         String[] types = code.split(",");
-        if(types.length > 0){
+        if (types.length > 0){
             for(String type : types){
                 if (STRANGER.getValue().equals(type)){
                     names += STRANGER.name + ",";
@@ -39,6 +40,8 @@ public enum PersonTypeEnum {
                     names += KEYNOTE.name + ",";
                 } else if (COMMUNITY.getValue().equals(type)){
                     names += COMMUNITY.name + ",";
+                } else if (EVENT_COMMING.getValue().equals(type)){
+                    names += EVENT_COMMING.name + ",";
                 }
             }
         }

src/main/java/com/iden/common/mapper/IdenFaceImageMapper.java

@@ -2,6 +2,10 @@ package com.iden.common.mapper;
 
 import com.iden.common.entity.IdenFaceImage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.iden.common.vo.HomPageLastWeekFaceImageStatVO;
+import com.iden.common.vo.HomPageStaVO;
+
+import java.util.List;
 
 
 /**
@@ -11,5 +15,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2021-12-24 16:24:43
  */
 public interface IdenFaceImageMapper extends BaseMapper<IdenFaceImage> {
-
+    HomPageStaVO queryHomPageTotal();
+    List<HomPageLastWeekFaceImageStatVO> listLastWeekFaceImageSta();
+    List<HomPageLastWeekFaceImageStatVO> listLastWeekStrangerFaceImageSta();
+    List<HomPageLastWeekFaceImageStatVO> listLastWeekKeynoteFaceImageSta();
+    List<HomPageLastWeekFaceImageStatVO> listLastWeekEventComingFaceImageSta();
 }

src/main/java/com/iden/common/mapper/IdenWarningEventMapper.java

@@ -2,6 +2,9 @@ package com.iden.common.mapper;
 
 import com.iden.common.entity.IdenWarningEvent;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.iden.common.vo.HomePageWarningStaVO;
+
+import java.util.List;
 
 
 /**
@@ -11,5 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2021-12-27 12:50:33
  */
 public interface IdenWarningEventMapper extends BaseMapper<IdenWarningEvent> {
-
+    List<HomePageWarningStaVO> queryWarningEventRateStat();
 }

src/main/java/com/iden/common/mapper/IdenWarningPersonMapper.java

@@ -2,6 +2,9 @@ package com.iden.common.mapper;
 
 import com.iden.common.entity.IdenWarningPerson;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.iden.common.vo.HomePageWarningStaVO;
+
+import java.util.List;
 
 
 /**

src/main/java/com/iden/common/mapper/IdenWarningStaMapper.java

@@ -2,14 +2,17 @@ package com.iden.common.mapper;
 
 import com.iden.common.entity.IdenWarningSta;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.iden.common.vo.HomePageWarningStaVO;
+
+import java.util.List;
 
 
 /**
  * 预警统计表(IdenWarningSta)表数据库访问层
  *
  * @author makejava
- * @since 2021-12-27 01:27:26
+ * @since 2021-12-27 13:32:24
  */
 public interface IdenWarningStaMapper extends BaseMapper<IdenWarningSta> {
-
+    List<HomePageWarningStaVO> queryWarningPersonRateSta();
 }

src/main/java/com/iden/common/service/IdenFaceImageService.java

@@ -2,6 +2,10 @@ package com.iden.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.iden.common.entity.IdenFaceImage;
+import com.iden.common.vo.HomPageLastWeekFaceImageStatVO;
+import com.iden.common.vo.HomPageStaVO;
+
+import java.util.List;
 
 /**
  * 人脸图像表(IdenFaceImage)表服务接口
@@ -10,5 +14,13 @@ import com.iden.common.entity.IdenFaceImage;
  * @since 2021-12-24 16:24:43
  */
 public interface IdenFaceImageService extends IService<IdenFaceImage> {
+    HomPageStaVO queryHomPageTotal();
+
+    List<HomPageLastWeekFaceImageStatVO> listLastWeekFaceImageSta();
+
+    List<HomPageLastWeekFaceImageStatVO> listLastWeekStrangerFaceImageSta();
+
+    List<HomPageLastWeekFaceImageStatVO> listLastWeekKeynoteFaceImageSta();
 
+    List<HomPageLastWeekFaceImageStatVO> listLastWeekEventComingFaceImageSta();
 }

src/main/java/com/iden/common/service/IdenWarningEventService.java

@@ -2,6 +2,9 @@ package com.iden.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.iden.common.entity.IdenWarningEvent;
+import com.iden.common.vo.HomePageWarningStaVO;
+
+import java.util.List;
 
 /**
  * 预警事件表(IdenWarningEvent)表服务接口
@@ -10,5 +13,5 @@ import com.iden.common.entity.IdenWarningEvent;
  * @since 2021-12-27 12:50:33
  */
 public interface IdenWarningEventService extends IService<IdenWarningEvent> {
-
+    List<HomePageWarningStaVO> queryWarningEventRateStat();
 }

src/main/java/com/iden/common/service/IdenWarningPersonService.java

@@ -2,6 +2,9 @@ package com.iden.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.iden.common.entity.IdenWarningPerson;
+import com.iden.common.vo.HomePageWarningStaVO;
+
+import java.util.List;
 
 /**
  * 预警人员表(IdenWarningPerson)表服务接口

src/main/java/com/iden/common/service/IdenWarningStaService.java

@@ -2,13 +2,16 @@ package com.iden.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.iden.common.entity.IdenWarningSta;
+import com.iden.common.vo.HomePageWarningStaVO;
+
+import java.util.List;
 
 /**
  * 预警统计表(IdenWarningSta)表服务接口
  *
  * @author makejava
- * @since 2021-12-27 01:27:26
+ * @since 2021-12-27 13:32:24
  */
 public interface IdenWarningStaService extends IService<IdenWarningSta> {
-
+    List<HomePageWarningStaVO> queryWarningPersonRateSta();
 }

src/main/java/com/iden/common/service/impl/IdenFaceImageServiceImpl.java

@@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.iden.common.mapper.IdenFaceImageMapper;
 import com.iden.common.entity.IdenFaceImage;
 import com.iden.common.service.IdenFaceImageService;
+import com.iden.common.vo.HomPageLastWeekFaceImageStatVO;
+import com.iden.common.vo.HomPageStaVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 人脸图像表(IdenFaceImage)表服务实现类
  *
@@ -14,5 +18,28 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class IdenFaceImageServiceImpl extends ServiceImpl<IdenFaceImageMapper, IdenFaceImage> implements IdenFaceImageService {
+    @Override
+    public HomPageStaVO queryHomPageTotal(){
+        return this.baseMapper.queryHomPageTotal();
+    }
+
+    @Override
+    public List<HomPageLastWeekFaceImageStatVO> listLastWeekFaceImageSta(){
+        return this.baseMapper.listLastWeekFaceImageSta();
+    }
+
+    @Override
+    public List<HomPageLastWeekFaceImageStatVO> listLastWeekStrangerFaceImageSta(){
+        return this.baseMapper.listLastWeekStrangerFaceImageSta();
+    }
+
+    @Override
+    public List<HomPageLastWeekFaceImageStatVO> listLastWeekKeynoteFaceImageSta(){
+        return this.baseMapper.listLastWeekKeynoteFaceImageSta();
+    }
 
+    @Override
+    public List<HomPageLastWeekFaceImageStatVO> listLastWeekEventComingFaceImageSta(){
+        return this.baseMapper.listLastWeekEventComingFaceImageSta();
+    }
 }

src/main/java/com/iden/common/service/impl/IdenWarningEventServiceImpl.java

@@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.iden.common.mapper.IdenWarningEventMapper;
 import com.iden.common.entity.IdenWarningEvent;
 import com.iden.common.service.IdenWarningEventService;
+import com.iden.common.vo.HomePageWarningStaVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 预警事件表(IdenWarningEvent)表服务实现类
  *
@@ -14,5 +17,8 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class IdenWarningEventServiceImpl extends ServiceImpl<IdenWarningEventMapper, IdenWarningEvent> implements IdenWarningEventService {
-
+    @Override
+    public List<HomePageWarningStaVO> queryWarningEventRateStat() {
+        return this.baseMapper.queryWarningEventRateStat();
+    }
 }

src/main/java/com/iden/common/service/impl/IdenWarningPersonServiceImpl.java

@@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.iden.common.mapper.IdenWarningPersonMapper;
 import com.iden.common.entity.IdenWarningPerson;
 import com.iden.common.service.IdenWarningPersonService;
+import com.iden.common.vo.HomePageWarningStaVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 预警人员表(IdenWarningPerson)表服务实现类
  *

src/main/java/com/iden/common/service/impl/IdenWarningStaServiceImpl.java

@@ -4,15 +4,20 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.iden.common.mapper.IdenWarningStaMapper;
 import com.iden.common.entity.IdenWarningSta;
 import com.iden.common.service.IdenWarningStaService;
+import com.iden.common.vo.HomePageWarningStaVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 预警统计表(IdenWarningSta)表服务实现类
  *
  * @author makejava
- * @since 2021-12-27 01:27:30
+ * @since 2021-12-27 13:32:26
  */
 @Service
 public class IdenWarningStaServiceImpl extends ServiceImpl<IdenWarningStaMapper, IdenWarningSta> implements IdenWarningStaService {
-
+    public List<HomePageWarningStaVO> queryWarningPersonRateSta(){
+        return this.baseMapper.queryWarningPersonRateSta();
+    }
 }

src/main/java/com/iden/common/vo/HomPageLastWeekCountVO.java

@@ -16,22 +16,13 @@ import java.io.Serializable;
 
 @Data
 @ApiModel(value = "首页上周汇总值", description = "")
-public class HomPageLastWeekCountVO implements Serializable {
+public class HomPageLastWeekFaceImageStatVO implements Serializable {
     private static final long serialVersionUID = -44732106174401548L;
 
     @ApiModelProperty("周几")
     private String weekDay;
 
     @ApiModelProperty("上周人脸抓拍统计")
-    private Long lastWeekFaceImageCount;
-
-    @ApiModelProperty("上周陌生人脸抓拍统计")
-    private Long lastWeekStrangerFaceImageCount;
-
-    @ApiModelProperty("上周重点人员人脸抓拍统计")
-    private Long lastWeekKeynoteFaceImageCount;
-
-    @ApiModelProperty("昼伏夜出人脸抓拍统计")
-    private Long lastWeekEveningComeCount;
+    private Long faceImageTotal;
 
 }

src/main/java/com/iden/common/vo/HomPageCountVO.java

@@ -16,31 +16,31 @@ import java.io.Serializable;
 
 @Data
 @ApiModel(value = "首页汇总值", description = "")
-public class HomPageCountVO implements Serializable {
+public class HomPageStaVO implements Serializable {
     private static final long serialVersionUID = -44732106174401548L;
 
     @ApiModelProperty("今日人脸抓拍数量")
-    private Long todayFaceImageCount;
+    private Long todayFaceImageTotal;
 
     @ApiModelProperty("今日陌生人抓拍数量")
-    private Long todaStrangerFaceImageCount;
+    private Long todaStrangerFaceImageTotal;
 
     @ApiModelProperty("今日重点人口抓拍件数量")
-    private Long todayKeynoteFaceImageCount;
+    private Long todayKeynoteFaceImageTotal;
 
     @ApiModelProperty("预警事件数量")
-    private Long warningEventCount;
+    private Long warningEventTotal;
 
 
     @ApiModelProperty("设备总数量")
-    private Long cameraCount;
+    private Long cameraTotal;
 
 
     @ApiModelProperty("当前系统总录入数")
-    private Long personCount;
+    private Long personTotal;
 
 
     @ApiModelProperty("当前头像录入")
-    private Long cameraPersonCount;
+    private Long cameraPersonTotal;
 
 }

src/main/java/com/iden/common/vo/HomePageWarningEventRateVO.java

@@ -1,49 +0,0 @@
-package com.iden.common.vo;
-
-
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- *
- * @author makejava
- * @since 2021-12-22 17:23:46
- */
-
-@Data
-@ApiModel(value = "首页预警事件占比", description = "")
-public class HomePageWarningEventRateVO implements Serializable {
-    private static final long serialVersionUID = -44732106174401548L;
-
-    @ApiModelProperty("常驻人员预警数量")
-    private Long permanentCount;
-
-    @ApiModelProperty(value = "常驻人员预警数量占比")
-    private BigDecimal papermanentRate;
-
-
-    @ApiModelProperty("陌生人员预警数量")
-    private Long strangerCount;
-
-    @ApiModelProperty(value = "陌生人员预警数量占比")
-    private BigDecimal strangerRate;
-
-    @ApiModelProperty("重点人员预警数量")
-    private Long keynoteCount;
-
-    @ApiModelProperty(value = "重点人员预警数量占比")
-    private BigDecimal keynoteRate;
-
-    @ApiModelProperty("昼伏夜出预警数量")
-    private Long eveningComeCount;
-
-    @ApiModelProperty(value = "昼伏夜出预警数量占比")
-    private BigDecimal eveningComeRate;
-
-
-}

src/main/java/com/iden/common/vo/HomePageWarningPersonRateVO.java

@@ -1,49 +0,0 @@
-package com.iden.common.vo;
-
-
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- *
- * @author makejava
- * @since 2021-12-22 17:23:46
- */
-
-@Data
-@ApiModel(value = "首页预警人员占比", description = "")
-public class HomePageWarningPersonRateVO implements Serializable {
-    private static final long serialVersionUID = -44732106174401548L;
-
-    @ApiModelProperty("常驻人员预警数量")
-    private Long permanentCount;
-
-    @ApiModelProperty(value = "常驻人员预警数量占比")
-    private BigDecimal papermanentRate;
-
-
-    @ApiModelProperty("陌生人员预警数量")
-    private Long strangerCount;
-
-    @ApiModelProperty(value = "陌生人员预警数量占比")
-    private BigDecimal strangerRate;
-
-    @ApiModelProperty("重点人员预警数量")
-    private Long keynoteCount;
-
-    @ApiModelProperty(value = "重点人员预警数量占比")
-    private BigDecimal keynoteRate;
-
-    @ApiModelProperty("昼伏夜出预警数量")
-    private Long eveningComeCount;
-
-    @ApiModelProperty(value = "昼伏夜出预警数量占比")
-    private BigDecimal eveningComeRate;
-
-
-}

src/main/java/com/iden/common/vo/HomePageWarningStaVO.java

@@ -0,0 +1,32 @@
+package com.iden.common.vo;
+
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ *
+ * @author makejava
+ * @since 2021-12-22 17:23:46
+ */
+
+@Data
+@ApiModel(value = "首页预警占比", description = "")
+public class HomePageWarningStaVO implements Serializable {
+    private static final long serialVersionUID = -44732106174401548L;
+
+    @ApiModelProperty("预警类型")
+    private String type;
+
+    @ApiModelProperty("预警数量")
+    private Long total;
+
+    @ApiModelProperty(value = "占比")
+    private BigDecimal rate;
+
+}

src/main/java/com/iden/common/vo/WarningStaVO.java

@@ -44,18 +44,14 @@ public class WarningStaVO implements Serializable {
     @ApiModelProperty("所属街道")
     private String subdistrict;
 
+    @ApiModelProperty("预警类型，1 陌生人员预警 2重点人员预警 3常住人员预警 4昼伏夜出人员预警")
+    private String type;
 
-    @ApiModelProperty("重点人员总数")
-    private Long keynoteCount;
+    @ApiModelProperty("预警类型名，1 陌生人员预警 2重点人员预警 3常住人员预警 4昼伏夜出人员预警")
+    private String typeName;
 
-    @ApiModelProperty("昼伏夜出人员总数")
-    private Long eveningComeCount;
-
-    @ApiModelProperty("大于7天未出现常住人总数")
-    private Long permanentCount;
-
-    @ApiModelProperty("陌生人总数")
-    private Long strangerCount;
+    @ApiModelProperty("人员总数")
+    private Long total;
 
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @ApiModelProperty("数据日期")

src/main/resources/mybatis/IdenFaceImageMapper.xml

@@ -2,36 +2,72 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.iden.common.mapper.IdenFaceImageMapper">
 
-    <select id="queryHomPageCount" resultType="com.iden.common.vo.HomPageCountVO">
+    <select id="queryHomPageTotal" resultType="com.iden.common.vo.HomPageStaVO">
         SELECT
         (
           select count(1) from iden_face_image where DATE_FORMAT(photograph_time,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d')
-        ) todayFaceImageCount,
+        ) todayFaceImageTotal,
         (
           select count(1) from iden_face_image  where DATE_FORMAT(photograph_time,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d') and type='0'
-        )  todaStrangerFaceImageCount,
+        )  todaStrangerFaceImageTotal,
         (
           select count(1) from iden_face_image  where DATE_FORMAT(photograph_time,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d') and type like '%1%'
-        )  todayKeynoteFaceImageCount,
+        )  todayKeynoteFaceImageTotal,
         (
           select IFNULL(sum(a.evening_come_count),0) + IFNULL(sum(a.keynote_count),0) + IFNULL(sum(a.permanent_count),0) + IFNULL(sum(a.stranger_count),0)
 					from iden_warning_sta a
 					where a.data_date = DATE_FORMAT(now(),'%Y-%m-%d')
-        )  warningEventCount,
+        )  warningEventTotal,
         (
           select count(1) from iden_camera
-        )  cameraCount,
+        )  cameraTotal,
          (
           select count(1) from iden_person
-        )  personCount,
+        )  personTotal,
           (
           select count(1) from iden_person where image is not null
-        )  cameraPersonCount
+        )  cameraPersonTotal
         from dual
     </select>
 
-    <select id="queryWarningEventRate" resultType="com.iden.common.vo.HomePageWarningEventRateVO">
-        select
+    <select id="listLastWeekFaceImageSta" resultType="com.iden.common.vo.HomPageLastWeekFaceImageStatVO">
+        select if((dayofweek(DATE_FORMAT(create_time, '%Y-%m-%d')) -1) = 0,7,(dayofweek(DATE_FORMAT(create_time, '%Y-%m-%d')) -1)) weekDay, count(1) faceImageTotal
+        from iden_warning_sta
+        where  DATE_FORMAT(create_time, '%Y-%m-%d') >= DATE_FORMAT( DATE_SUB( DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) DAY), INTERVAL 1 WEEK), '%Y-%m-%d')
+        and DATE_FORMAT(create_time, '%Y-%m-%d') lt;= DATE_FORMAT( SUBDATE(CURDATE(), WEEKDAY(CURDATE()) + 1), '%Y-%m-%d')
+        group by DATE_FORMAT(create_time, '%Y-%m-%d')
+        order by weekDay
     </select>
 
+    <select id="listLastWeekStrangerFaceImageSta" resultType="com.iden.common.vo.HomPageLastWeekFaceImageStatVO">
+         select if((dayofweek(DATE_FORMAT(create_time, '%Y-%m-%d')) -1) = 0,7,(dayofweek(DATE_FORMAT(create_time, '%Y-%m-%d')) -1)) weekDay, count(1) faceImageTotal
+        from iden_warning_sta
+        where  DATE_FORMAT(create_time, '%Y-%m-%d') >= DATE_FORMAT( DATE_SUB( DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) DAY), INTERVAL 1 WEEK), '%Y-%m-%d')
+        and DATE_FORMAT(create_time, '%Y-%m-%d') lt;= DATE_FORMAT( SUBDATE(CURDATE(), WEEKDAY(CURDATE()) + 1), '%Y-%m-%d')
+        and type like '%0%'
+         group by DATE_FORMAT(create_time, '%Y-%m-%d')
+        order by weekDay
+    </select>
+
+    <select id="listLastWeekKeynoteFaceImageSta" resultType="com.iden.common.vo.HomPageLastWeekFaceImageStatVO">
+        select if((dayofweek(DATE_FORMAT(create_time, '%Y-%m-%d')) -1) = 0,7,(dayofweek(DATE_FORMAT(create_time, '%Y-%m-%d')) -1)) weekDay, count(1) faceImageTotal
+        from iden_warning_sta
+        where  DATE_FORMAT(create_time, '%Y-%m-%d') >= DATE_FORMAT( DATE_SUB( DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) DAY), INTERVAL 1 WEEK), '%Y-%m-%d')
+        and DATE_FORMAT(create_time, '%Y-%m-%d') lt;= DATE_FORMAT( SUBDATE(CURDATE(), WEEKDAY(CURDATE()) + 1), '%Y-%m-%d')
+         and type like '%1%'
+         group by DATE_FORMAT(create_time, '%Y-%m-%d')
+        order by weekDay
+    </select>
+
+
+
+    <select id="listLastWeekEventComingFaceImageSta" resultType="com.iden.common.vo.HomPageLastWeekFaceImageStatVO">
+        select if((dayofweek(create_time) -1) = 0,7,(dayofweek(create_time) -1)) weekDay, count(1) faceImageTotal
+        from iden_warning_sta
+        where  DATE_FORMAT(create_time, '%Y-%m-%d') >= DATE_FORMAT( DATE_SUB( DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) DAY), INTERVAL 1 WEEK), '%Y-%m-%d')
+        and DATE_FORMAT(create_time, '%Y-%m-%d') lt;= DATE_FORMAT( SUBDATE(CURDATE(), WEEKDAY(CURDATE()) + 1), '%Y-%m-%d')
+        and type like '%3%'
+         group by DATE_FORMAT(create_time, '%Y-%m-%d')
+        order by weekDay
+    </select>
 </mapper>

src/main/resources/mybatis/IdenWarningEventMapper.xml

@@ -2,5 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.iden.common.mapper.IdenWarningEventMapper">
 
+    <select id="queryWarningEventRateStat" resultType="com.iden.common.vo.HomePageWarningStaVO">
+        select type,
+        count(1) total,
+        convert(count(1)/(select count(1) from iden_warning_event),decimal(20,2)) rate
+        from iden_warning_event group by type
+    </select>
 
 </mapper>

src/main/resources/mybatis/IdenWarningStaMapper.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.iden.common.mapper.IdenWarningStaMapper">
-
+    <select id="queryWarningPersonRateSta" resultType="com.iden.common.vo.HomePageWarningStaVO">
+        select type,
+        sum(total) total,
+        convert(sum(total)/(select sum(total) from iden_warning_event),decimal(20,2)) rate
+        from iden_warning_sta  group by type
+    </select>
 
 </mapper>