suntianwu 3 years ago
parent
commit
f508b052ae
51 changed files with 202 additions and 118 deletions
  1. 6 7
      src/main/java/com/iden/bms/controller/CommunityController.java
  2. 3 3
      src/main/java/com/iden/bms/controller/CrowdController.java
  3. 6 6
      src/main/java/com/iden/bms/controller/FaceImageController.java
  4. 4 1
      src/main/java/com/iden/bms/controller/HomePageController.java
  5. 0 1
      src/main/java/com/iden/bms/controller/LoginController.java
  6. 5 2
      src/main/java/com/iden/bms/controller/SysRoleController.java
  7. 3 4
      src/main/java/com/iden/bms/controller/SysUserController.java
  8. 5 5
      src/main/java/com/iden/bms/controller/TraceController.java
  9. 1 1
      src/main/java/com/iden/bms/face/FaceIdenTool.java
  10. 5 1
      src/main/java/com/iden/bms/service/FaceImageService.java
  11. 5 1
      src/main/java/com/iden/bms/service/HomePageService.java
  12. 1 1
      src/main/java/com/iden/bms/service/SysRoleService.java
  13. 6 3
      src/main/java/com/iden/bms/service/SysUserService.java
  14. 2 2
      src/main/java/com/iden/bms/service/WarningService.java
  15. 6 3
      src/main/java/com/iden/bms/service/WarningStaService.java
  16. 1 1
      src/main/java/com/iden/common/config/MyBatisPlusConfig.java
  17. 1 1
      src/main/java/com/iden/common/config/SwaggerConfig.java
  18. 0 2
      src/main/java/com/iden/common/entity/IdenCamera.java
  19. 0 2
      src/main/java/com/iden/common/entity/IdenCameraVideo.java
  20. 0 2
      src/main/java/com/iden/common/entity/IdenCity.java
  21. 0 2
      src/main/java/com/iden/common/entity/IdenCommunity.java
  22. 0 2
      src/main/java/com/iden/common/entity/IdenCrowd.java
  23. 0 2
      src/main/java/com/iden/common/entity/IdenDistrict.java
  24. 0 2
      src/main/java/com/iden/common/entity/IdenFaceImage.java
  25. 0 2
      src/main/java/com/iden/common/entity/IdenPerson.java
  26. 0 2
      src/main/java/com/iden/common/entity/IdenPersonCrowdRef.java
  27. 0 2
      src/main/java/com/iden/common/entity/IdenProvince.java
  28. 0 2
      src/main/java/com/iden/common/entity/IdenRoleMenuRel.java
  29. 0 2
      src/main/java/com/iden/common/entity/IdenSubdistrict.java
  30. 0 2
      src/main/java/com/iden/common/entity/IdenSysDict.java
  31. 0 2
      src/main/java/com/iden/common/entity/IdenSysDictItem.java
  32. 0 2
      src/main/java/com/iden/common/entity/IdenSysLog.java
  33. 0 2
      src/main/java/com/iden/common/entity/IdenSysMenu.java
  34. 0 2
      src/main/java/com/iden/common/entity/IdenSysRole.java
  35. 0 2
      src/main/java/com/iden/common/entity/IdenSysUser.java
  36. 0 2
      src/main/java/com/iden/common/entity/IdenWarningEvent.java
  37. 0 2
      src/main/java/com/iden/common/entity/IdenWarningPerson.java
  38. 0 2
      src/main/java/com/iden/common/entity/IdenWarningPersonTrace.java
  39. 0 2
      src/main/java/com/iden/common/entity/IdenWarningRuleResident.java
  40. 0 2
      src/main/java/com/iden/common/entity/IdenWarningRuleStranger.java
  41. 0 2
      src/main/java/com/iden/common/entity/IdenWarningSta.java
  42. 1 1
      src/main/java/com/iden/common/interceptor/ControllerInterceptor.java
  43. 0 3
      src/main/java/com/iden/common/mapper/IdenWarningPersonMapper.java
  44. 0 3
      src/main/java/com/iden/common/service/IdenWarningPersonService.java
  45. 0 3
      src/main/java/com/iden/common/service/impl/IdenWarningPersonServiceImpl.java
  46. 0 6
      src/main/java/com/iden/common/vo/CrowdVO.java
  47. 0 7
      src/main/java/com/iden/common/vo/SysRoleVO.java
  48. 1 1
      src/main/resources/application-dev.properties
  49. 1 1
      src/main/resources/application.properties
  50. 2 2
      src/main/resources/logback.xml
  51. 137 0
      src/test/java/com/face/monitor/FaceTest.java

+ 6 - 7
src/main/java/com/iden/bms/controller/CommunityController.java

@@ -3,7 +3,6 @@ package com.iden.bms.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.iden.bms.service.CommunityService;
 import com.iden.bms.service.CommunityService;
 import com.iden.common.annotation.Permission;
 import com.iden.common.annotation.Permission;
