轨迹

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

@@ -1,16 +1,15 @@
 package com.iden.bms.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iden.bms.service.ImageStoreService;
+import com.iden.bms.service.FaceImageService;
 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.CrowdVO;
 import com.iden.common.vo.PageReqVO;
 import com.iden.common.vo.UserLogindConvertVO;
-import com.iden.common.vo.ImageStoreVO;
+import com.iden.common.vo.FaceImageVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -28,18 +27,18 @@ import java.util.List;
  * @Desc:
  */
 @RestController
-@Api(value = "ImageStoreController", tags = { "人脸抓拍库管理" })
+@Api(value = "FaceImageController", tags = { "人脸抓拍库管理" })
 @Slf4j
-@RequestMapping("/bms/imageStore")
+@RequestMapping("/bms/faceImage")
 @Permission
-public class ImageStoreController {
+public class FaceImageController {
 
     @Autowired
-    private ImageStoreService imageStoreService;
+    private FaceImageService faceImageService;
 
 
 
-    @GetMapping("/listImageStore")
+    @GetMapping("/listFaceImage")
     @ApiOperation(value = "人脸抓拍库列表分页 ")
     @ApiImplicitParams(value = {
             @ApiImplicitParam(paramType = "query", name = "type", value = "类型，0：陌生人员 ，1重点人员，2小区人员"),
@@ -49,16 +48,16 @@ public class ImageStoreController {
             @ApiImplicitParam(paramType = "query", name = "endDate", value = "结束时间")
 
     })
-    public PageResult<List<ImageStoreVO>> listImageStore(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){
+    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){
         try {
             UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<ImageStoreVO> pageResponse = this.imageStoreService.listImageStore(type,communityId,photographPlace,beginDate,endDate,loginUser ,pageReqVo);
+            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) {
             log.error("人脸抓拍库列表查询-分页列表出现异常",e);
@@ -69,10 +68,10 @@ public class ImageStoreController {
         }
     }
 
-    @GetMapping("/getImageStoreInfo/{id}")
+    @GetMapping("/getFaceImageInfo/{id}")
     @ApiOperation(value = "人脸抓拍库")
-    public Result<ImageStoreVO> getImageStoreInfo(HttpServletRequest request, @RequestHeader("token") String token, @PathVariable("id") Long id){
-        ImageStoreVO vo = this.imageStoreService.getImageStoreInfo(id);
+    public Result<FaceImageVO> getFaceImageInfo(HttpServletRequest request, @RequestHeader("token") String token, @PathVariable("id") Long id){
+        FaceImageVO vo = this.faceImageService.getFaceImageInfo(id);
         return  Result.success("查询成功！",vo);
     }
 }

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

@@ -7,13 +7,13 @@ 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.IdenCrowd;
-import com.iden.common.entity.IdenImageStore;
+import com.iden.common.entity.IdenFaceImage;
 import com.iden.common.entity.IdenPerson;
 import com.iden.common.entity.IdenPersonCrowdRef;
 import com.iden.common.enums.PersonTypeEnum;
 import com.iden.common.enums.PopulationTypeEnum;
 import com.iden.common.service.IdenCrowdService;
-import com.iden.common.service.IdenImageStoreService;
+import com.iden.common.service.IdenFaceImageService;
 import com.iden.common.service.IdenPersonCrowdRefService;
 import com.iden.common.service.IdenPersonService;
 import com.iden.common.vo.*;
@@ -30,10 +30,10 @@ import java.util.List;
  * @since 2021-05-21 00:08:38
  */
 @Service
-public class ImageStoreService {
+public class FaceImageService {
 
     @Resource
-    private IdenImageStoreService idenImageStoreService;
+    private IdenFaceImageService idenFaceImageService;
     @Resource
     private IdenPersonService idenPersonService;
     @Resource
@@ -45,13 +45,13 @@ public class ImageStoreService {
      * 查询人脸抓拍库列表
      * @return
              */
-    public IPage<ImageStoreVO> listImageStore(String type,Long communityId,String photographPlace, String beginDate,String endDate,UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
-            IPage<IdenImageStore> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
-            QueryWrapper<IdenImageStore> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().like(IdenImageStore::getType,type)
-                    .like(StrUtil.isNotEmpty(photographPlace),IdenImageStore::getPhotographPlace,photographPlace)
-                    .eq(communityId != null,IdenImageStore::getCommunityId,communityId)
-                    .orderByAsc(IdenImageStore::getId);
+    public IPage<FaceImageVO> listFaceImage(String type, Long communityId, String photographPlace, String beginDate, String endDate, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
+            IPage<IdenFaceImage> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
+            QueryWrapper<IdenFaceImage> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().like(IdenFaceImage::getType,type)
+                    .like(StrUtil.isNotEmpty(photographPlace),IdenFaceImage::getPhotographPlace,photographPlace)
+                    .eq(communityId != null,IdenFaceImage::getCommunityId,communityId)
+                    .orderByAsc(IdenFaceImage::getId);
             if(StrUtil.isNotEmpty(beginDate)){
                 queryWrapper.apply(" date_format(photograph_time,'%Y-%m-%d') >= {0}", beginDate);
             }
@@ -60,12 +60,12 @@ public class ImageStoreService {
                 queryWrapper.apply(" date_format(photograph_time,'%Y-%m-%d') <= {0}", endDate);
             }
 
-            IPage<IdenImageStore> pageRes = this.idenImageStoreService.page(page, queryWrapper);
-            IPage<ImageStoreVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
+            IPage<IdenFaceImage> pageRes = this.idenFaceImageService.page(page, queryWrapper);
+            IPage<FaceImageVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
             if(CollUtil.isNotEmpty(pageRes.getRecords())){
-                List<ImageStoreVO> list = new ArrayList<>();
+                List<FaceImageVO> list = new ArrayList<>();
                 pageRes.getRecords().forEach(item -> {
-                    ImageStoreVO resVO = new ImageStoreVO();
+                    FaceImageVO resVO = new FaceImageVO();
                     BeanUtils.copyProperties(item,resVO);
                     resVO.setTypeName(PersonTypeEnum.getValueToName(resVO.getType()));
 
@@ -81,11 +81,11 @@ public class ImageStoreService {
      * @param id
      * @return
      */
-    public ImageStoreVO getImageStoreInfo(Long id){
-        IdenImageStore idenImageStore = this.idenImageStoreService.getById(id);
-        if (idenImageStore != null){
-            ImageStoreVO resVO = new ImageStoreVO();
-            BeanUtil.copyProperties(idenImageStore,resVO);
+    public FaceImageVO getFaceImageInfo(Long id){
+        IdenFaceImage idenFaceImage = this.idenFaceImageService.getById(id);
+        if (idenFaceImage != null){
+            FaceImageVO resVO = new FaceImageVO();
+            BeanUtil.copyProperties(idenFaceImage,resVO);
 
             if(resVO.getPersonId() != null){
                 IdenPerson idenPerson = idenPersonService.getById(resVO.getPersonId());

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

@@ -0,0 +1,70 @@
+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;
+
+/**
+ * 摄像机视频表(IdenCameraVideo)实体类
+ *
+ * @author makejava
+ * @since 2021-12-24 16:38:30
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("iden_camera_video")
+@ApiModel(value = "摄像机视频表", description = "")
+public class IdenCameraVideo implements Serializable {
+    private static final long serialVersionUID = -96192050731661605L;
+
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty("摄像头ID")
+    @TableField("CAMERA_ID")
+    private Long cameraId;
+
+
+    @ApiModelProperty("小区ID")
+    @TableField("COMMUNITY_ID")
+    private Long communityId;
+
+
+    @ApiModelProperty("视频")
+    @TableField("VIDEO")
+    private String video;
+
+
+    @ApiModelProperty("拍摄时间")
+    @TableField("PHOTOGRAPH_TIME")
+    private Date photographTime;
+
+
+    @ApiModelProperty("createTime")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+
+    @ApiModelProperty("modifyTime")
+    @TableField("MODIFY_TIME")
+    private Date modifyTime;
+
+
+}

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

@@ -19,19 +19,19 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * 图库表(IdenImageStore)实体类
+ * 人脸图像表(IdenFaceImage)实体类
  *
  * @author makejava
- * @since 2021-12-22 17:23:46
+ * @since 2021-12-24 16:24:43
  */
 
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("iden_image_store")
-@ApiModel(value = "图库表", description = "")
-public class IdenImageStore implements Serializable {
-    private static final long serialVersionUID = -44732106174401548L;
+@TableName("iden_face_image")
+@ApiModel(value = "人脸图像表", description = "")
+public class IdenFaceImage implements Serializable {
+    private static final long serialVersionUID = 753307970220912522L;
 
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
@@ -72,10 +72,11 @@ public class IdenImageStore implements Serializable {
     private Double longitude;
 
 
-    @ApiModelProperty("纬度")
+    @ApiModelProperty("维度")
     @TableField("LATITUDE")
     private Double latitude;
 
+
     @ApiModelProperty("性别：M：男 W：女")
     @TableField("GENDER")
     private String gender;
@@ -85,14 +86,17 @@ public class IdenImageStore implements Serializable {
     @TableField("PERSON_ID")
     private Long personId;
 
-    @ApiModelProperty("类型，0：陌生人员 ，1重点人员，2小区人员，多个用逗号分割'")
+
+    @ApiModelProperty("类型，0：陌生人员 ，1重点人员，2小区人员，多个用逗号分割")
     @TableField("TYPE")
     private String type;
 
+
     @ApiModelProperty("相似度")
     @TableField("SIMILARITY")
     private Double similarity;
 
+
     @ApiModelProperty("备注")
     @TableField("REMARK")
     private String remark;

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

@@ -0,0 +1,15 @@
+package com.iden.common.mapper;
+
+import com.iden.common.entity.IdenCameraVideo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+
+/**
+ * 摄像机视频表(IdenCameraVideo)表数据库访问层
+ *
+ * @author makejava
+ * @since 2021-12-24 16:38:30
+ */
+public interface IdenCameraVideoMapper extends BaseMapper<IdenCameraVideo> {
+
+}

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

@@ -0,0 +1,15 @@
+package com.iden.common.mapper;
+
+import com.iden.common.entity.IdenFaceImage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+
+/**
+ * 人脸图像表(IdenFaceImage)表数据库访问层
+ *
+ * @author makejava
+ * @since 2021-12-24 16:24:43
+ */
+public interface IdenFaceImageMapper extends BaseMapper<IdenFaceImage> {
+
+}

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

@@ -1,15 +0,0 @@
-package com.iden.common.mapper;
-
-import com.iden.common.entity.IdenImageStore;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-
-/**
- * 图库表(IdenImageStore)表数据库访问层
- *
- * @author makejava
- * @since 2021-12-22 17:23:46
- */
-public interface IdenImageStoreMapper extends BaseMapper<IdenImageStore> {
-
-}

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

@@ -0,0 +1,14 @@
+package com.iden.common.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.iden.common.entity.IdenCameraVideo;
+
+/**
+ * 摄像机视频表(IdenCameraVideo)表服务接口
+ *
+ * @author makejava
+ * @since 2021-12-24 16:38:30
+ */
+public interface IdenCameraVideoService extends IService<IdenCameraVideo> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.iden.common.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.iden.common.entity.IdenFaceImage;
+
+/**
+ * 人脸图像表(IdenFaceImage)表服务接口
+ *
+ * @author makejava
+ * @since 2021-12-24 16:24:43
+ */
+public interface IdenFaceImageService extends IService<IdenFaceImage> {
+
+}

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

@@ -1,14 +0,0 @@
-package com.iden.common.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.iden.common.entity.IdenImageStore;
-
-/**
- * 图库表(IdenImageStore)表服务接口
- *
- * @author makejava
- * @since 2021-12-22 17:23:47
- */
-public interface IdenImageStoreService extends IService<IdenImageStore> {
-
-}

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

@@ -0,0 +1,18 @@
+package com.iden.common.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.iden.common.mapper.IdenCameraVideoMapper;
+import com.iden.common.entity.IdenCameraVideo;
+import com.iden.common.service.IdenCameraVideoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 摄像机视频表(IdenCameraVideo)表服务实现类
+ *
+ * @author makejava
+ * @since 2021-12-24 16:38:31
+ */
+@Service
+public class IdenCameraVideoServiceImpl extends ServiceImpl<IdenCameraVideoMapper, IdenCameraVideo> implements IdenCameraVideoService {
+
+}

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

@@ -0,0 +1,18 @@
+package com.iden.common.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.iden.common.mapper.IdenFaceImageMapper;
+import com.iden.common.entity.IdenFaceImage;
+import com.iden.common.service.IdenFaceImageService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 人脸图像表(IdenFaceImage)表服务实现类
+ *
+ * @author makejava
+ * @since 2021-12-24 16:24:44
+ */
+@Service
+public class IdenFaceImageServiceImpl extends ServiceImpl<IdenFaceImageMapper, IdenFaceImage> implements IdenFaceImageService {
+
+}

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

@@ -1,18 +0,0 @@
-package com.iden.common.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.iden.common.mapper.IdenImageStoreMapper;
-import com.iden.common.entity.IdenImageStore;
-import com.iden.common.service.IdenImageStoreService;
-import org.springframework.stereotype.Service;
-
-/**
- * 图库表(IdenImageStore)表服务实现类
- *
- * @author makejava
- * @since 2021-12-22 17:23:47
- */
-@Service
-public class IdenImageStoreServiceImpl extends ServiceImpl<IdenImageStoreMapper, IdenImageStore> implements IdenImageStoreService {
-
-}

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

@@ -19,7 +19,7 @@ import java.util.Date;
 
 @Data
 @ApiModel(value = "图库表", description = "")
-public class ImageStoreVO implements Serializable {
+public class FaceImageVO implements Serializable {
     private static final long serialVersionUID = -44732106174401548L;
 
     private Long id;

src/main/resources/mybatis/IdenCameraVideoMapper.xml

@@ -0,0 +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.IdenCameraVideoMapper">
+
+
+</mapper>

src/main/resources/mybatis/IdenImageStoreMapper.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.IdenImageStoreMapper">
+<mapper namespace="com.iden.common.mapper.IdenFaceImageMapper">
 
 
 </mapper>