轨迹

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

@@ -10,7 +10,7 @@ import com.iden.common.util.Result;
 import com.iden.common.util.WebPageUtils;
 import com.iden.common.vo.CameraVO;
 import com.iden.common.vo.PageReqVO;
-import com.iden.common.vo.UserLogindConvertVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -57,7 +57,7 @@ public class CameraController {
                                                  @RequestParam(value = "name", required = false) String name,
                                                  PageReqVO pageReqVo){
         try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             IPage<CameraVO> pageResponse = this.cameraService.listCamera(type,district,subdistrict,communityId,name,loginUser ,pageReqVo);
             return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
         }catch (BDException e) {
@@ -75,7 +75,7 @@ public class CameraController {
                                    @RequestBody CameraVO vo){
         try {
 
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             int flag = this.cameraService.createCamera(vo,loginUser);
             if (flag == 1) {
                 return  Result.error("名称已存在！");

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

@@ -9,7 +9,7 @@ import com.iden.common.util.Result;
 import com.iden.common.util.WebPageUtils;
 import com.iden.common.vo.PageReqVO;
 import com.iden.common.vo.CommunityVO;
-import com.iden.common.vo.UserLogindConvertVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -52,7 +52,7 @@ public class CommunityController {
                                                        @RequestParam(value = "name", required = false) String name,
                                                   PageReqVO pageReqVo){
         try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             IPage<CommunityVO> pageResponse = this.communityService.listCommunity(district,subdistrict,name,loginUser ,pageReqVo);
             return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
         }catch (BDException e) {
@@ -70,7 +70,7 @@ public class CommunityController {
                                    @RequestBody CommunityVO vo){
         try {
 
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             int flag = this.communityService.createCommunity(vo,loginUser);
             if (flag == 1) {
                 return  Result.error("名称已存在！");

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

@@ -10,7 +10,7 @@ import com.iden.common.util.Result;
 import com.iden.common.util.WebPageUtils;
 import com.iden.common.vo.CrowdVO;
 import com.iden.common.vo.PageReqVO;
-import com.iden.common.vo.UserLogindConvertVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -49,7 +49,7 @@ public class CrowdController {
                                                  @RequestParam(value = "name", required = false) String name,
                                                  PageReqVO pageReqVo){
         try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             IPage<CrowdVO> pageResponse = this.crowdService.listCrowd(name,loginUser ,pageReqVo);
             return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
         }catch (BDException e) {
@@ -67,7 +67,7 @@ public class CrowdController {
                                    @RequestBody CrowdVO vo){
         try {
 
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             int flag = this.crowdService.createCrowd(vo,loginUser);
             if (flag == 1) {
                 return  Result.error("名称已存在！");

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

@@ -8,7 +8,7 @@ import com.iden.common.util.PageResult;
 import com.iden.common.util.Result;
 import com.iden.common.util.WebPageUtils;
 import com.iden.common.vo.PageReqVO;
-import com.iden.common.vo.UserLogindConvertVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 import com.iden.common.vo.FaceImageVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -56,7 +56,7 @@ public class FaceImageController {
                                                         @RequestParam(value = "endDate", required = false) String endDate,
                                                         PageReqVO pageReqVo){
         try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             IPage<FaceImageVO> pageResponse = this.faceImageService.listFaceImage(type,communityId,photographPlace,beginDate,endDate,loginUser ,pageReqVo);
             return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
         }catch (BDException e) {

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

@@ -0,0 +1,89 @@
+package com.iden.bms.controller;
+
+
+import com.iden.bms.service.HomePageService;
+import com.iden.common.annotation.Permission;
+
+import com.iden.common.util.Result;
+import com.iden.common.util.WebPageUtils;
+import com.iden.common.vo.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @Author: lilt
+ * @Date: 2021/5/26
+ * @Desc:
+ */
+@RestController
+@Api(value = "HomePageController", tags = { "首页管理" })
+@Slf4j
+@RequestMapping("/bms/homePage")
+@Permission
+public class HomePageController {
+
+    @Autowired
+    private HomePageService homePageService;
+
+    @GetMapping("/queryHomPageCount")
+    @ApiOperation(value = "查询首页汇总值")
+    public Result<HomPageCountVO> queryHomPageCount(HttpServletRequest request, @RequestHeader(value = "token") String token){
+        try {
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            HomPageCountVO datas = this.homePageService.queryHomPageCount(loginUser);
+            return Result.success(datas);
+        }catch (Exception e) {
+            log.error("首页管理: 查询首页汇总值出现异常",e);
+            return Result.error( "获取数据失败");
+        }
+    }
+
+    @GetMapping("/queryWarningPersonRate")
+    @ApiOperation(value = "查询预警人员占比")
+    public Result<HomePageWarningPersonRateVO> queryWarningPersonRate(HttpServletRequest request, @RequestHeader(value = "token") String token){
+        try {
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            HomePageWarningPersonRateVO datas = this.homePageService.queryWarningPersonRate(loginUser);
+            return Result.success(datas);
+        }catch (Exception e) {
+            log.error("首页管理: 查询预警人员占比出现异常",e);
+            return Result.error( "获取数据失败");
+        }
+    }
+
+
+    @GetMapping("/queryWarningEventRate")
+    @ApiOperation(value = "查询预警事件占比")
+    public Result<HomePageWarningEventRateVO> queryWarningEventRate(HttpServletRequest request, @RequestHeader(value = "token") String token){
+        try {
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            HomePageWarningEventRateVO datas = this.homePageService.queryWarningEventRate(loginUser);
+            return Result.success(datas);
+        }catch (Exception e) {
+            log.error("首页管理: 查询预警事件占比出现异常",e);
+            return Result.error( "获取数据失败");
+        }
+    }
+
+
+    @GetMapping("/listLastWeekSta")
+    @ApiOperation(value = "查询上周统计")
+    public Result<List<HomPageLastWeekCountVO>> listLastWeekSta(HttpServletRequest request, @RequestHeader(value = "token") String token){
+        try {
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            List<HomPageLastWeekCountVO> datas = this.homePageService.listLastWeekSta(loginUser);
+            return Result.success(datas);
+        }catch (Exception e) {
+            log.error("首页管理: 查询上周统计出现异常",e);
+            return Result.error( "获取列表失败");
+        }
+    }
+
+
+
+}

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

@@ -5,7 +5,7 @@ import com.iden.bms.params.UserLoginParams;
 import com.iden.bms.service.SysUserService;
 import com.iden.common.constant.Constants;
 import com.iden.common.exception.BDException;
-import com.iden.common.vo.UserLogindConvertVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 import com.iden.common.util.JwtUtils;
 import com.iden.common.util.Result;
 import com.iden.common.util.ResultCode;
@@ -39,7 +39,7 @@ public class LoginController {
     public Result<Object> login(HttpServletRequest request, @RequestBody UserLoginParams userLoginParams) {
         try {
             //验证用户名密码
-            UserLogindConvertVO loginUser = sysUserService.getLoginUser(userLoginParams.getUsername(),userLoginParams.getPassword());
+            UserLoginedConvertVO loginUser = sysUserService.getLoginUser(userLoginParams.getUsername(),userLoginParams.getPassword());
             if (loginUser == null) {
                 return Result.error("未找到相关用户");
             }
@@ -63,7 +63,7 @@ public class LoginController {
         String commonJwt = request.getHeader(Constants.LOGIN_TOKEN_KEY);
         Claims claims = JwtUtils.tokenParse(commonJwt);
         if (claims != null) {
-            UserLogindConvertVO vo = JSONUtil.toBean(claims.getSubject(), UserLogindConvertVO.class);
+            UserLoginedConvertVO vo = JSONUtil.toBean(claims.getSubject(), UserLoginedConvertVO.class);
             if (vo != null) {
                return Result.success("解析成功",vo);
             }else{

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

@@ -10,7 +10,7 @@ import com.iden.common.util.Result;
 import com.iden.common.util.WebPageUtils;
 import com.iden.common.vo.PersonVO;
 import com.iden.common.vo.PageReqVO;
-import com.iden.common.vo.UserLogindConvertVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,7 +62,7 @@ public class PersonController {
                                                  @RequestParam(value = "populationType", required = false) String populationType,
                                                  PageReqVO pageReqVo){
         try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             IPage<PersonVO> pageResponse = this.personService.listPerson(type,nameOrCred,district,subdistrict,communityId,crowdId,address,gender,populationType,loginUser ,pageReqVo);
             return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
         }catch (BDException e) {
@@ -102,7 +102,7 @@ public class PersonController {
                                    @RequestBody PersonVO vo){
         try {
 
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             int flag = this.personService.createPerson(vo,loginUser);
             if (flag == 1) {
                 return  Result.error("证件号码已存在！");

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

@@ -8,7 +8,7 @@ import com.iden.common.util.Result;
 import com.iden.common.util.WebPageUtils;
 
 import com.iden.common.vo.SysMenuVO;
-import com.iden.common.vo.UserLogindConvertVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -46,7 +46,7 @@ public class SysMenuController {
     public Result<List<SysMenuVO>> queryPrivMenus(HttpServletRequest request,
                                                   @RequestHeader(name = "token", required = true) String token) {
         try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             List<SysMenuVO> list = this.sysMenuService.queryPrivMenus(loginUser.getId());
             return Result.success(list);
         } catch (Exception e) {

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

@@ -9,10 +9,8 @@ import com.iden.common.util.Result;
 import com.iden.common.util.WebPageUtils;
 import com.iden.common.vo.SysRoleVO;
 import com.iden.common.vo.PageReqVO;
-import com.iden.common.vo.UserLogindConvertVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +41,7 @@ public class SysRoleController {
     public PageResult<List<SysRoleVO>> listSysRole(HttpServletRequest request, @RequestHeader(value = "token") String token,
                                                   PageReqVO pageReqVo){
         try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             IPage<SysRoleVO> pageResponse = this.sysRoleService.listSysRole(loginUser ,pageReqVo);
             return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
         }catch (BDException e) {
@@ -61,7 +59,7 @@ public class SysRoleController {
                                    @RequestBody SysRoleVO vo){
         try {
 
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             int flag = this.sysRoleService.createSysRole(vo,loginUser);
             if (flag == 1) {
                 return  Result.error("名称已存在！");

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

@@ -1,18 +1,16 @@
 package com.iden.bms.controller;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.iden.bms.params.ModifyPasswordParams;
 import com.iden.bms.service.SysUserService;
 import com.iden.common.annotation.Permission;
-import com.iden.common.entity.IdenSysUser;
 import com.iden.common.exception.BDException;
 import com.iden.common.service.IdenSysUserService;
 import com.iden.common.util.PageResult;
 import com.iden.common.util.Result;
 import com.iden.common.util.WebPageUtils;
 import com.iden.common.vo.PageReqVO;
-import com.iden.common.vo.UserLogindConvertVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 import com.iden.common.vo.SysUserVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -25,7 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -57,7 +54,7 @@ public class SysUserController {
                                                   @RequestParam(value = "username", required = false) String username,
                                                   PageReqVO pageReqVo){
         try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             IPage<SysUserVO> pageResponse = this.sysUserService.listSysUser(nickname,username,loginUser ,pageReqVo);
             return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
         }catch (BDException e) {
@@ -75,7 +72,7 @@ public class SysUserController {
                                    @RequestBody SysUserVO vo){
         try {
 
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             String md5Password = DigestUtils.md5Hex("123456");
             vo.setPassword(md5Password);
             int flag = this.sysUserService.createSysUser(vo,loginUser);
@@ -166,7 +163,7 @@ public class SysUserController {
             if(StringUtils.isEmpty(parmas.getNewPassword()) || !parmas.getNewPassword().equals(parmas.getConfirmNewPassword())){
                 return  Result.error("新密码和确认新密码不一致！");
             }
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
 
             if (sysUserService.modifyPassword(loginUser.getId(),parmas)){
                 return  Result.success("修改密码成功！");

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

@@ -9,7 +9,7 @@ import com.iden.common.exception.BDException;
 import com.iden.common.util.Result;
 import com.iden.common.util.WebPageUtils;
 import com.iden.common.vo.TraceVO;
-import com.iden.common.vo.UserLogindConvertVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -70,7 +70,7 @@ public class TraceController {
                                            @RequestParam(value = "beginTime", required = false) String beginTime,
                                            @RequestParam(value = "endTime", required = false) String endTime){
         try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             List<TraceVO> datas = this.traceService.listUploadImagesTrace(images,beginTime,endTime,loginUser);
             return Result.success(datas);
         }catch (Exception e) {

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

@@ -1,71 +0,0 @@
-package com.iden.bms.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iden.bms.service.WarningEveningComeStaService;
-import com.iden.common.annotation.Permission;
-import com.iden.common.exception.BDException;
-import com.iden.common.util.PageResult;
-import com.iden.common.util.Result;
-import com.iden.common.util.WebPageUtils;
-import com.iden.common.vo.WarningEveningComeStaVO;
-import com.iden.common.vo.PageReqVO;
-import com.iden.common.vo.UserLogindConvertVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * @Author: lilt
- * @Date: 2021/5/26
- * @Desc:
- */
-@RestController
-@Api(value = "WarningEveningComeStaController", tags = { "预警管理" })
-@Slf4j
-@RequestMapping("/bms/warningEveningComeSta")
-@Permission
-public class WarningEveningComeStaController {
-
-    @Autowired
-    private WarningEveningComeStaService warningEveningComeStaService;
-
-
-
-    @GetMapping("/listWarningEveningComeSta")
-    @ApiOperation(value = "昼伏夜出人员预警列表分页 ")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "district", value = "所属区域"),
-            @ApiImplicitParam(paramType = "query", name = "subdistrict", value = "所属街道"),
-            @ApiImplicitParam(paramType = "query", name = "communityName", value = "小区名称"),
-            @ApiImplicitParam(paramType = "query", name = "beginDate", value = "开始时间"),
-            @ApiImplicitParam(paramType = "query", name = "endDate", value = "结束时间")
-
-    })
-    public PageResult<List<WarningEveningComeStaVO>> listWarningEveningComeSta(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                                                               @RequestParam(value = "district", required = false) String district,
-                                                                               @RequestParam(value = "subdistrict", required = false) String subdistrict,
-                                                                               @RequestParam(value = "communityName", required = false) String communityName,
-                                                                               @RequestParam(value = "beginDate", required = false) String beginDate,
-                                                                               @RequestParam(value = "endDate", required = false) String endDate,
-                                                                                PageReqVO pageReqVo){
-        try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<WarningEveningComeStaVO> pageResponse = this.warningEveningComeStaService.listWarningEveningComeSta(district,subdistrict,communityName,beginDate,endDate,loginUser ,pageReqVo);
-            return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
-        }catch (BDException e) {
-            log.error("昼伏夜出人员预警列表查询-分页列表出现异常",e);
-            return  PageResult.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("昼伏夜出人员预警管理: 昼伏夜出人员预警列表查询出现异常",e);
-            return PageResult.error( "获取列表失败");
-        }
-    }
-    
-}

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

@@ -1,71 +0,0 @@
-package com.iden.bms.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-import com.iden.bms.service.WarningKeynoteStaService;
-import com.iden.common.annotation.Permission;
-import com.iden.common.exception.BDException;
-import com.iden.common.util.PageResult;
-import com.iden.common.util.WebPageUtils;
-import com.iden.common.vo.PageReqVO;
-import com.iden.common.vo.UserLogindConvertVO;
-import com.iden.common.vo.WarningKeynoteStaVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * @Author: lilt
- * @Date: 2021/5/26
- * @Desc:
- */
-@RestController
-@Api(value = "WarningKeynoteStaController", tags = { "预警管理" })
-@Slf4j
-@RequestMapping("/bms/warningKeynoteSta")
-@Permission
-public class WarningKeynoteStaComeStaController {
-
-    @Autowired
-    private WarningKeynoteStaService warningKeynoteStaService;
-
-
-
-    @GetMapping("/listWarningKeynoteSta")
-    @ApiOperation(value = "重点人员预警列表分页 ")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "district", value = "所属区域"),
-            @ApiImplicitParam(paramType = "query", name = "subdistrict", value = "所属街道"),
-            @ApiImplicitParam(paramType = "query", name = "communityName", value = "小区名称"),
-            @ApiImplicitParam(paramType = "query", name = "beginDate", value = "开始时间"),
-            @ApiImplicitParam(paramType = "query", name = "endDate", value = "结束时间")
-
-    })
-    public PageResult<List<WarningKeynoteStaVO>> listWarningKeynoteSta(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                                                               @RequestParam(value = "district", required = false) String district,
-                                                                               @RequestParam(value = "subdistrict", required = false) String subdistrict,
-                                                                               @RequestParam(value = "communityName", required = false) String communityName,
-                                                                               @RequestParam(value = "beginDate", required = false) String beginDate,
-                                                                               @RequestParam(value = "endDate", required = false) String endDate,
-                                                                                PageReqVO pageReqVo){
-        try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<WarningKeynoteStaVO> pageResponse = this.warningKeynoteStaService.listWarningKeynoteSta(district,subdistrict,communityName,beginDate,endDate,loginUser ,pageReqVo);
-            return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
-        }catch (BDException e) {
-            log.error("重点人员预警列表查询-分页列表出现异常",e);
-            return  PageResult.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("重点人员预警管理: 重点人员预警列表查询出现异常",e);
-            return PageResult.error( "获取列表失败");
-        }
-    }
-    
-}

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

@@ -1,70 +0,0 @@
-package com.iden.bms.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iden.bms.service.WarningPermanentStaService;
-import com.iden.common.annotation.Permission;
-import com.iden.common.exception.BDException;
-import com.iden.common.util.PageResult;
-import com.iden.common.util.WebPageUtils;
-import com.iden.common.vo.PageReqVO;
-import com.iden.common.vo.UserLogindConvertVO;
-import com.iden.common.vo.WarningPermanentStaVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * @Author: lilt
- * @Date: 2021/5/26
- * @Desc:
- */
-@RestController
-@Api(value = "WarningPermanentStaController", tags = { "预警管理" })
-@Slf4j
-@RequestMapping("/bms/warningPermanentSta")
-@Permission
-public class WarningPermanentStaController {
-
-    @Autowired
-    private WarningPermanentStaService warningPermanentStaService;
-
-
-
-    @GetMapping("/listWarningPermanentSta")
-    @ApiOperation(value = "常住人员预警列表分页 ")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "district", value = "所属区域"),
-            @ApiImplicitParam(paramType = "query", name = "subdistrict", value = "所属街道"),
-            @ApiImplicitParam(paramType = "query", name = "communityName", value = "小区名称"),
-            @ApiImplicitParam(paramType = "query", name = "beginDate", value = "开始时间"),
-            @ApiImplicitParam(paramType = "query", name = "endDate", value = "结束时间")
-
-    })
-    public PageResult<List<WarningPermanentStaVO>> listWarningPermanentSta(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                                                               @RequestParam(value = "district", required = false) String district,
-                                                                               @RequestParam(value = "subdistrict", required = false) String subdistrict,
-                                                                               @RequestParam(value = "communityName", required = false) String communityName,
-                                                                               @RequestParam(value = "beginDate", required = false) String beginDate,
-                                                                               @RequestParam(value = "endDate", required = false) String endDate,
-                                                                                PageReqVO pageReqVo){
-        try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<WarningPermanentStaVO> pageResponse = this.warningPermanentStaService.listWarningPermanentSta(district,subdistrict,communityName,beginDate,endDate,loginUser ,pageReqVo);
-            return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
-        }catch (BDException e) {
-            log.error("常住人员预警列表查询-分页列表出现异常",e);
-            return  PageResult.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("常住人员预警管理: 常住人员预警列表查询出现异常",e);
-            return PageResult.error( "获取列表失败");
-        }
-    }
-    
-}

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

@@ -0,0 +1,71 @@
+package com.iden.bms.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.iden.bms.service.WarningStaService;
+import com.iden.common.annotation.Permission;
+import com.iden.common.exception.BDException;
+import com.iden.common.util.PageResult;
+import com.iden.common.util.WebPageUtils;
+
+import com.iden.common.vo.PageReqVO;
+import com.iden.common.vo.UserLoginedConvertVO;
+import com.iden.common.vo.WarningStaVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @Author: lilt
+ * @Date: 2021/5/26
+ * @Desc:
+ */
+@RestController
+@Api(value = "WarningStaController", tags = { "预警管理" })
+@Slf4j
+@RequestMapping("/bms/warningSta")
+@Permission
+public class WarningStaController {
+
+    @Autowired
+    private WarningStaService warningStaService;
+
+
+
+    @GetMapping("/listWarningSta")
+    @ApiOperation(value = "预警统计列表分页 ")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(paramType = "query", name = "district", value = "所属区域"),
+            @ApiImplicitParam(paramType = "query", name = "subdistrict", value = "所属街道"),
+            @ApiImplicitParam(paramType = "query", name = "communityName", value = "小区名称"),
+            @ApiImplicitParam(paramType = "query", name = "beginDate", value = "开始时间"),
+            @ApiImplicitParam(paramType = "query", name = "endDate", value = "结束时间")
+
+    })
+    public PageResult<List<WarningStaVO>> listWarningSta(HttpServletRequest request, @RequestHeader(value = "token") String token,
+                                                         @RequestParam(value = "district", required = false) String district,
+                                                         @RequestParam(value = "subdistrict", required = false) String subdistrict,
+                                                         @RequestParam(value = "communityName", required = false) String communityName,
+                                                         @RequestParam(value = "beginDate", required = false) String beginDate,
+                                                         @RequestParam(value = "endDate", required = false) String endDate,
+                                                         PageReqVO pageReqVo){
+        try {
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            IPage<WarningStaVO> pageResponse = this.warningStaService.listWarningSta(district,subdistrict,communityName,beginDate,endDate,loginUser ,pageReqVo);
+            return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
+        }catch (BDException e) {
+            log.error("预警统计列表查询-分页列表出现异常",e);
+            return  PageResult.error(e.getMessage());
+        } catch (Exception e) {
+            log.error("预警管理: 预警统计列表查询出现异常",e);
+            return PageResult.error( "获取列表失败");
+        }
+    }
+    
+}

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

@@ -1,70 +0,0 @@
-package com.iden.bms.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iden.bms.service.WarningStrangerStaService;
-import com.iden.common.annotation.Permission;
-import com.iden.common.exception.BDException;
-import com.iden.common.util.PageResult;
-import com.iden.common.util.WebPageUtils;
-import com.iden.common.vo.PageReqVO;
-import com.iden.common.vo.UserLogindConvertVO;
-import com.iden.common.vo.WarningStrangerStaVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * @Author: lilt
- * @Date: 2021/5/26
- * @Desc:
- */
-@RestController
-@Api(value = "WarningStrangerStaController", tags = { "预警管理" })
-@Slf4j
-@RequestMapping("/bms/warningStrangerSta")
-@Permission
-public class WarningStrangerStaController {
-
-    @Autowired
-    private WarningStrangerStaService warningStrangerStaService;
-
-
-
-    @GetMapping("/listWarningStrangerSta")
-    @ApiOperation(value = "陌生人员预警列表分页 ")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "district", value = "所属区域"),
-            @ApiImplicitParam(paramType = "query", name = "subdistrict", value = "所属街道"),
-            @ApiImplicitParam(paramType = "query", name = "communityName", value = "小区名称"),
-            @ApiImplicitParam(paramType = "query", name = "beginDate", value = "开始时间"),
-            @ApiImplicitParam(paramType = "query", name = "endDate", value = "结束时间")
-
-    })
-    public PageResult<List<WarningStrangerStaVO>> listWarningStrangerSta(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                                                               @RequestParam(value = "district", required = false) String district,
-                                                                               @RequestParam(value = "subdistrict", required = false) String subdistrict,
-                                                                               @RequestParam(value = "communityName", required = false) String communityName,
-                                                                               @RequestParam(value = "beginDate", required = false) String beginDate,
-                                                                               @RequestParam(value = "endDate", required = false) String endDate,
-                                                                                PageReqVO pageReqVo){
-        try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<WarningStrangerStaVO> pageResponse = this.warningStrangerStaService.listWarningStrangerSta(district,subdistrict,communityName,beginDate,endDate,loginUser ,pageReqVo);
-            return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
-        }catch (BDException e) {
-            log.error("陌生人员预警列表查询-分页列表出现异常",e);
-            return  PageResult.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("陌生人员预警管理: 陌生人员预警列表查询出现异常",e);
-            return PageResult.error( "获取列表失败");
-        }
-    }
-    
-}

src/main/java/com/iden/bms/face/FaceIdenService.java

@@ -12,12 +12,15 @@ import com.iden.common.entity.IdenCamera;
 import com.iden.common.entity.IdenCommunity;
 import com.iden.common.entity.IdenFaceImage;
 
+import com.iden.common.entity.IdenPerson;
+import com.iden.common.enums.PersonTypeEnum;
 import com.iden.common.service.IdenCameraService;
 import com.iden.common.service.IdenCommunityService;
 import com.iden.common.service.IdenFaceImageService;
 
 import com.iden.common.util.ByteUtil;
 import com.iden.common.util.DateUtils;
+import com.iden.common.util.FileUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -26,10 +29,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
+import java.util.*;
 
 
 /**
@@ -57,10 +57,9 @@ public class FaceIdenService {
     private static final Logger logger = LogManager.getLogger(FaceIdenService.class);
 
     /**
-     *
+     *  处理各摄像头上传的图像
      * @throws Exception
      */
-
     public void handleCameraImage() throws Exception {
         logger.info("FaceIdenService.handleCameraImage start...");
 
@@ -79,7 +78,7 @@ public class FaceIdenService {
 
                 for(File cameraCodedir : cameraCodeDirs) {
                     if(cameraCodedir.isDirectory()){
-                        File[] imgFiles = cameraCodedir.listFiles();
+                        File[] imgFiles = FileUtil.sortByName(cameraCodedir.listFiles());
                         if(imgFiles != null && imgFiles.length > 0){
                             String cameraCode = cameraCodedir.getName();
                             QueryWrapper<IdenCamera> queryWrapper = new QueryWrapper<>();
@@ -88,6 +87,7 @@ public class FaceIdenService {
                             if(idenCamera == null){
                                 continue;
                             }
+
                            //获取特征码
                             FaceModel[] faceModels = FaceIdenTool.extractFeature(idenRoot,imgFiles);
 
@@ -111,6 +111,7 @@ public class FaceIdenService {
                                 String photographTime = imgFileName.substring(0, imgFileName.indexOf("_"));
                                 idenFaceImage.setPhotographTime(DateUtils.strToDate(photographTime,"yyyyMMddHHmmss"));
 
+                                //识别特征码
                                 if(faceModels[i] != null){
                                     idenFaceImage.setFeatPtr(ByteUtil.byte2Hex(faceModels[i].getFeatValue()));
                                 }
@@ -134,13 +135,17 @@ public class FaceIdenService {
 
                                     int  hitIndex = FaceIdenTool.getHitIndex(faceMonitorPerson,faceModels[i]);
                                     if (hitIndex != -1){
-                                        Long personId = personService.getPersonIdByImageFileName(imgPersonFiles[hitIndex].getName());
-                                        if(personId != null) {
-                                            idenFaceImage.setPersonId(personId);
+                                        IdenPerson idenPerson = personService.getPersonIdByImageFileName(imgPersonFiles[hitIndex].getName());
+                                        if(idenPerson != null) {
+                                            idenFaceImage.setPersonId(idenPerson.getId());
+                                            idenFaceImage.setType(idenPerson.getType());
                                         }
                                     }
 
                                 }
+                                if (idenFaceImage.getPersonId() == null){
+                                    idenFaceImage.setType(PersonTypeEnum.STRANGER.getValue());
+                                }
                                 idenFaceImage.setCreateTime(new Date());
                                 idenFaceImageList.add(idenFaceImage);
                             }
@@ -161,7 +166,6 @@ public class FaceIdenService {
     }
 
 
-
     /**
      *
      * @throws Exception

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

@@ -13,7 +13,7 @@ import com.iden.common.service.IdenCameraService;
 import com.iden.common.util.MyBeanUtils;
 import com.iden.common.vo.CameraVO;
 import com.iden.common.vo.PageReqVO;
-import com.iden.common.vo.UserLogindConvertVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -40,7 +40,7 @@ public class CameraService {
      * 查询摄像头列表
      * @return
              */
-    public IPage<CameraVO> listCamera(String type,String district, String subdistrict,Long communityId, String name, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
+    public IPage<CameraVO> listCamera(String type, String district, String subdistrict, Long communityId, String name, UserLoginedConvertVO loginUser, PageReqVO pageReqVo) {
             IPage<IdenCamera> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
             QueryWrapper<IdenCamera> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().like(StrUtil.isNotEmpty(name),IdenCamera::getName,name)
@@ -98,7 +98,7 @@ public class CameraService {
      * @param vo
      */
     @Transactional(rollbackFor = Exception.class)
-    public int createCamera(CameraVO vo, UserLogindConvertVO loginUser){
+    public int createCamera(CameraVO vo, UserLoginedConvertVO loginUser){
         QueryWrapper<IdenCamera> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(IdenCamera::getName,vo.getName());
         if(idenCameraService.count(queryWrapper) > 0){

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

@@ -12,7 +12,7 @@ import com.iden.common.service.IdenCommunityService;
 import com.iden.common.util.MyBeanUtils;
 import com.iden.common.vo.CommunityVO;
 import com.iden.common.vo.PageReqVO;
-import com.iden.common.vo.UserLogindConvertVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -39,7 +39,7 @@ public class CommunityService {
      * 查询小区列表
      * @return
              */
-    public IPage<CommunityVO> listCommunity(String district, String subdistrict,String name, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
+    public IPage<CommunityVO> listCommunity(String district, String subdistrict, String name, UserLoginedConvertVO loginUser, PageReqVO pageReqVo) {
             IPage<IdenCommunity> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
             QueryWrapper<IdenCommunity> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().like(StrUtil.isNotEmpty(name),IdenCommunity::getName,name)
@@ -91,7 +91,7 @@ public class CommunityService {
      * @param vo
      */
     @Transactional(rollbackFor = Exception.class)
-    public int createCommunity(CommunityVO vo, UserLogindConvertVO loginUser){
+    public int createCommunity(CommunityVO vo, UserLoginedConvertVO loginUser){
         QueryWrapper<IdenCommunity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(IdenCommunity::getName,vo.getName());
         if(idenCommunityService.count(queryWrapper) > 0){

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

@@ -11,7 +11,7 @@ import com.iden.common.service.IdenCrowdService;
 import com.iden.common.util.MyBeanUtils;
 import com.iden.common.vo.CrowdVO;
 import com.iden.common.vo.PageReqVO;
-import com.iden.common.vo.UserLogindConvertVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -38,7 +38,7 @@ public class CrowdService {
      * 查询人群列表
      * @return
              */
-    public IPage<CrowdVO> listCrowd(String name, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
+    public IPage<CrowdVO> listCrowd(String name, UserLoginedConvertVO loginUser, PageReqVO pageReqVo) {
             IPage<IdenCrowd> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
             QueryWrapper<IdenCrowd> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().like(StrUtil.isNotEmpty(name),IdenCrowd::getName,name)
@@ -88,7 +88,7 @@ public class CrowdService {
      * @param vo
      */
     @Transactional(rollbackFor = Exception.class)
-    public int createCrowd(CrowdVO vo, UserLogindConvertVO loginUser){
+    public int createCrowd(CrowdVO vo, UserLoginedConvertVO loginUser){
         QueryWrapper<IdenCrowd> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(IdenCrowd::getName,vo.getName());
         if(idenCrowdService.count(queryWrapper) > 0){

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

@@ -45,7 +45,7 @@ public class FaceImageService {
      * 查询人脸抓拍库列表
      * @return
              */
-    public IPage<FaceImageVO> listFaceImage(String type, Long communityId, String photographPlace, String beginDate, String endDate, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
+    public IPage<FaceImageVO> listFaceImage(String type, Long communityId, String photographPlace, String beginDate, String endDate, UserLoginedConvertVO loginUser, PageReqVO pageReqVo) {
             IPage<IdenFaceImage> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
             QueryWrapper<IdenFaceImage> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().like(IdenFaceImage::getType,type)

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

@@ -0,0 +1,49 @@
+package com.iden.bms.service;
+
+
+
+import com.iden.common.vo.*;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * @author makejava
+ * @since 2021-05-21 00:08:38
+ */
+@Service
+public class HomePageService {
+
+
+    public HomPageCountVO queryHomPageCount(UserLoginedConvertVO loginUser){
+        HomPageCountVO homPageCountVO = new HomPageCountVO();
+
+        return homPageCountVO;
+    }
+
+    public HomePageWarningPersonRateVO queryWarningPersonRate(UserLoginedConvertVO loginUser){
+        HomePageWarningPersonRateVO homePageWarningPersonRateVO = new HomePageWarningPersonRateVO();
+
+        return homePageWarningPersonRateVO;
+    }
+
+    public HomePageWarningEventRateVO queryWarningEventRate(UserLoginedConvertVO loginUser){
+        HomePageWarningEventRateVO homePageWarningEventRateVO = new HomePageWarningEventRateVO();
+
+        return homePageWarningEventRateVO;
+    }
+
+    public List<HomPageLastWeekCountVO> listLastWeekSta(UserLoginedConvertVO loginUser){
+        List<HomPageLastWeekCountVO> lastWeekCountVOS = new ArrayList<>();
+
+
+
+
+        return lastWeekCountVOS;
+    }
+
+
+}

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

@@ -22,7 +22,7 @@ import com.iden.common.util.ImgUtil;
 import com.iden.common.util.MyBeanUtils;
 import com.iden.common.vo.PersonVO;
 import com.iden.common.vo.PageReqVO;
-import com.iden.common.vo.UserLogindConvertVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
@@ -63,7 +63,7 @@ public class PersonService {
      * 查询人员列表
      * @return
              */
-    public IPage<PersonVO> listPerson(String type,String nameOrCred, String district, String subdistrict, Long communityId, Long crowdId, String address, String gender, String populationType, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
+    public IPage<PersonVO> listPerson(String type, String nameOrCred, String district, String subdistrict, Long communityId, Long crowdId, String address, String gender, String populationType, UserLoginedConvertVO loginUser, PageReqVO pageReqVo) {
             IPage<IdenPerson> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
 
             QueryWrapper<IdenPerson> queryWrapper = new QueryWrapper<>();
@@ -200,7 +200,7 @@ public class PersonService {
      * @param vo
      */
     @Transactional(rollbackFor = Exception.class)
-    public int createPerson(PersonVO vo, UserLogindConvertVO loginUser){
+    public int createPerson(PersonVO vo, UserLoginedConvertVO loginUser){
         QueryWrapper<IdenPerson> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(IdenPerson::getCredentialsCode,vo.getCredentialsCode());
         if(idenPersonService.count(queryWrapper) > 0){
@@ -256,19 +256,15 @@ public class PersonService {
     }
 
     /**
-     * 根据图像文件名称得到id
+     * 根据图像文件名称得到IdenPerson
      * @param imageFileName
      * @return
      */
-    public Long getPersonIdByImageFileName(String imageFileName){
+    public IdenPerson getPersonIdByImageFileName(String imageFileName){
 
         QueryWrapper<IdenPerson> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().like(IdenPerson::getImage,imageFileName);
         IdenPerson idenPerson = idenPersonService.getOne(queryWrapper);
-        if(idenPerson != null) {
-            return idenPerson.getId();
-        } else {
-            return null;
-        }
+        return idenPerson;
     }
 }

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

@@ -11,7 +11,7 @@ import com.iden.common.service.IdenSysRoleService;
 import com.iden.common.util.MyBeanUtils;
 import com.iden.common.vo.SysRoleVO;
 import com.iden.common.vo.PageReqVO;
-import com.iden.common.vo.UserLogindConvertVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -38,7 +38,7 @@ public class SysRoleService {
      * 查询角色列表
      * @return
              */
-    public IPage<SysRoleVO> listSysRole(UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
+    public IPage<SysRoleVO> listSysRole(UserLoginedConvertVO loginUser, PageReqVO pageReqVo) {
             IPage<IdenSysRole> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
             QueryWrapper<IdenSysRole> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().orderByAsc(IdenSysRole::getCode);
@@ -87,7 +87,7 @@ public class SysRoleService {
      * @param vo
      */
     @Transactional(rollbackFor = Exception.class)
-    public int createSysRole(SysRoleVO vo, UserLogindConvertVO loginUser){
+    public int createSysRole(SysRoleVO vo, UserLoginedConvertVO loginUser){
         QueryWrapper<IdenSysRole> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(IdenSysRole::getName,vo.getName());
         if(idenSysRoleService.count(queryWrapper) > 0){

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

@@ -16,14 +16,11 @@ import com.iden.common.exception.BDException;
 import com.iden.common.service.*;
 
 import com.iden.common.util.MyBeanUtils;
-import com.iden.common.util.Result;
-import com.iden.common.util.WebPageUtils;
 import com.iden.common.vo.PageReqVO;
-import com.iden.common.vo.UserLogindConvertVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 
 import com.iden.common.vo.SysUserVO;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -46,15 +43,15 @@ public class SysUserService {
 
 
 
-    public UserLogindConvertVO getLoginUser(String username,String password) {
-        UserLogindConvertVO userLogindConvertVO = null;
+    public UserLoginedConvertVO getLoginUser(String username, String password) {
+        UserLoginedConvertVO userLoginedConvertVO = null;
 
         QueryWrapper<IdenSysUser>  userQueryWrapper = new QueryWrapper<>();
         userQueryWrapper.lambda().eq(IdenSysUser::getUsername,username);
         IdenSysUser user = this.idenSysUserService.getOne(userQueryWrapper);
         if (user != null) {
-            userLogindConvertVO = new UserLogindConvertVO();
-            BeanUtil.copyProperties(user,userLogindConvertVO);
+            userLoginedConvertVO = new UserLoginedConvertVO();
+            BeanUtil.copyProperties(user, userLoginedConvertVO);
 
             String md5Password = DigestUtils.md5Hex(password);
             if (!md5Password.equalsIgnoreCase(user.getPassword())) {
@@ -65,7 +62,7 @@ public class SysUserService {
             }
 
         }
-        return userLogindConvertVO;
+        return userLoginedConvertVO;
     }
 
 
@@ -73,7 +70,7 @@ public class SysUserService {
      * 查询系统用户列表
      * @return
              */
-    public IPage<SysUserVO> listSysUser(String nickname, String username, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
+    public IPage<SysUserVO> listSysUser(String nickname, String username, UserLoginedConvertVO loginUser, PageReqVO pageReqVo) {
             IPage<IdenSysUser> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
             QueryWrapper<IdenSysUser> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().like(StrUtil.isNotEmpty(nickname),IdenSysUser::getNickname,nickname)
@@ -127,7 +124,7 @@ public class SysUserService {
      * @param vo
      */
     @Transactional(rollbackFor = Exception.class)
-    public int createSysUser(SysUserVO vo, UserLogindConvertVO loginUser){
+    public int createSysUser(SysUserVO vo, UserLoginedConvertVO loginUser){
         QueryWrapper<IdenSysUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(IdenSysUser::getUsername,vo.getUsername());
         if(idenSysUserService.count(queryWrapper) > 0){

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

@@ -11,7 +11,7 @@ import com.iden.common.exception.BDException;
 import com.iden.common.util.DateUtils;
 import com.iden.common.util.ImgUtil;
 import com.iden.common.vo.TraceVO;
-import com.iden.common.vo.UserLogindConvertVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -79,7 +79,7 @@ public class TraceService {
      * 图像识别，使用特征码查询图像库，得到图库表中对应的数据列表
      * @return
              */
-    public List<TraceVO> listUploadImagesTrace(String images, String beginTime, String endTime, UserLogindConvertVO loginUser) {
+    public List<TraceVO> listUploadImagesTrace(String images, String beginTime, String endTime, UserLoginedConvertVO loginUser) {
         Date dateBegin = null;
         if(StringUtils.isNotEmpty(beginTime)){
             dateBegin  = DateUtils.strToDate(beginTime,"yyyy-MM-dd HH:mm:ss");

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

@@ -1,74 +0,0 @@
-package com.iden.bms.service;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.iden.common.entity.IdenWarningEveningComeSta;
-import com.iden.common.service.IdenWarningEveningComeStaService;
-
-import com.iden.common.vo.WarningEveningComeStaVO;
-import com.iden.common.vo.PageReqVO;
-import com.iden.common.vo.UserLogindConvertVO;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- *
- * @author makejava
- * @since 2021-05-21 00:08:38
- */
-@Service
-public class WarningEveningComeStaService {
-
-    @Resource
-    private IdenWarningEveningComeStaService idenWarningEveningComeStaService;
-
-    
-
-    /**
-     * 查询昼伏夜出人员预警列表
-     * @return
-             */
-    public IPage<WarningEveningComeStaVO> listWarningEveningComeSta(String district, String subdistrict,String communityName, String beginDate,String endDate,UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
-            IPage<IdenWarningEveningComeSta> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
-            QueryWrapper<IdenWarningEveningComeSta> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().like(StrUtil.isNotEmpty(communityName),IdenWarningEveningComeSta::getCommunityName,communityName)
-                    .eq(StrUtil.isNotEmpty(district),IdenWarningEveningComeSta::getDistrict,district)
-                    .eq(StrUtil.isNotEmpty(subdistrict),IdenWarningEveningComeSta::getSubdistrict,subdistrict)
-                    .ge(StrUtil.isNotEmpty(beginDate),IdenWarningEveningComeSta::getDataDate,beginDate)
-                    .le(StrUtil.isNotEmpty(endDate),IdenWarningEveningComeSta::getDataDate,endDate)
-                    .orderByAsc(IdenWarningEveningComeSta::getId);
-
-        queryWrapper.groupBy("community_id");
-        queryWrapper.select(
-                "community_id communityId",
-                "max(community_code) communityCode",
-                "max(community_name) communityName",
-                "max(district) district",
-                "max(subdistrict) subdistrict",
-                "max(data_date) dataDate",
-                "IFNULL(SUM(evening_come_count),0) eveningComeCount"
-        );
-
-            IPage<IdenWarningEveningComeSta> pageRes = this.idenWarningEveningComeStaService.page(page, queryWrapper);
-            IPage<WarningEveningComeStaVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
-            if(CollUtil.isNotEmpty(pageRes.getRecords())){
-                List<WarningEveningComeStaVO> list = new ArrayList<>();
-                pageRes.getRecords().forEach(item -> {
-                    WarningEveningComeStaVO resVO = new WarningEveningComeStaVO();
-                    BeanUtils.copyProperties(item,resVO);
-                    list.add(resVO);
-                });
-                results.setRecords(list);
-            }
-            return results;
-    }
-
-
-}

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

@@ -1,73 +0,0 @@
-package com.iden.bms.service;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.iden.common.entity.IdenWarningKeynoteSta;
-import com.iden.common.service.IdenWarningKeynoteStaService;
-import com.iden.common.vo.PageReqVO;
-import com.iden.common.vo.UserLogindConvertVO;
-import com.iden.common.vo.WarningKeynoteStaVO;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- *
- * @author makejava
- * @since 2021-05-21 00:08:38
- */
-@Service
-public class WarningKeynoteStaService {
-
-    @Resource
-    private IdenWarningKeynoteStaService idenWarningKeynoteStaService;
-
-    
-
-    /**
-     * 查询重点人员预警列表
-     * @return
-             */
-    public IPage<WarningKeynoteStaVO> listWarningKeynoteSta(String district, String subdistrict,String communityName, String beginDate,String endDate,UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
-            IPage<IdenWarningKeynoteSta> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
-            QueryWrapper<IdenWarningKeynoteSta> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().like(StrUtil.isNotEmpty(communityName),IdenWarningKeynoteSta::getCommunityName,communityName)
-                    .eq(StrUtil.isNotEmpty(district),IdenWarningKeynoteSta::getDistrict,district)
-                    .eq(StrUtil.isNotEmpty(subdistrict),IdenWarningKeynoteSta::getSubdistrict,subdistrict)
-                     .ge(StrUtil.isNotEmpty(beginDate),IdenWarningKeynoteSta::getDataDate,beginDate)
-                     .le(StrUtil.isNotEmpty(endDate),IdenWarningKeynoteSta::getDataDate,endDate)
-                    .orderByAsc(IdenWarningKeynoteSta::getId);
-
-        queryWrapper.groupBy("community_id");
-        queryWrapper.select(
-                "community_id communityId",
-                "max(community_code) communityCode",
-                "max(community_name) communityName",
-                "max(district) district",
-                "max(subdistrict) subdistrict",
-                "max(data_date) dataDate",
-                "IFNULL(SUM(keynote_count),0) keynoteCount"
-        );
-
-            IPage<IdenWarningKeynoteSta> pageRes = this.idenWarningKeynoteStaService.page(page, queryWrapper);
-            IPage<WarningKeynoteStaVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
-            if(CollUtil.isNotEmpty(pageRes.getRecords())){
-                List<WarningKeynoteStaVO> list = new ArrayList<>();
-                pageRes.getRecords().forEach(item -> {
-                    WarningKeynoteStaVO resVO = new WarningKeynoteStaVO();
-                    BeanUtils.copyProperties(item,resVO);
-                    list.add(resVO);
-                });
-                results.setRecords(list);
-            }
-            return results;
-    }
-
-
-}

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

@@ -1,73 +0,0 @@
-package com.iden.bms.service;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.iden.common.entity.IdenWarningPermanentSta;
-import com.iden.common.service.IdenWarningPermanentStaService;
-import com.iden.common.vo.PageReqVO;
-import com.iden.common.vo.UserLogindConvertVO;
-import com.iden.common.vo.WarningPermanentStaVO;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- *
- * @author makejava
- * @since 2021-05-21 00:08:38
- */
-@Service
-public class WarningPermanentStaService {
-
-    @Resource
-    private IdenWarningPermanentStaService idenWarningPermanentStaService;
-
-    
-
-    /**
-     * 查询常住人员预警列表
-     * @return
-             */
-    public IPage<WarningPermanentStaVO> listWarningPermanentSta(String district, String subdistrict,String communityName, String beginDate,String endDate,UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
-            IPage<IdenWarningPermanentSta> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
-            QueryWrapper<IdenWarningPermanentSta> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().like(StrUtil.isNotEmpty(communityName),IdenWarningPermanentSta::getCommunityName,communityName)
-                    .eq(StrUtil.isNotEmpty(district),IdenWarningPermanentSta::getDistrict,district)
-                    .eq(StrUtil.isNotEmpty(subdistrict),IdenWarningPermanentSta::getSubdistrict,subdistrict)
-                    .ge(StrUtil.isNotEmpty(beginDate),IdenWarningPermanentSta::getDataDate,beginDate)
-                    .le(StrUtil.isNotEmpty(endDate),IdenWarningPermanentSta::getDataDate,endDate)
-                    .orderByAsc(IdenWarningPermanentSta::getId);
-
-        queryWrapper.groupBy("community_id");
-        queryWrapper.select(
-                "community_id communityId",
-                "max(community_code) communityCode",
-                "max(community_name) communityName",
-                "max(district) district",
-                "max(subdistrict) subdistrict",
-                "max(data_date) dataDate",
-                "IFNULL(SUM(permanent_count),0) permanentCount"
-        );
-
-            IPage<IdenWarningPermanentSta> pageRes = this.idenWarningPermanentStaService.page(page, queryWrapper);
-            IPage<WarningPermanentStaVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
-            if(CollUtil.isNotEmpty(pageRes.getRecords())){
-                List<WarningPermanentStaVO> list = new ArrayList<>();
-                pageRes.getRecords().forEach(item -> {
-                    WarningPermanentStaVO resVO = new WarningPermanentStaVO();
-                    BeanUtils.copyProperties(item,resVO);
-                    list.add(resVO);
-                });
-                results.setRecords(list);
-            }
-            return results;
-    }
-
-
-}

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

@@ -5,11 +5,12 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.iden.common.entity.IdenWarningStrangerSta;
-import com.iden.common.service.IdenWarningStrangerStaService;
+import com.iden.common.entity.IdenWarningSta;
+import com.iden.common.service.IdenWarningStaService;
+
+import com.iden.common.vo.WarningStaVO;
 import com.iden.common.vo.PageReqVO;
-import com.iden.common.vo.UserLogindConvertVO;
-import com.iden.common.vo.WarningStrangerStaVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -23,26 +24,26 @@ import java.util.List;
  * @since 2021-05-21 00:08:38
  */
 @Service
-public class WarningStrangerStaService {
+public class WarningStaService {
 
     @Resource
-    private IdenWarningStrangerStaService idenWarningStrangerStaService;
+    private IdenWarningStaService idenWarningStaService;
 
     
 
     /**
-     * 查询陌生人员预警列表
+     * 查询预警统计列表
      * @return
              */
-    public IPage<WarningStrangerStaVO> listWarningStrangerSta(String district, String subdistrict,String communityName, String beginDate,String endDate,UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
-            IPage<IdenWarningStrangerSta> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
-            QueryWrapper<IdenWarningStrangerSta> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().like(StrUtil.isNotEmpty(communityName),IdenWarningStrangerSta::getCommunityName,communityName)
-                    .eq(StrUtil.isNotEmpty(district),IdenWarningStrangerSta::getDistrict,district)
-                    .eq(StrUtil.isNotEmpty(subdistrict),IdenWarningStrangerSta::getSubdistrict,subdistrict)
-                    .ge(StrUtil.isNotEmpty(beginDate),IdenWarningStrangerSta::getDataDate,beginDate)
-                    .le(StrUtil.isNotEmpty(endDate),IdenWarningStrangerSta::getDataDate,endDate)
-                    .orderByAsc(IdenWarningStrangerSta::getId);
+    public IPage<WarningStaVO> listWarningSta(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)
+                    .eq(StrUtil.isNotEmpty(district),IdenWarningSta::getDistrict,district)
+                    .eq(StrUtil.isNotEmpty(subdistrict),IdenWarningSta::getSubdistrict,subdistrict)
+                    .ge(StrUtil.isNotEmpty(beginDate),IdenWarningSta::getDataDate,beginDate)
+                    .le(StrUtil.isNotEmpty(endDate),IdenWarningSta::getDataDate,endDate)
+                    .orderByAsc(IdenWarningSta::getId);
 
         queryWrapper.groupBy("community_id");
         queryWrapper.select(
@@ -52,15 +53,18 @@ public class WarningStrangerStaService {
                 "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"
         );
 
-            IPage<IdenWarningStrangerSta> pageRes = this.idenWarningStrangerStaService.page(page, queryWrapper);
-            IPage<WarningStrangerStaVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
+            IPage<IdenWarningSta> pageRes = this.idenWarningStaService.page(page, queryWrapper);
+            IPage<WarningStaVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
             if(CollUtil.isNotEmpty(pageRes.getRecords())){
-                List<WarningStrangerStaVO> list = new ArrayList<>();
+                List<WarningStaVO> list = new ArrayList<>();
                 pageRes.getRecords().forEach(item -> {
-                    WarningStrangerStaVO resVO = new WarningStrangerStaVO();
+                    WarningStaVO resVO = new WarningStaVO();
                     BeanUtils.copyProperties(item,resVO);
                     list.add(resVO);
                 });

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

@@ -1,83 +0,0 @@
-package com.iden.common.entity;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.time.LocalDateTime;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 昼伏夜出人口识别预警统计表(IdenWarningEveningComeSta)实体类
- *
- * @author makejava
- * @since 2021-12-22 20:19:16
- */
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("iden_warning_evening_come_sta")
-@ApiModel(value = "昼伏夜出人口识别预警统计表", description = "")
-public class IdenWarningEveningComeSta implements Serializable {
-    private static final long serialVersionUID = 985331715970898803L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-
-    @ApiModelProperty("所属小区id")
-    @TableField("COMMUNITY_ID")
-    private Long communityId;
-
-
-    @ApiModelProperty("小区编号")
-    @TableField("COMMUNITY_CODE")
-    private String communityCode;
-
-
-    @ApiModelProperty("小区名称")
-    @TableField("COMMUNITY_NAME")
-    private String communityName;
-
-
-    @ApiModelProperty("所属区域")
-    @TableField("DISTRICT")
-    private String district;
-
-
-    @ApiModelProperty("所属街道")
-    @TableField("SUBDISTRICT")
-    private String subdistrict;
-
-
-    @ApiModelProperty("昼伏夜出人员总数")
-    @TableField("EVENING_COME_COUNT")
-    private Long eveningComeCount;
-
-    @ApiModelProperty("数据日期")
-    @TableField("DATA_DATE")
-    private Date dataDate;
-
-    @ApiModelProperty("createTime")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-
-    @ApiModelProperty("modifyTime")
-    @TableField("MODIFY_TIME")
-    private Date modifyTime;
-
-
-}

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

@@ -1,83 +0,0 @@
-package com.iden.common.entity;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.time.LocalDateTime;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 重点人员识别预警统计表(IdenWarningKeynoteSta)实体类
- *
- * @author makejava
- * @since 2021-12-23 11:08:19
- */
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("iden_warning_keynote_sta")
-@ApiModel(value = "重点人员识别预警统计表", description = "")
-public class IdenWarningKeynoteSta implements Serializable {
-    private static final long serialVersionUID = -48099154074943251L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-
-    @ApiModelProperty("所属小区id")
-    @TableField("COMMUNITY_ID")
-    private Long communityId;
-
-
-    @ApiModelProperty("小区编号")
-    @TableField("COMMUNITY_CODE")
-    private String communityCode;
-
-
-    @ApiModelProperty("小区名称")
-    @TableField("COMMUNITY_NAME")
-    private String communityName;
-
-
-    @ApiModelProperty("所属区域")
-    @TableField("DISTRICT")
-    private String district;
-
-
-    @ApiModelProperty("所属街道")
-    @TableField("SUBDISTRICT")
-    private String subdistrict;
-
-
-    @ApiModelProperty("重点人员总数")
-    @TableField("KEYNOTE_COUNT")
-    private Long keynoteCount;
-
-    @ApiModelProperty("数据日期")
-    @TableField("DATA_DATE")
-    private Date dataDate;
-
-    @ApiModelProperty("createTime")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-
-    @ApiModelProperty("modifyTime")
-    @TableField("MODIFY_TIME")
-    private Date modifyTime;
-
-
-}

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

@@ -19,19 +19,19 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * 常住人口识别预警统计表(IdenWarningPermanentSta)实体类
+ * 预警统计表(IdenWarningSta)实体类
  *
  * @author makejava
- * @since 2021-12-22 20:19:17
+ * @since 2021-12-27 01:27:16
  */
 
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("iden_warning_permanent_sta")
-@ApiModel(value = "常住人口识别预警统计表", description = "")
-public class IdenWarningPermanentSta implements Serializable {
-    private static final long serialVersionUID = 780363491063638399L;
+@TableName("iden_warning_sta")
+@ApiModel(value = "预警统计表", description = "")
+public class IdenWarningSta implements Serializable {
+    private static final long serialVersionUID = 220466040459159324L;
 
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
@@ -62,14 +62,31 @@ public class IdenWarningPermanentSta implements Serializable {
     private String subdistrict;
 
 
+    @ApiModelProperty("重点人员总数")
+    @TableField("KEYNOTE_COUNT")
+    private Long keynoteCount;
+
+
     @ApiModelProperty("大于7天未出现常住人总数")
     @TableField("PERMANENT_COUNT")
     private Long permanentCount;
 
+
+    @ApiModelProperty("昼伏夜出人员总数")
+    @TableField("EVENING_COME_COUNT")
+    private Long eveningComeCount;
+
+
+    @ApiModelProperty("陌生人总数")
+    @TableField("STRANGER_COUNT")
+    private Long strangerCount;
+
+
     @ApiModelProperty("数据日期")
     @TableField("DATA_DATE")
     private Date dataDate;
 
+
     @ApiModelProperty("createTime")
     @TableField("CREATE_TIME")
     private Date createTime;

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

@@ -1,83 +0,0 @@
-package com.iden.common.entity;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.time.LocalDateTime;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 陌生人员识别预警统计表(IdenWarningStrangerSta)实体类
- *
- * @author makejava
- * @since 2021-12-22 20:19:17
- */
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("iden_warning_stranger_sta")
-@ApiModel(value = "陌生人员识别预警统计表", description = "")
-public class IdenWarningStrangerSta implements Serializable {
-    private static final long serialVersionUID = 618456629263970444L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-
-    @ApiModelProperty("所属小区id")
-    @TableField("COMMUNITY_ID")
-    private Long communityId;
-
-
-    @ApiModelProperty("小区编号")
-    @TableField("COMMUNITY_CODE")
-    private String communityCode;
-
-
-    @ApiModelProperty("小区名称")
-    @TableField("COMMUNITY_NAME")
-    private String communityName;
-
-
-    @ApiModelProperty("所属区域")
-    @TableField("DISTRICT")
-    private String district;
-
-
-    @ApiModelProperty("所属街道")
-    @TableField("SUBDISTRICT")
-    private String subdistrict;
-
-
-    @ApiModelProperty("陌生人总数")
-    @TableField("STRANGER_COUNT")
-    private Long strangerCount;
-
-    @ApiModelProperty("数据日期")
-    @TableField("DATA_DATE")
-    private Date dataDate;
-
-    @ApiModelProperty("createTime")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-
-    @ApiModelProperty("modifyTime")
-    @TableField("MODIFY_TIME")
-    private Date modifyTime;
-
-
-}

src/main/java/com/iden/common/interceptor/AuthorizationInterceptor.java

@@ -3,7 +3,7 @@ package com.iden.common.interceptor;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.iden.common.constant.Constants;
-import com.iden.common.vo.UserLogindConvertVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 import com.iden.common.util.JwtUtils;
 import io.jsonwebtoken.Claims;
 import org.springframework.stereotype.Component;
@@ -32,7 +32,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
          */
         Claims claims = parseToken(request);
         if (claims != null) {
-            UserLogindConvertVO dto = JSONUtil.toBean(claims.getSubject(), UserLogindConvertVO.class);
+            UserLoginedConvertVO dto = JSONUtil.toBean(claims.getSubject(), UserLoginedConvertVO.class);
             if (dto != null) {
                 /**
                  * 设置登录用户到请求 Request 中.

src/main/java/com/iden/common/interceptor/ControllerInterceptor.java

@@ -9,7 +9,7 @@ import com.iden.common.util.PageResult;
 import com.iden.common.util.Result;
 import com.iden.common.util.ResultCode;
 import com.iden.common.util.WebPageUtils;
-import com.iden.common.vo.UserLogindConvertVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 import io.swagger.annotations.ApiOperation;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -103,7 +103,7 @@ public class ControllerInterceptor {
             String ip = WebPageUtils.getIpAddr(request);
             logger.debug("请求IP: " + ip);
 //            sysLogDO.setIp(ip);
-            UserLogindConvertVO dto = (UserLogindConvertVO)request.getAttribute(Constants.CURRENT_LOGINED_USER_KEY);
+            UserLoginedConvertVO dto = (UserLoginedConvertVO)request.getAttribute(Constants.CURRENT_LOGINED_USER_KEY);
             if (dto != null) {
 //                UserDO userDO = new UserDO();
 //                userDO.setId(dto.getId());

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

@@ -1,15 +0,0 @@
-package com.iden.common.mapper;
-
-import com.iden.common.entity.IdenWarningEveningComeSta;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-
-/**
- * 昼伏夜出人口识别预警统计表(IdenWarningEveningComeSta)表数据库访问层
- *
- * @author makejava
- * @since 2021-12-22 20:19:16
- */
-public interface IdenWarningEveningComeStaMapper extends BaseMapper<IdenWarningEveningComeSta> {
-
-}

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

@@ -1,15 +0,0 @@
-package com.iden.common.mapper;
-
-import com.iden.common.entity.IdenWarningKeynoteSta;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-
-/**
- * 重点人员识别预警统计表(IdenWarningKeynoteSta)表数据库访问层
- *
- * @author makejava
- * @since 2021-12-23 11:08:23
- */
-public interface IdenWarningKeynoteStaMapper extends BaseMapper<IdenWarningKeynoteSta> {
-
-}

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

@@ -1,15 +0,0 @@
-package com.iden.common.mapper;
-
-import com.iden.common.entity.IdenWarningPermanentSta;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-
-/**
- * 常住人口识别预警统计表(IdenWarningPermanentSta)表数据库访问层
- *
- * @author makejava
- * @since 2021-12-22 20:19:17
- */
-public interface IdenWarningPermanentStaMapper extends BaseMapper<IdenWarningPermanentSta> {
-
-}

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

@@ -0,0 +1,15 @@
+package com.iden.common.mapper;
+
+import com.iden.common.entity.IdenWarningSta;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+
+/**
+ * 预警统计表(IdenWarningSta)表数据库访问层
+ *
+ * @author makejava
+ * @since 2021-12-27 01:27:26
+ */
+public interface IdenWarningStaMapper extends BaseMapper<IdenWarningSta> {
+
+}

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

@@ -1,15 +0,0 @@
-package com.iden.common.mapper;
-
-import com.iden.common.entity.IdenWarningStrangerSta;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-
-/**
- * 陌生人员识别预警统计表(IdenWarningStrangerSta)表数据库访问层
- *
- * @author makejava
- * @since 2021-12-22 20:19:17
- */
-public interface IdenWarningStrangerStaMapper extends BaseMapper<IdenWarningStrangerSta> {
-
-}

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

@@ -1,14 +0,0 @@
-package com.iden.common.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.iden.common.entity.IdenWarningEveningComeSta;
-
-/**
- * 昼伏夜出人口识别预警统计表(IdenWarningEveningComeSta)表服务接口
- *
- * @author makejava
- * @since 2021-12-22 20:19:16
- */
-public interface IdenWarningEveningComeStaService extends IService<IdenWarningEveningComeSta> {
-
-}

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

@@ -1,14 +0,0 @@
-package com.iden.common.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.iden.common.entity.IdenWarningKeynoteSta;
-
-/**
- * 重点人员识别预警统计表(IdenWarningKeynoteSta)表服务接口
- *
- * @author makejava
- * @since 2021-12-23 11:08:24
- */
-public interface IdenWarningKeynoteStaService extends IService<IdenWarningKeynoteSta> {
-
-}

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

@@ -1,14 +0,0 @@
-package com.iden.common.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.iden.common.entity.IdenWarningPermanentSta;
-
-/**
- * 常住人口识别预警统计表(IdenWarningPermanentSta)表服务接口
- *
- * @author makejava
- * @since 2021-12-22 20:19:17
- */
-public interface IdenWarningPermanentStaService extends IService<IdenWarningPermanentSta> {
-
-}

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

@@ -0,0 +1,14 @@
+package com.iden.common.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.iden.common.entity.IdenWarningSta;
+
+/**
+ * 预警统计表(IdenWarningSta)表服务接口
+ *
+ * @author makejava
+ * @since 2021-12-27 01:27:26
+ */
+public interface IdenWarningStaService extends IService<IdenWarningSta> {
+
+}

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

@@ -1,14 +0,0 @@
-package com.iden.common.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.iden.common.entity.IdenWarningStrangerSta;
-
-/**
- * 陌生人员识别预警统计表(IdenWarningStrangerSta)表服务接口
- *
- * @author makejava
- * @since 2021-12-22 20:19:17
- */
-public interface IdenWarningStrangerStaService extends IService<IdenWarningStrangerSta> {
-
-}

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

@@ -1,18 +0,0 @@
-package com.iden.common.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.iden.common.mapper.IdenWarningEveningComeStaMapper;
-import com.iden.common.entity.IdenWarningEveningComeSta;
-import com.iden.common.service.IdenWarningEveningComeStaService;
-import org.springframework.stereotype.Service;
-
-/**
- * 昼伏夜出人口识别预警统计表(IdenWarningEveningComeSta)表服务实现类
- *
- * @author makejava
- * @since 2021-12-22 20:19:17
- */
-@Service
-public class IdenWarningEveningComeStaServiceImpl extends ServiceImpl<IdenWarningEveningComeStaMapper, IdenWarningEveningComeSta> implements IdenWarningEveningComeStaService {
-
-}

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

@@ -1,18 +0,0 @@
-package com.iden.common.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.iden.common.mapper.IdenWarningKeynoteStaMapper;
-import com.iden.common.entity.IdenWarningKeynoteSta;
-import com.iden.common.service.IdenWarningKeynoteStaService;
-import org.springframework.stereotype.Service;
-
-/**
- * 重点人员识别预警统计表(IdenWarningKeynoteSta)表服务实现类
- *
- * @author makejava
- * @since 2021-12-23 11:08:25
- */
-@Service
-public class IdenWarningKeynoteStaServiceImpl extends ServiceImpl<IdenWarningKeynoteStaMapper, IdenWarningKeynoteSta> implements IdenWarningKeynoteStaService {
-
-}

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

@@ -1,18 +0,0 @@
-package com.iden.common.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.iden.common.mapper.IdenWarningPermanentStaMapper;
-import com.iden.common.entity.IdenWarningPermanentSta;
-import com.iden.common.service.IdenWarningPermanentStaService;
-import org.springframework.stereotype.Service;
-
-/**
- * 常住人口识别预警统计表(IdenWarningPermanentSta)表服务实现类
- *
- * @author makejava
- * @since 2021-12-22 20:19:17
- */
-@Service
-public class IdenWarningPermanentStaServiceImpl extends ServiceImpl<IdenWarningPermanentStaMapper, IdenWarningPermanentSta> implements IdenWarningPermanentStaService {
-
-}

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

@@ -0,0 +1,18 @@
+package com.iden.common.service.impl;
+
+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 org.springframework.stereotype.Service;
+
+/**
+ * 预警统计表(IdenWarningSta)表服务实现类
+ *
+ * @author makejava
+ * @since 2021-12-27 01:27:30
+ */
+@Service
+public class IdenWarningStaServiceImpl extends ServiceImpl<IdenWarningStaMapper, IdenWarningSta> implements IdenWarningStaService {
+
+}

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

@@ -1,18 +0,0 @@
-package com.iden.common.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.iden.common.mapper.IdenWarningStrangerStaMapper;
-import com.iden.common.entity.IdenWarningStrangerSta;
-import com.iden.common.service.IdenWarningStrangerStaService;
-import org.springframework.stereotype.Service;
-
-/**
- * 陌生人员识别预警统计表(IdenWarningStrangerSta)表服务实现类
- *
- * @author makejava
- * @since 2021-12-22 20:19:17
- */
-@Service
-public class IdenWarningStrangerStaServiceImpl extends ServiceImpl<IdenWarningStrangerStaMapper, IdenWarningStrangerSta> implements IdenWarningStrangerStaService {
-
-}

src/main/java/com/iden/common/util/FileUtil.java

@@ -0,0 +1,39 @@
+package com.iden.common.util;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+public class FileUtil {
+
+    /**
+     * 按名称递增排序
+     * @param files
+     * @return
+     */
+    public static File[] sortByName(File[] files) {
+        if (files == null|| files.length == 0) {
+            return files;
+        }
+        List<File> fileList = new ArrayList<>();
+        for (File f : files) {
+            fileList.add(f);
+        }
+        Collections.sort(fileList, new Comparator<File>() {
+            @Override
+            public int compare(File o1, File o2) {
+                return o1.getName().compareTo(o2.getName());
+            }
+        });
+        File[] filesNew = new File[fileList.size()];
+        return fileList.toArray(filesNew);
+    }
+
+    public static void main(String[] args) {
+        File[] files = new File[]{new File("3"),new File("2"),new File("4")};
+        files =  sortByName(files);
+        System.out.println(files);
+    }
+}

src/main/java/com/iden/common/util/JwtUtils.java

@@ -1,7 +1,7 @@
 package com.iden.common.util;
 
 import cn.hutool.json.JSONUtil;
-import com.iden.common.vo.UserLogindConvertVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
@@ -38,7 +38,7 @@ public class JwtUtils {
         return key;
     }
 
-    public static String generalToken(UserLogindConvertVO userLogindConvertDTO) {
+    public static String generalToken(UserLoginedConvertVO userLogindConvertDTO) {
         String compactJws = null;
         try {
             long nowMillis = System.currentTimeMillis();

src/main/java/com/iden/common/util/WebPageUtils.java

@@ -1,7 +1,7 @@
 package com.iden.common.util;
 
 import com.iden.common.constant.Constants;
-import com.iden.common.vo.UserLogindConvertVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -22,12 +22,12 @@ public class WebPageUtils {
      * @param request
      * @return
      */
-    public static UserLogindConvertVO getCurrentLoginedUser(HttpServletRequest request) {
+    public static UserLoginedConvertVO getCurrentLoginedUser(HttpServletRequest request) {
         if (request == null) {
             return null;
         }
         Object obj = request.getAttribute(Constants.CURRENT_LOGINED_USER_KEY);
-        return obj != null ? (UserLogindConvertVO)obj : null;
+        return obj != null ? (UserLoginedConvertVO)obj : null;
     }
 
     /**

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

@@ -0,0 +1,46 @@
+package com.iden.common.vo;
+
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * @author makejava
+ * @since 2021-12-22 17:23:46
+ */
+
+@Data
+@ApiModel(value = "首页汇总值", description = "")
+public class HomPageCountVO implements Serializable {
+    private static final long serialVersionUID = -44732106174401548L;
+
+    @ApiModelProperty("今日人脸抓拍数量")
+    private Long todayFaceImageCount;
+
+    @ApiModelProperty("今日陌生人抓拍数量")
+    private Long todaStrangerFaceImageCount;
+
+    @ApiModelProperty("今日重点人口抓拍件数量")
+    private Long todayKeynoteFaceImageCount;
+
+    @ApiModelProperty("预警事件数量")
+    private Long warningEventCount;
+
+
+    @ApiModelProperty("设备总数量")
+    private Long cameraCount;
+
+
+    @ApiModelProperty("当前系统总录入数")
+    private Long personCount;
+
+
+    @ApiModelProperty("当前头像录入")
+    private Long cameraPersonCount;
+
+}

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

@@ -0,0 +1,37 @@
+package com.iden.common.vo;
+
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * @author makejava
+ * @since 2021-12-22 17:23:46
+ */
+
+@Data
+@ApiModel(value = "首页上周汇总值", description = "")
+public class HomPageLastWeekCountVO 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;
+
+}

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

@@ -0,0 +1,49 @@
+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

@@ -0,0 +1,49 @@
+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/UserLogindConvertVO.java

@@ -1,16 +1,14 @@
 package com.iden.common.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class UserLogindConvertVO {
+public class UserLoginedConvertVO {
 
-    @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
 
     @ApiModelProperty("用户名")
@@ -25,7 +23,7 @@ public class UserLogindConvertVO {
     @ApiModelProperty("启用状态：0启用，1停用")
     private String validStatus;
 
-    @ApiModelProperty("system:系统管理员")
+    @ApiModelProperty("high: 高级管理员，middle： 中级管理员，low：低级管理员")
     private String role;
 
 }

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

@@ -1,64 +0,0 @@
-package com.iden.common.vo;
-
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 重点人员识别预警统计表(IdenWarningKeynoteSta)实体类
- *
- * @author makejava
- * @since 2021-12-23 11:08:19
- */
-
-@Data
-@ApiModel(value = "重点人员识别预警统计表", description = "")
-public class WarningKeynoteStaVO implements Serializable {
-    private static final long serialVersionUID = -48099154074943251L;
-
-    private Long id;
-
-
-    @ApiModelProperty("所属小区id")
-    private Long communityId;
-
-
-    @ApiModelProperty("小区编号")
-    private String communityCode;
-
-
-    @ApiModelProperty("小区名称")
-    private String communityName;
-
-
-    @ApiModelProperty("所属区域")
-    private String district;
-
-
-    @ApiModelProperty("所属街道")
-    private String subdistrict;
-
-
-    @ApiModelProperty("重点人员总数")
-    private Long keynoteCount;
-
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    @ApiModelProperty("数据日期")
-    private Date dataDate;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @ApiModelProperty("createTime")
-    private Date createTime;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @ApiModelProperty("modifyTime")
-    private Date modifyTime;
-
-
-}

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

@@ -1,63 +0,0 @@
-package com.iden.common.vo;
-
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 常住人口识别预警统计表(IdenWarningPermanentSta)实体类
- *
- * @author makejava
- * @since 2021-12-22 20:19:17
- */
-
-@Data
-@ApiModel(value = "常住人口识别预警统计表", description = "")
-public class WarningPermanentStaVO implements Serializable {
-    private static final long serialVersionUID = 780363491063638399L;
-
-    private Long id;
-
-
-    @ApiModelProperty("所属小区id")
-    private Long communityId;
-
-
-    @ApiModelProperty("小区编号")
-    private String communityCode;
-
-
-    @ApiModelProperty("小区名称")
-    private String communityName;
-
-
-    @ApiModelProperty("所属区域")
-    private String district;
-
-
-    @ApiModelProperty("所属街道")
-    private String subdistrict;
-
-
-    @ApiModelProperty("大于7天未出现常住人总数")
-    private Long permanentCount;
-
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    @ApiModelProperty("数据日期")
-    private Date dataDate;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @ApiModelProperty("createTime")
-    private Date createTime;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @ApiModelProperty("modifyTime")
-    private Date modifyTime;
-
-
-}

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

@@ -19,7 +19,7 @@ import java.util.Date;
 
 @Data
 @ApiModel(value = "昼伏夜出人口识别预警统计表", description = "")
-public class WarningEveningComeStaVO implements Serializable {
+public class WarningStaVO implements Serializable {
     private static final long serialVersionUID = 985331715970898803L;
 
     private Long id;
@@ -45,9 +45,18 @@ public class WarningEveningComeStaVO implements Serializable {
     private String subdistrict;
 
 
+    @ApiModelProperty("重点人员总数")
+    private Long keynoteCount;
+
     @ApiModelProperty("昼伏夜出人员总数")
     private Long eveningComeCount;
 
+    @ApiModelProperty("大于7天未出现常住人总数")
+    private Long permanentCount;
+
+    @ApiModelProperty("陌生人总数")
+    private Long strangerCount;
+
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @ApiModelProperty("数据日期")
     private Date dataDate;

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

@@ -1,64 +0,0 @@
-package com.iden.common.vo;
-
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 陌生人员识别预警统计表(IdenWarningStrangerSta)实体类
- *
- * @author makejava
- * @since 2021-12-22 20:19:17
- */
-
-@Data
-@ApiModel(value = "陌生人员识别预警统计表", description = "")
-public class WarningStrangerStaVO implements Serializable {
-    private static final long serialVersionUID = 618456629263970444L;
-
-    private Long id;
-
-
-    @ApiModelProperty("所属小区id")
-    private Long communityId;
-
-
-    @ApiModelProperty("小区编号")
-    private String communityCode;
-
-
-    @ApiModelProperty("小区名称")
-    private String communityName;
-
-
-    @ApiModelProperty("所属区域")
-    private String district;
-
-
-    @ApiModelProperty("所属街道")
-    private String subdistrict;
-
-
-    @ApiModelProperty("陌生人总数")
-    private Long strangerCount;
-
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    @ApiModelProperty("数据日期")
-    private Date dataDate;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @ApiModelProperty("createTime")
-    private Date createTime;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @ApiModelProperty("modifyTime")
-    private Date modifyTime;
-
-
-}

src/main/resources/mybatis/IdenFaceImageMapper.xml

@@ -2,5 +2,36 @@
 <!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
+        (
+          select count(1) from iden_face_image where DATE_FORMAT(photograph_time,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d')
+        ) todayFaceImageCount,
+        (
+          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,
+        (
+          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,
+        (
+          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,
+        (
+          select count(1) from iden_camera
+        )  cameraCount,
+         (
+          select count(1) from iden_person
+        )  personCount,
+          (
+          select count(1) from iden_person where image is not null
+        )  cameraPersonCount
+        from dual
+    </select>
+
+    <select id="queryWarningEventRate" resultType="com.iden.common.vo.HomePageWarningEventRateVO">
+        select
+    </select>
 
 </mapper>

src/main/resources/mybatis/IdenWarningEveningComeStaMapper.xml

@@ -1,6 +0,0 @@
-<?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.IdenWarningEveningComeStaMapper">
-
-
-</mapper>

src/main/resources/mybatis/IdenWarningPermanentStaMapper.xml

@@ -1,6 +0,0 @@
-<?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.IdenWarningPermanentStaMapper">
-
-
-</mapper>

src/main/resources/mybatis/IdenWarningKeynoteStaMapper.xml

@@ -1,6 +1,6 @@
 <?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.IdenWarningKeynoteStaMapper">
+<mapper namespace="com.iden.common.mapper.IdenWarningStaMapper">
 
 
 </mapper>

src/main/resources/mybatis/IdenWarningStrangerStaMapper.xml

@@ -1,6 +0,0 @@
-<?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.IdenWarningStrangerStaMapper">
-
-
-</mapper>