-import com.iden.common.exceltool.MultipartFileToFile;
 import com.iden.common.exception.BDException;
 import com.iden.common.exception.BDException;
 import com.iden.common.logaspect.LogAnnotation;
 import com.iden.common.logaspect.LogAnnotation;
 import com.iden.common.logaspect.OperateType;
 import com.iden.common.logaspect.OperateType;
@@ -50,9 +49,9 @@ public class CommunityController {
 
 
     })
     })
     public Result<Integer> countCommunity(HttpServletRequest request, @RequestHeader(value = "token") String token,
     public Result<Integer> countCommunity(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                                       @RequestParam(value = "district", required = false) String district,
-                                                       @RequestParam(value = "subdistrict", required = false) String subdistrict,
-                                                       @RequestParam(value = "name", required = false) String name){
+                                          @RequestParam(value = "district", required = false) String district,
+                                          @RequestParam(value = "subdistrict", required = false) String subdistrict,
+                                          @RequestParam(value = "name", required = false) String name){
         try {
         try {
             UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             Integer count = this.communityService.countCommunity(district,subdistrict,name,loginUser);
             Integer count = this.communityService.countCommunity(district,subdistrict,name,loginUser);
@@ -76,10 +75,10 @@ public class CommunityController {
 
 
     })
     })
     public PageResult<List<CommunityVO>> listCommunity(HttpServletRequest request, @RequestHeader(value = "token") String token,
     public PageResult<List<CommunityVO>> listCommunity(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                                  @RequestParam(value = "district", required = false) String district,
-                                                  @RequestParam(value = "subdistrict", required = false) String subdistrict,
+                                                       @RequestParam(value = "district", required = false) String district,
+                                                       @RequestParam(value = "subdistrict", required = false) String subdistrict,
                                                        @RequestParam(value = "name", required = false) String name,
                                                        @RequestParam(value = "name", required = false) String name,
-                                                  PageReqVO pageReqVo){
+                                                       PageReqVO pageReqVo){
         try {
         try {
             UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             IPage<CommunityVO> pageResponse = this.communityService.listCommunity(district,subdistrict,name,loginUser ,pageReqVo);
             IPage<CommunityVO> pageResponse = this.communityService.listCommunity(district,subdistrict,name,loginUser ,pageReqVo);

+ 3 - 3
src/main/java/com/iden/bms/controller/CrowdController.java

@@ -46,8 +46,8 @@ public class CrowdController {
 
 
     })
     })
     public PageResult<List<CrowdVO>> listCrowd(HttpServletRequest request, @RequestHeader(value = "token") String token,
     public PageResult<List<CrowdVO>> listCrowd(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                                 @RequestParam(value = "name", required = false) String name,
-                                                 PageReqVO pageReqVo){
+                                               @RequestParam(value = "name", required = false) String name,
+                                               PageReqVO pageReqVo){
         try {
         try {
             UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             IPage<CrowdVO> pageResponse = this.crowdService.listCrowd(name,loginUser ,pageReqVo);
             IPage<CrowdVO> pageResponse = this.crowdService.listCrowd(name,loginUser ,pageReqVo);
@@ -68,7 +68,7 @@ public class CrowdController {
             moduleName = "新增人群",
             moduleName = "新增人群",
             description = "新增人群"
             description = "新增人群"
     )
     )
-    public Result<Object> addCrowd(HttpServletRequest request,@RequestHeader("token") String token,
+    public Result<Object> addCrowd(HttpServletRequest request, @RequestHeader("token") String token,
                                    @RequestBody CrowdVO vo){
                                    @RequestBody CrowdVO vo){
         try {
         try {
 
 

+ 6 - 6
src/main/java/com/iden/bms/controller/FaceImageController.java

@@ -49,12 +49,12 @@ public class FaceImageController {
 
 
     })
     })
     public PageResult<List<FaceImageVO>> listFaceImage(HttpServletRequest request, @RequestHeader(value = "token") String token,
     public PageResult<List<FaceImageVO>> listFaceImage(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                                        @RequestParam(value = "type", required = true) String type,
-                                                        @RequestParam(value = "communityId", required = false) Long communityId,
-                                                        @RequestParam(value = "photographPlace", required = false) String photographPlace,
-                                                        @RequestParam(value = "beginDate", required = false) String beginDate,
-                                                        @RequestParam(value = "endDate", required = false) String endDate,
-                                                        PageReqVO pageReqVo){
+                                                       @RequestParam(value = "type", required = true) String type,
+                                                       @RequestParam(value = "communityId", required = false) Long communityId,
+                                                       @RequestParam(value = "photographPlace", required = false) String photographPlace,
+                                                       @RequestParam(value = "beginDate", required = false) String beginDate,
+                                                       @RequestParam(value = "endDate", required = false) String endDate,
+                                                       PageReqVO pageReqVo){
         try {
         try {
             UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             IPage<FaceImageVO> pageResponse = this.faceImageService.listFaceImage(type,communityId,photographPlace,beginDate,endDate,loginUser ,pageReqVo);
             IPage<FaceImageVO> pageResponse = this.faceImageService.listFaceImage(type,communityId,photographPlace,beginDate,endDate,loginUser ,pageReqVo);

+ 4 - 1
src/main/java/com/iden/bms/controller/HomePageController.java

@@ -6,7 +6,10 @@ import com.iden.common.annotation.Permission;
 
 
 import com.iden.common.util.Result;
 import com.iden.common.util.Result;
 import com.iden.common.util.WebPageUtils;
 import com.iden.common.util.WebPageUtils;
-import com.iden.common.vo.*;
+import com.iden.common.vo.HomPageLastWeekFaceImageStatVO;
+import com.iden.common.vo.HomPageStaVO;
+import com.iden.common.vo.HomePageWarningStaVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;

+ 0 - 1
src/main/java/com/iden/bms/controller/LoginController.java

@@ -27,7 +27,6 @@ import javax.imageio.ImageIO;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import java.awt.image.BufferedImage;
 import java.awt.image.BufferedImage;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;

+ 5 - 2
src/main/java/com/iden/bms/controller/SysRoleController.java

@@ -9,7 +9,10 @@ import com.iden.common.logaspect.OperateType;
 import com.iden.common.util.PageResult;
 import com.iden.common.util.PageResult;
 import com.iden.common.util.Result;
 import com.iden.common.util.Result;
 import com.iden.common.util.WebPageUtils;
 import com.iden.common.util.WebPageUtils;
-import com.iden.common.vo.*;
+import com.iden.common.vo.PageReqVO;
+import com.iden.common.vo.SysMenuVO;
+import com.iden.common.vo.SysRoleVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiImplicitParams;
@@ -39,7 +42,7 @@ public class SysRoleController {
     @GetMapping("/listSysRole")
     @GetMapping("/listSysRole")
     @ApiOperation(value = "角色列表分页 ")
     @ApiOperation(value = "角色列表分页 ")
     public PageResult<List<SysRoleVO>> listSysRole(HttpServletRequest request, @RequestHeader(value = "token") String token,
     public PageResult<List<SysRoleVO>> listSysRole(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                                  PageReqVO pageReqVo){
+                                                   PageReqVO pageReqVo){
         try {
         try {
             UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             IPage<SysRoleVO> pageResponse = this.sysRoleService.listSysRole(loginUser ,pageReqVo);
             IPage<SysRoleVO> pageResponse = this.sysRoleService.listSysRole(loginUser ,pageReqVo);

+ 3 - 4
src/main/java/com/iden/bms/controller/SysUserController.java

@@ -7,7 +7,6 @@ import com.iden.common.annotation.Permission;
 import com.iden.common.exception.BDException;
 import com.iden.common.exception.BDException;
 import com.iden.common.logaspect.LogAnnotation;
 import com.iden.common.logaspect.LogAnnotation;
 import com.iden.common.logaspect.OperateType;
 import com.iden.common.logaspect.OperateType;
-import com.iden.common.service.IdenSysUserService;
 import com.iden.common.util.PageResult;
 import com.iden.common.util.PageResult;
 import com.iden.common.util.Result;
 import com.iden.common.util.Result;
 import com.iden.common.util.WebPageUtils;
 import com.iden.common.util.WebPageUtils;
@@ -50,9 +49,9 @@ public class SysUserController {
             @ApiImplicitParam(paramType = "query", name = "username", value = "用户名")
             @ApiImplicitParam(paramType = "query", name = "username", value = "用户名")
     })
     })
     public PageResult<List<SysUserVO>> listSysUser(HttpServletRequest request, @RequestHeader(value = "token") String token,
     public PageResult<List<SysUserVO>> listSysUser(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                                  @RequestParam(value = "nickname", required = false) String nickname,
-                                                  @RequestParam(value = "username", required = false) String username,
-                                                  PageReqVO pageReqVo){
+                                                   @RequestParam(value = "nickname", required = false) String nickname,
+                                                   @RequestParam(value = "username", required = false) String username,
+                                                   PageReqVO pageReqVo){
         try {
         try {
             UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             IPage<SysUserVO> pageResponse = this.sysUserService.listSysUser(nickname,username,loginUser ,pageReqVo);
             IPage<SysUserVO> pageResponse = this.sysUserService.listSysUser(nickname,username,loginUser ,pageReqVo);

+ 5 - 5
src/main/java/com/iden/bms/controller/TraceController.java

@@ -49,8 +49,8 @@ public class TraceController {
             moduleName = "上传图像获取目标轨迹",
             moduleName = "上传图像获取目标轨迹",
             description = "上传图像获取目标轨迹"
             description = "上传图像获取目标轨迹"
     )
     )
-    public Result<String> uploadImage( @ApiParam(value="图像",required=true) MultipartFile file,
-                                       @RequestHeader(name = "token") String token) {
+    public Result<String> uploadImage(@ApiParam(value="图像",required=true) MultipartFile file,
+                                      @RequestHeader(name = "token") String token) {
         try {
         try {
             String imageName = traceService.uploadImage(file);
             String imageName = traceService.uploadImage(file);
             return  Result.success("上传成功!",imageName);
             return  Result.success("上传成功!",imageName);
@@ -73,9 +73,9 @@ public class TraceController {
 
 
     })
     })
     public Result<List<TraceVO>> listUploadImagesTrace(HttpServletRequest request, @RequestHeader(value = "token") String token,
     public Result<List<TraceVO>> listUploadImagesTrace(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                           @RequestParam(value = "imageNames", required = true) String imageNames,
-                                           @RequestParam(value = "beginTime", required = false) String beginTime,
-                                           @RequestParam(value = "endTime", required = false) String endTime){
+                                                       @RequestParam(value = "imageNames", required = true) String imageNames,
+                                                       @RequestParam(value = "beginTime", required = false) String beginTime,
+                                                       @RequestParam(value = "endTime", required = false) String endTime){
         try {
         try {
             UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             List<TraceVO> datas = this.traceService.listUploadImagesTrace(imageNames,beginTime,endTime,loginUser);
             List<TraceVO> datas = this.traceService.listUploadImagesTrace(imageNames,beginTime,endTime,loginUser);

+ 1 - 1
src/main/java/com/iden/bms/face/FaceIdenTool.java

@@ -38,7 +38,7 @@ public class FaceIdenTool {
 
 
         FaceModel[] faceModels = faceMonitor.extractFeature(faceTestImageList);
         FaceModel[] faceModels = faceMonitor.extractFeature(faceTestImageList);
         //加载人脸特征库
         //加载人脸特征库
-        if (faceModels != null && faceModels.length > 0){
+        if (faceModels != null && faceModels.length > 0) {
             faceMonitor.loadFaceDataset(faceModels);
             faceMonitor.loadFaceDataset(faceModels);
         }
         }
 
 

+ 5 - 1
src/main/java/com/iden/bms/service/FaceImageService.java

@@ -16,7 +16,11 @@ import com.iden.common.service.IdenCrowdService;
 import com.iden.common.service.IdenFaceImageService;
 import com.iden.common.service.IdenFaceImageService;
 import com.iden.common.service.IdenPersonCrowdRefService;
 import com.iden.common.service.IdenPersonCrowdRefService;
 import com.iden.common.service.IdenPersonService;
 import com.iden.common.service.IdenPersonService;
-import com.iden.common.vo.*;
+
+import com.iden.common.vo.FaceImageVO;
+import com.iden.common.vo.PageReqVO;
+import com.iden.common.vo.PersonVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 

+ 5 - 1
src/main/java/com/iden/bms/service/HomePageService.java

@@ -5,7 +5,11 @@ package com.iden.bms.service;
 import com.iden.common.service.IdenFaceImageService;
 import com.iden.common.service.IdenFaceImageService;
 import com.iden.common.service.IdenWarningEventService;
 import com.iden.common.service.IdenWarningEventService;
 import com.iden.common.service.IdenWarningStaService;
 import com.iden.common.service.IdenWarningStaService;
-import com.iden.common.vo.*;
+
+import com.iden.common.vo.HomPageLastWeekFaceImageStatVO;
+import com.iden.common.vo.HomPageStaVO;
+import com.iden.common.vo.HomePageWarningStaVO;
+import com.iden.common.vo.UserLoginedConvertVO;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;

+ 1 - 1
src/main/java/com/iden/bms/service/SysRoleService.java

@@ -194,7 +194,7 @@ public class SysRoleService {
         saveParentIdenRoleMenuRel(roleId,pid);
         saveParentIdenRoleMenuRel(roleId,pid);
     }
     }
 
 
-    public List<SysMenuVO> listHasLeafMenu(UserLoginedConvertVO loginUser,Long id){
+    public List<SysMenuVO> listHasLeafMenu(UserLoginedConvertVO loginUser, Long id){
         QueryWrapper<IdenRoleMenuRel> queryWrapper0 = new QueryWrapper<>();
         QueryWrapper<IdenRoleMenuRel> queryWrapper0 = new QueryWrapper<>();
         queryWrapper0.lambda().eq(IdenRoleMenuRel::getRoleId, id);
         queryWrapper0.lambda().eq(IdenRoleMenuRel::getRoleId, id);
         List<IdenRoleMenuRel> hasList = idenRoleMenuRelService.list(queryWrapper0);
         List<IdenRoleMenuRel> hasList = idenRoleMenuRelService.list(queryWrapper0);

+ 6 - 3
src/main/java/com/iden/bms/service/SysUserService.java

@@ -3,7 +3,6 @@ package com.iden.bms.service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,13 +10,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.iden.bms.params.ModifyPasswordParams;
 import com.iden.bms.params.ModifyPasswordParams;
 import com.iden.common.cache.RedisKeyConstant;
 import com.iden.common.cache.RedisKeyConstant;
 import com.iden.common.cache.RedisUtil;
 import com.iden.common.cache.RedisUtil;
-import com.iden.common.entity.*;
 
 
+
+import com.iden.common.entity.IdenSysLog;
+import com.iden.common.entity.IdenSysUser;
 import com.iden.common.enums.UserRoleEnum;
 import com.iden.common.enums.UserRoleEnum;
 import com.iden.common.enums.ValidStatusEnum;
 import com.iden.common.enums.ValidStatusEnum;
 import com.iden.common.exception.BDException;
 import com.iden.common.exception.BDException;
 import com.iden.common.logaspect.OperateType;
 import com.iden.common.logaspect.OperateType;
-import com.iden.common.service.*;
+
 
 
 import com.iden.common.util.MyBeanUtils;
 import com.iden.common.util.MyBeanUtils;
 import com.iden.common.util.WebPageUtils;
 import com.iden.common.util.WebPageUtils;
@@ -25,6 +26,8 @@ import com.iden.common.vo.PageReqVO;
 import com.iden.common.vo.UserLoginedConvertVO;
 import com.iden.common.vo.UserLoginedConvertVO;
 
 
 import com.iden.common.vo.SysUserVO;
 import com.iden.common.vo.SysUserVO;
+import com.iden.common.service.IdenSysLogService;
+import com.iden.common.service.IdenSysUserService;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;

+ 2 - 2
src/main/java/com/iden/bms/service/WarningService.java

@@ -10,15 +10,15 @@ import com.iden.common.entity.IdenWarningPerson;
 import com.iden.common.entity.IdenWarningPersonTrace;
 import com.iden.common.entity.IdenWarningPersonTrace;
 import com.iden.common.enums.HandleWarningStatusEnum;
 import com.iden.common.enums.HandleWarningStatusEnum;
 import com.iden.common.exception.BDException;
 import com.iden.common.exception.BDException;
-import com.iden.common.service.*;
 
 
+
+import com.iden.common.service.*;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 
 
 
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**

+ 6 - 3
src/main/java/com/iden/bms/service/WarningStaService.java

@@ -5,13 +5,16 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 import com.iden.common.entity.*;
 import com.iden.common.entity.*;
 import com.iden.common.enums.PersonTypeEnum;
 import com.iden.common.enums.PersonTypeEnum;
 import com.iden.common.enums.PopulationTypeEnum;
 import com.iden.common.enums.PopulationTypeEnum;
 import com.iden.common.enums.StrangerTypeEnum;
 import com.iden.common.enums.StrangerTypeEnum;
 import com.iden.common.enums.WarningTypeEnum;
 import com.iden.common.enums.WarningTypeEnum;
-import com.iden.common.service.*;
 
 
+
+
+import com.iden.common.service.*;
 import com.iden.common.vo.*;
 import com.iden.common.vo.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -66,7 +69,7 @@ public class WarningStaService {
      * 查询预警统计列表
      * 查询预警统计列表
      * @return
      * @return
              */
              */
-    public IPage<WarningStaVO> listWarningSta(String type,String district, String subdistrict, String communityName, String beginDate, String endDate, UserLoginedConvertVO loginUser, PageReqVO pageReqVo) {
+    public IPage<WarningStaVO> listWarningSta(String type, String district, String subdistrict, String communityName, String beginDate, String endDate, UserLoginedConvertVO loginUser, PageReqVO pageReqVo) {
             IPage<IdenWarningSta> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
             IPage<IdenWarningSta> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
             QueryWrapper<IdenWarningSta> queryWrapper = new QueryWrapper<>();
             QueryWrapper<IdenWarningSta> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().eq(IdenWarningSta::getType,type)
             queryWrapper.lambda().eq(IdenWarningSta::getType,type)
@@ -108,7 +111,7 @@ public class WarningStaService {
      * 根据小区查询预警人员列表分页
      * 根据小区查询预警人员列表分页
      * @return
      * @return
      */
      */
-    public IPage<WarningPersonVO> listWarningPersonbyCommunity(String type,Long communityId, String nameOrCred, String populationType, Long crowdId, String beginDate, String endDate, UserLoginedConvertVO loginUser, PageReqVO pageReqVo) {
+    public IPage<WarningPersonVO> listWarningPersonbyCommunity(String type, Long communityId, String nameOrCred, String populationType, Long crowdId, String beginDate, String endDate, UserLoginedConvertVO loginUser, PageReqVO pageReqVo) {
         QueryWrapper<IdenPerson> queryWrapper0 = new QueryWrapper<>();
         QueryWrapper<IdenPerson> queryWrapper0 = new QueryWrapper<>();
         queryWrapper0.lambda().eq(StrUtil.isNotEmpty(populationType),IdenPerson::getPopulationType,populationType)
         queryWrapper0.lambda().eq(StrUtil.isNotEmpty(populationType),IdenPerson::getPopulationType,populationType)
                 .and(StrUtil.isNotEmpty(nameOrCred),wrapper -> wrapper.like(IdenPerson::getName,nameOrCred)
                 .and(StrUtil.isNotEmpty(nameOrCred),wrapper -> wrapper.like(IdenPerson::getName,nameOrCred)

+ 1 - 1
src/main/java/com/iden/common/config/MyBatisPlusConfig.java

@@ -17,7 +17,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
  * @date 2021/1/2 20:41
  * @date 2021/1/2 20:41
  */
  */
 @EnableTransactionManagement
 @EnableTransactionManagement
-@MapperScan("com.iden.**.mapper")
+@MapperScan("com.face.**.mapper")
 @Configuration
 @Configuration
 public class MyBatisPlusConfig {
 public class MyBatisPlusConfig {
 
 

+ 1 - 1
src/main/java/com/iden/common/config/SwaggerConfig.java

@@ -68,7 +68,7 @@ public class SwaggerConfig {
                 //配置 Swagger 信息
                 //配置 Swagger 信息
                 .select()
                 .select()
                 //basePackage("相对包路径"):指定要扫描的包(常用)
                 //basePackage("相对包路径"):指定要扫描的包(常用)
-                .apis(RequestHandlerSelectors.basePackage("com.iden"))
+                .apis(RequestHandlerSelectors.basePackage("com.face"))
                 .build();
                 .build();
     }
     }
 
 

+ 0 - 2
src/main/java/com/iden/common/entity/IdenCamera.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

+ 0 - 2
src/main/java/com/iden/common/entity/IdenCameraVideo.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

+ 0 - 2
src/main/java/com/iden/common/entity/IdenCity.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

+ 0 - 2
src/main/java/com/iden/common/entity/IdenCommunity.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

+ 0 - 2
src/main/java/com/iden/common/entity/IdenCrowd.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

+ 0 - 2
src/main/java/com/iden/common/entity/IdenDistrict.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

+ 0 - 2
src/main/java/com/iden/common/entity/IdenFaceImage.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

+ 0 - 2
src/main/java/com/iden/common/entity/IdenPerson.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

+ 0 - 2
src/main/java/com/iden/common/entity/IdenPersonCrowdRef.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

+ 0 - 2
src/main/java/com/iden/common/entity/IdenProvince.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

+ 0 - 2
src/main/java/com/iden/common/entity/IdenRoleMenuRel.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

+ 0 - 2
src/main/java/com/iden/common/entity/IdenSubdistrict.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

+ 0 - 2
src/main/java/com/iden/common/entity/IdenSysDict.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

+ 0 - 2
src/main/java/com/iden/common/entity/IdenSysDictItem.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

+ 0 - 2
src/main/java/com/iden/common/entity/IdenSysLog.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

+ 0 - 2
src/main/java/com/iden/common/entity/IdenSysMenu.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

+ 0 - 2
src/main/java/com/iden/common/entity/IdenSysRole.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

+ 0 - 2
src/main/java/com/iden/common/entity/IdenSysUser.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

+ 0 - 2
src/main/java/com/iden/common/entity/IdenWarningEvent.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

+ 0 - 2
src/main/java/com/iden/common/entity/IdenWarningPerson.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

+ 0 - 2
src/main/java/com/iden/common/entity/IdenWarningPersonTrace.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

+ 0 - 2
src/main/java/com/iden/common/entity/IdenWarningRuleResident.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

+ 0 - 2
src/main/java/com/iden/common/entity/IdenWarningRuleStranger.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

+ 0 - 2
src/main/java/com/iden/common/entity/IdenWarningSta.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

+ 1 - 1
src/main/java/com/iden/common/interceptor/ControllerInterceptor.java

@@ -49,7 +49,7 @@ public class ControllerInterceptor {
     /**
     /**
      * 定义拦截规则:拦截com.bj106.zhyc.app.controller包下面的所有类中,有@RequestMapping注解的方法。
      * 定义拦截规则:拦截com.bj106.zhyc.app.controller包下面的所有类中,有@RequestMapping注解的方法。
      */
      */
-    @Pointcut("execution(public * com.iden..*.controller..*(..))")
+    @Pointcut("execution(public * com.face..*.controller..*(..))")
     public void controllerMethodPointcut(){}
     public void controllerMethodPointcut(){}
 
 
     /**
     /**

+ 0 - 3
src/main/java/com/iden/common/mapper/IdenWarningPersonMapper.java

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

+ 0 - 3
src/main/java/com/iden/common/service/IdenWarningPersonService.java

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

+ 0 - 3
src/main/java/com/iden/common/service/impl/IdenWarningPersonServiceImpl.java

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

+ 0 - 6
src/main/java/com/iden/common/vo/CrowdVO.java

@@ -1,15 +1,9 @@
 package com.iden.common.vo;
 package com.iden.common.vo;
 
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Date;

+ 0 - 7
src/main/java/com/iden/common/vo/SysRoleVO.java

@@ -1,16 +1,9 @@
 package com.iden.common.vo;
 package com.iden.common.vo;
 
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.iden.common.entity.IdenRoleMenuRel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Date;

+ 1 - 1
src/main/resources/application-dev.properties

@@ -14,7 +14,7 @@ mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 
 
 ## logging 日志配置
 ## logging 日志配置
 # 设置日志输出级别
 # 设置日志输出级别
-logging.level.com.iden=info
+logging.level.com.face=info
 
 
 #################################### 以下是redis的集群标准配置 ##################################
 #################################### 以下是redis的集群标准配置 ##################################
 spring.redis.host=124.70.58.209
 spring.redis.host=124.70.58.209

+ 1 - 1
src/main/resources/application.properties

@@ -30,7 +30,7 @@ spring.datasource.hikari.connection-test-query=SELECT 1
 # 指定 mapper 映射文件位置
 # 指定 mapper 映射文件位置
 mybatis-plus.mapper-locations=classpath:mybatis/*.xml
 mybatis-plus.mapper-locations=classpath:mybatis/*.xml
 # 映射实体类的路径
 # 映射实体类的路径
-#mybatis-plus.type-aliases-package=com.iden
+#mybatis-plus.type-aliases-package=com.face
 # 逻辑删除配置 # 逻辑已删除值(默认为 1)
 # 逻辑删除配置 # 逻辑已删除值(默认为 1)
 mybatis-plus.global-config.db-config.logic-delete-value=1
 mybatis-plus.global-config.db-config.logic-delete-value=1
 # 逻辑删除配置 # 逻辑未删除值(默认为 0)
 # 逻辑删除配置 # 逻辑未删除值(默认为 0)

+ 2 - 2
src/main/resources/logback.xml

@@ -103,7 +103,7 @@
         <appender-ref ref="WARN_FILE"/>
         <appender-ref ref="WARN_FILE"/>
         <appender-ref ref="ERROR_FILE"/>
         <appender-ref ref="ERROR_FILE"/>
     </root>
     </root>
-    <logger name="com.iden" level="INFO" additivity="false">
+    <logger name="com.face" level="INFO" additivity="false">
         <appender-ref ref="CONSOLE"/>
         <appender-ref ref="CONSOLE"/>
         <appender-ref ref="DEBUG_FILE"/>
         <appender-ref ref="DEBUG_FILE"/>
         <appender-ref ref="INFO_FILE"/>
         <appender-ref ref="INFO_FILE"/>
@@ -111,7 +111,7 @@
         <appender-ref ref="ERROR_FILE"/>
         <appender-ref ref="ERROR_FILE"/>
     </logger>
     </logger>
     <!-- 控制台打印sql 包名要写到dao 此处不需要可以注掉 -->
     <!-- 控制台打印sql 包名要写到dao 此处不需要可以注掉 -->
-    <logger name="com.iden.**.mapper" level="trace" additivity="false">
+    <logger name="com.face.**.mapper" level="trace" additivity="false">
         <appender-ref ref="CONSOLE"/>
         <appender-ref ref="CONSOLE"/>
         <appender-ref ref="DEBUG_FILE"/>
         <appender-ref ref="DEBUG_FILE"/>
     </logger>
     </logger>

+ 137 - 0
src/test/java/com/face/monitor/FaceTest.java

@@ -0,0 +1,137 @@
+package com.face.monitor;
+
+import com.face.monitor.model.FaceModel;
+import com.face.monitor.model.FaceRecogRetrieveResult;
+import com.face.monitor.model.Image;
+import com.face.monitor.model.RecogInfo;
+import com.face.monitor.model.RecogResult;
+
+import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+public class FaceTest {
+    public static void main(String[] args) {
+        //初始化引擎
+        FaceMonitor faceMonitor = new FaceMonitor();
+        faceMonitor.init("./model", 0);
+        //提取人脸特征,并保存为注册人员库demo-test.cpp
+        FaceModel[] dataset = extractFeature(faceMonitor);
+        for(int i = 0; i < dataset.length; i++) {
+            System.out.println("getFeatValue==" + dataset[i].getFeatValue());
+            System.out.println("getPersonId==" + dataset[i].getPersonId());
+            System.out.println("getName==" + dataset[i].getName());
+        }
+        System.out.printf(Locale.CHINA, "succeed extract size:%d\n", dataset.length);
+        //加载人脸特征库
+        faceMonitor.loadFaceDataset(dataset);
+        //获取库的大小
+        int databaseSize = faceMonitor.getDatabaseSize();
+        System.out.printf(Locale.CHINA, "java data num:%d\n", databaseSize);
+        //追加特征库
+        faceMonitor.appendFaceDataset(dataset);
+        databaseSize = faceMonitor.getDatabaseSize();
+        System.out.printf(Locale.CHINA, "java append after data num:%d\n", databaseSize);
+        //每次加载特征库会清空当前内存中存储的特征库
+        faceMonitor.loadFaceDataset(dataset);
+        databaseSize = faceMonitor.getDatabaseSize();
+        System.out.printf(Locale.CHINA, "new data num: :%d\n", databaseSize);
+        //监控视频帧,这里为了简单演示,传入静态图片
+        //target
+        String registerData = "./data/0.jpg";
+        watchFrame(faceMonitor, registerData);
+        //vistor
+        registerData = "./data/5.jpg";
+        watchFrame(faceMonitor, registerData);
+        //获取目标人识别结果
+        RecogResult recogResult = faceMonitor.finishMonitorWithRes(1);
+
+        RecogResult curVisitorResResult = faceMonitor.faceRecogGetCurVisitorRes();
+
+        for (int i = 0; i < curVisitorResResult.getInfoNum(); i++) {
+            RecogInfo recogInfo = curVisitorResResult.getRecogInfos()[i];
+            System.out.printf(Locale.CHINA, "55vistor hit top getRecogInfos length: %d\n",
+                    curVisitorResResult.getRecogInfos().length);
+            System.out.printf(Locale.CHINA, "55vistor hit top person name: %s\n",
+                    recogInfo.getName());
+            System.out.printf(Locale.CHINA, "55vistor hit top person id: %d score: %f\n",
+                    recogInfo.getPersonId(), recogInfo.getFaceRecogScore());
+            System.out.printf(Locale.CHINA, "55vistor hit second person id: %d score: %f\n",
+                    recogInfo.getPersonIdOther()[0], recogInfo.getFaceRecogScoreOther()[0]);
+        }
+
+        FaceRecogRetrieveResult faceRecogRetrieveResult = faceMonitor.faceRecogRetrieveFaceDataset(dataset[1]);
+        System.out.printf(Locale.CHINA, "55query hit top person id: : %d score: %f\n",
+                faceRecogRetrieveResult.getOnePredictIds()[0], faceRecogRetrieveResult.getOnePredictScores()[0]);
+        System.out.printf(Locale.CHINA, "55query hit top person id: : %d score: %f\n",
+                faceRecogRetrieveResult.getOnePredictIds()[1], faceRecogRetrieveResult.getOnePredictScores()[1]);
+    }
+
+    public static FaceModel[] extractFeature(FaceMonitor faceMonitor) {
+        //简单演示,提取5张人脸
+        String faceTestDir = "./data/";
+        List<byte[]> faceTestImageList = new ArrayList<>();
+        for (int i = 0; i < 5; i++) {
+            String faceFilePath = String.format(Locale.CHINA, "%s%d.jpg", faceTestDir, i);
+            faceTestImageList.add(readFileBytes(faceFilePath));
+        }
+        return faceMonitor.extractFeature(faceTestImageList);
+    }
+
+    public static RecogResult watchFrame(FaceMonitor faceMonitor, String dataPath) {
+        Image image = faceMonitor.readImage(dataPath);
+        return faceMonitor.faceRecogMonitor(image);
+    }
+
+    /**
+     * read file
+     *
+     * @param filePath
+     * @return if file not exist, return null, else return content of file
+     * @throws RuntimeException if an error occurs while operator BufferedReader
+     */
+    public static byte[] readFileBytes(String filePath) {
+        File file = new File(filePath);
+        if (file == null || !file.isFile()) {
+            return null;
+        }
+
+        InputStream inputStream = null;
+        ByteArrayOutputStream baos = null;
+        try {
+            inputStream = new FileInputStream(file);
+            baos = new ByteArrayOutputStream();
+
+            byte[] buffer = new byte[1024];
+            int byteCount = 0;
+            while ((byteCount = inputStream.read(buffer)) != -1) {// 循环从输入流读取
+                // buffer字节
+                baos.write(buffer, 0, byteCount);// 将读取的输入流写入到输出流
+            }
+            baos.flush();// 刷新缓冲区
+            return baos.toByteArray();
+        } catch (IOException e) {
+            return null;
+            //throw new RuntimeException("IOException occurred. ", e);
+        } finally {
+            close(inputStream);
+            close(baos);
+        }
+    }
+
+    public static void close(Closeable closeable) {
+        if (closeable != null) {
+            try {
+                closeable.close();
+            } catch (IOException e) {
+                throw new RuntimeException("IOException occurred. ", e);
+            }
+        }
+    }
+}