图库

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

@@ -107,8 +107,8 @@ public class CrowdController {
     @GetMapping("/getCrowdInfo/{id}")
     @ApiOperation(value = "人群详情")
     public Result<CrowdVO> getCrowdInfo(HttpServletRequest request, @RequestHeader("token") String token, @PathVariable("id") Long id){
-        CrowdVO orderInfo = this.crowdService.getCrowdById(id);
-        return  Result.success("查询成功！",orderInfo);
+        CrowdVO vo = this.crowdService.getCrowdById(id);
+        return  Result.success("查询成功！",vo);
     }
 
     @PostMapping("/deleteCrowd/{id}")

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

@@ -0,0 +1,78 @@
+package com.iden.bms.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.iden.bms.service.ImageStoreService;
+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 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 = "ImageStoreController", tags = { "人脸抓拍库管理" })
+@Slf4j
+@RequestMapping("/bms/imageStore")
+@Permission
+public class ImageStoreController {
+
+    @Autowired
+    private ImageStoreService imageStoreService;
+
+
+
+    @GetMapping("/listImageStore")
+    @ApiOperation(value = "人脸抓拍库列表分页 ")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(paramType = "query", name = "type", value = "类型，0：陌生人员 ，1重点人员，2小区人员"),
+            @ApiImplicitParam(paramType = "query", name = "communityId", value = "小区ID"),
+            @ApiImplicitParam(paramType = "query", name = "photographPlace", value = "抓拍地点"),
+            @ApiImplicitParam(paramType = "query", name = "beginDate", value = "开始时间"),
+            @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){
+        try {
+            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            IPage<ImageStoreVO> pageResponse = this.imageStoreService.listImageStore(type,communityId,photographPlace,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( "获取列表失败");
+        }
+    }
+
+    @GetMapping("/getImageStoreInfo/{id}")
+    @ApiOperation(value = "人脸抓拍库")
+    public Result<ImageStoreVO> getImageStoreInfo(HttpServletRequest request, @RequestHeader("token") String token, @PathVariable("id") Long id){
+        ImageStoreVO vo = this.imageStoreService.getImageStoreInfo(id);
+        return  Result.success("查询成功！",vo);
+    }
+}

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

@@ -48,7 +48,7 @@ public class PersonController {
             @ApiImplicitParam(paramType = "query", name = "crowdId", value = "人群id"),
             @ApiImplicitParam(paramType = "query", name = "address", value = "详细地址"),
             @ApiImplicitParam(paramType = "query", name = "gender", value = "性别：M：男 W：女"),
-            @ApiImplicitParam(paramType = "query", name = "personType", value = "人员类型：1：常住人口 2：暂住人口 3：境外长住人口 4：流动人口 5:寄住人口 6: 临时住宿人口 99其他")
+            @ApiImplicitParam(paramType = "query", name = "populationType", value = "人口类型：1：常住人口 2：暂住人口 3：境外长住人口 4：流动人口 5:寄住人口 6: 临时住宿人口 99其他")
     })
     public PageResult<List<PersonVO>> listPerson(HttpServletRequest request, @RequestHeader(value = "token") String token,
                                                  @RequestParam(value = "type", required = true) String type,
@@ -59,11 +59,11 @@ public class PersonController {
                                                  @RequestParam(value = "crowdId", required = false) Long crowdId,
                                                  @RequestParam(value = "address", required = false) String address,
                                                  @RequestParam(value = "gender", required = false) String gender,
-                                                 @RequestParam(value = "personType", required = false) String personType,
+                                                 @RequestParam(value = "populationType", required = false) String populationType,
                                                  PageReqVO pageReqVo){
         try {
             UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<PersonVO> pageResponse = this.personService.listPerson(type,nameOrCred,district,subdistrict,communityId,crowdId,address,gender,personType,loginUser ,pageReqVo);
+            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) {
             log.error("人员列表查询-分页列表出现异常",e);

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

@@ -0,0 +1,124 @@
+package com.iden.bms.service;
+
+import cn.hutool.core.bean.BeanUtil;
+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.IdenCrowd;
+import com.iden.common.entity.IdenImageStore;
+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.IdenPersonCrowdRefService;
+import com.iden.common.service.IdenPersonService;
+import com.iden.common.vo.*;
+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 ImageStoreService {
+
+    @Resource
+    private IdenImageStoreService idenImageStoreService;
+    @Resource
+    private IdenPersonService idenPersonService;
+    @Resource
+    private IdenPersonCrowdRefService idenPersonCrowdRefService;
+    @Resource
+    private IdenCrowdService idenCrowdService;
+
+    /**
+     * 查询人脸抓拍库列表
+     * @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);
+            if(StrUtil.isNotEmpty(beginDate)){
+                queryWrapper.apply(" date_format(photograph_time,'%Y-%m-%d') >= {0}", beginDate);
+            }
+
+            if(StrUtil.isNotEmpty(endDate)){
+                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());
+            if(CollUtil.isNotEmpty(pageRes.getRecords())){
+                List<ImageStoreVO> list = new ArrayList<>();
+                pageRes.getRecords().forEach(item -> {
+                    ImageStoreVO resVO = new ImageStoreVO();
+                    BeanUtils.copyProperties(item,resVO);
+                    resVO.setTypeName(PersonTypeEnum.getValueToName(resVO.getType()));
+
+                    list.add(resVO);
+                });
+                results.setRecords(list);
+            }
+            return results;
+    }
+
+    /**
+     * 详情
+     * @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);
+
+            if(resVO.getPersonId() != null){
+                IdenPerson idenPerson = idenPersonService.getById(resVO.getPersonId());
+                if(idenPerson != null) {
+                    PersonVO personVO = new PersonVO();
+                    BeanUtil.copyProperties(idenPerson,personVO);
+                    personVO.setPopulationTypeName(PopulationTypeEnum.getValueToName(personVO.getPopulationType()));
+                    personVO.setTypeName(PersonTypeEnum.getValueToName(personVO.getType()));
+
+                    QueryWrapper<IdenPersonCrowdRef> queryWrapper1 = new QueryWrapper<>();
+                    queryWrapper1.lambda().eq(IdenPersonCrowdRef::getPersonId,personVO.getId());
+                    List<IdenPersonCrowdRef> listIdenPersonCrowdRef = idenPersonCrowdRefService.list(queryWrapper1);
+                    StringBuilder sb = new StringBuilder();
+                    if (CollUtil.isNotEmpty(listIdenPersonCrowdRef)) {
+                        for(IdenPersonCrowdRef idenPersonCrowdRef : listIdenPersonCrowdRef){
+                            IdenCrowd idenCrowd = idenCrowdService.getById(idenPersonCrowdRef.getCrowdId());
+                            if(idenCrowd != null) {
+                                sb.append(idenCrowd.getName()).append(",");
+                            }
+                        }
+                    }
+                    String crowdName = sb.toString();
+                    if(crowdName != null && crowdName.endsWith(",")) {
+                        crowdName = crowdName.substring(0, crowdName.length() - 1);
+                    }
+                    personVO.setCrowdName(crowdName);
+                    resVO.setPersonVO(personVO);
+                }
+            }
+
+            return resVO;
+        }
+        return null;
+    }
+
+}

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

@@ -10,8 +10,8 @@ import com.iden.common.entity.IdenCrowd;
 import com.iden.common.entity.IdenPerson;
 
 import com.iden.common.entity.IdenPersonCrowdRef;
-import com.iden.common.enums.PersonType2Enum;
 import com.iden.common.enums.PersonTypeEnum;
+import com.iden.common.enums.PopulationTypeEnum;
 import com.iden.common.exception.BDException;
 import com.iden.common.service.IdenCrowdService;
 import com.iden.common.service.IdenPersonCrowdRefService;
@@ -60,14 +60,14 @@ 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 personType, 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, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
             IPage<IdenPerson> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
 
             QueryWrapper<IdenPerson> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().like(IdenPerson::getType,type)
                     .like(StrUtil.isNotEmpty(address), IdenPerson::getAddress,address)
                     .eq(StrUtil.isNotEmpty(gender),IdenPerson::getGender,gender)
-                    .eq(StrUtil.isNotEmpty(personType),IdenPerson::getPersonType,personType)
+                    .eq(StrUtil.isNotEmpty(populationType),IdenPerson::getPopulationType,populationType)
                     .eq(StrUtil.isNotEmpty(district),IdenPerson::getDistrict,district)
                     .eq(StrUtil.isNotEmpty(subdistrict),IdenPerson::getSubdistrict,subdistrict)
                     .eq(communityId != null,IdenPerson::getCommunityId,communityId)
@@ -87,8 +87,8 @@ public class PersonService {
                 pageRes.getRecords().forEach(item -> {
                     PersonVO resVO = new PersonVO();
                     BeanUtils.copyProperties(item,resVO);
-                    resVO.setPersonTypeName(PersonTypeEnum.getValueToName(resVO.getPersonType()));
-                    resVO.setTypeName(PersonType2Enum.getValueToName(resVO.getType()));
+                    resVO.setPopulationTypeName(PopulationTypeEnum.getValueToName(resVO.getPopulationType()));
+                    resVO.setTypeName(PersonTypeEnum.getValueToName(resVO.getType()));
 
                     QueryWrapper<IdenPersonCrowdRef> queryWrapper1 = new QueryWrapper<>();
                     queryWrapper1.lambda().eq(IdenPersonCrowdRef::getPersonId,resVO.getId());
@@ -133,8 +133,8 @@ public class PersonService {
         if (idenPerson!=null){
             PersonVO resVO = new PersonVO();
             BeanUtil.copyProperties(idenPerson,resVO);
-            resVO.setPersonTypeName(PersonTypeEnum.getValueToName(resVO.getPersonType()));
-            resVO.setTypeName(PersonType2Enum.getValueToName(resVO.getType()));
+            resVO.setPopulationTypeName(PopulationTypeEnum.getValueToName(resVO.getPopulationType()));
+            resVO.setTypeName(PersonTypeEnum.getValueToName(resVO.getType()));
 
             QueryWrapper<IdenPersonCrowdRef> queryWrapper1 = new QueryWrapper<>();
             queryWrapper1.lambda().eq(IdenPersonCrowdRef::getPersonId,resVO.getId());

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

@@ -76,6 +76,13 @@ public class IdenImageStore implements Serializable {
     @TableField("PERSON_ID")
     private Long personId;
 
+    @ApiModelProperty("类型，0：陌生人员 ，1重点人员，2小区人员，多个用逗号分割'")
+    @TableField("TYPE")
+    private String type;
+
+    @ApiModelProperty("相似度")
+    @TableField("SIMILARITY")
+    private Double similarity;
 
     @ApiModelProperty("备注")
     @TableField("REMARK")

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

@@ -72,9 +72,9 @@ public class IdenPerson implements Serializable {
     private String phone;
 
 
-    @ApiModelProperty("人员类型：1：常住人口 2：暂住人口 3：境外长住人口 4：流动人口 5:寄住人口 6: 临时住宿人口 99其他")
-    @TableField("PERSON_TYPE")
-    private String personType;
+    @ApiModelProperty("人口类型：1：常住人口 2：暂住人口 3：境外长住人口 4：流动人口 5:寄住人口 6: 临时住宿人口 99其他")
+    @TableField("POPULATION_TYPE")
+    private String populationType;
 
 
     @ApiModelProperty("民族")

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

@@ -1,48 +0,0 @@
-package com.iden.common.enums;
-
-
-import cn.hutool.core.util.StrUtil;
-
-/**
- * @Author:java
- * @Date: 2021/05/27
- */
-public enum PersonType2Enum {
-    /**
-     * 人员类型
-     */
-    KEYNOTE("1","重点人员"),
-    COMMUNITY("2","小区人员");
-    private String value;
-    private String name;
-    PersonType2Enum(String value, String name) {
-        this.value = value;
-        this.name = name;
-    }
-    public String getValue() {
-        return value;
-    }
-
-    public static String getValueToName(String code){
-        if (StrUtil.isEmpty(code)){
-            return null;
-        }
-
-        String names = "";
-        String[] types = code.split(",");
-        if(types.length > 0){
-            for(String type : types){
-                if (KEYNOTE.getValue().equals(type)){
-                    names += KEYNOTE.name + ",";
-                } else if (COMMUNITY.getValue().equals(type)){
-                    names += COMMUNITY.name + ",";
-                }
-            }
-        }
-        if(names.endsWith(",")) {
-            names = names.substring(0,names.length() - 1);
-        }
-      return names;
-
-    }
-}

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

@@ -11,13 +11,9 @@ public enum PersonTypeEnum {
     /**
      * 人员类型
      */
-    CHANGZHU("1","常住人口"),
-    ZANZHU("2","暂住人口"),
-    JINGWAICHANGZHU("3","境外长住人口"),
-    LIUDONG("4","流动人口"),
-    JIZHU("5","寄住人口"),
-    LINSHIZHUSU("6","临时住宿人口"),
-    OTHER("99","其他");
+    STRANGER("0","陌生人员"),
+    KEYNOTE("1","重点人员"),
+    COMMUNITY("2","小区人员");
     private String value;
     private String name;
     PersonTypeEnum(String value, String name) {
@@ -32,22 +28,24 @@ public enum PersonTypeEnum {
         if (StrUtil.isEmpty(code)){
             return null;
         }
-        if (CHANGZHU.getValue().equals(code)){
-            return  CHANGZHU.name;
-        } else if (ZANZHU.getValue().equals(code)){
-            return  ZANZHU.name;
-        } else if (JINGWAICHANGZHU.getValue().equals(code)){
-            return  JINGWAICHANGZHU.name;
-        } else if (LIUDONG.getValue().equals(code)){
-            return  LIUDONG.name;
-        } else if (JIZHU.getValue().equals(code)){
-            return  JIZHU.name;
-        } else if (LINSHIZHUSU.getValue().equals(code)){
-            return  LINSHIZHUSU.name;
-        } else if (OTHER.getValue().equals(code)){
-            return  OTHER.name;
+
+        String names = "";
+        String[] types = code.split(",");
+        if(types.length > 0){
+            for(String type : types){
+                if (STRANGER.getValue().equals(type)){
+                    names += STRANGER.name + ",";
+                } else if (KEYNOTE.getValue().equals(type)){
+                    names += KEYNOTE.name + ",";
+                } else if (COMMUNITY.getValue().equals(type)){
+                    names += COMMUNITY.name + ",";
+                }
+            }
+        }
+        if(names.endsWith(",")) {
+            names = names.substring(0,names.length() - 1);
         }
+      return names;
 
-        return null;
     }
 }

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

@@ -0,0 +1,53 @@
+package com.iden.common.enums;
+
+
+import cn.hutool.core.util.StrUtil;
+
+/**
+ * @Author:java
+ * @Date: 2021/05/27
+ */
+public enum PopulationTypeEnum {
+    /**
+     * 人口类型
+     */
+    CHANGZHU("1","常住人口"),
+    ZANZHU("2","暂住人口"),
+    JINGWAICHANGZHU("3","境外长住人口"),
+    LIUDONG("4","流动人口"),
+    JIZHU("5","寄住人口"),
+    LINSHIZHUSU("6","临时住宿人口"),
+    OTHER("99","其他");
+    private String value;
+    private String name;
+    PopulationTypeEnum(String value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+    public String getValue() {
+        return value;
+    }
+
+    public static String getValueToName(String code){
+        if (StrUtil.isEmpty(code)){
+            return null;
+        }
+        if (CHANGZHU.getValue().equals(code)){
+            return  CHANGZHU.name;
+        } else if (ZANZHU.getValue().equals(code)){
+            return  ZANZHU.name;
+        } else if (JINGWAICHANGZHU.getValue().equals(code)){
+            return  JINGWAICHANGZHU.name;
+        } else if (LIUDONG.getValue().equals(code)){
+            return  LIUDONG.name;
+        } else if (JIZHU.getValue().equals(code)){
+            return  JIZHU.name;
+        } else if (LINSHIZHUSU.getValue().equals(code)){
+            return  LINSHIZHUSU.name;
+        } else if (OTHER.getValue().equals(code)){
+            return  OTHER.name;
+        }
+
+        return null;
+    }
+}

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

@@ -0,0 +1,82 @@
+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;
+
+/**
+ * 图库表(IdenImageStore)实体类
+ *
+ * @author makejava
+ * @since 2021-12-22 17:23:46
+ */
+
+@Data
+@ApiModel(value = "图库表", description = "")
+public class ImageStoreVO implements Serializable {
+    private static final long serialVersionUID = -44732106174401548L;
+
+    private Long id;
+
+
+    @ApiModelProperty("人脸特征ID")
+    private String featPtr;
+
+
+    @ApiModelProperty("图像")
+    private String image;
+
+
+    @ApiModelProperty("摄像头ID")
+    private Long cameraId;
+
+
+    @ApiModelProperty("小区ID")
+    private Long communityId;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("抓拍时间")
+    private Date photographTime;
+
+
+    @ApiModelProperty("抓拍地点")
+    private String photographPlace;
+
+
+    @ApiModelProperty("性别：M：男 W：女")
+    private String gender;
+
+
+    @ApiModelProperty("人员ID")
+    private Long personId;
+
+    @ApiModelProperty("类型，0：陌生人员 ，1重点人员，2小区人员，多个用逗号分割'")
+    private String type;
+
+    @ApiModelProperty("类型，0：陌生人员 ，1重点人员，2小区人员，多个用逗号分割'")
+    private String typeName;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("相似度")
+    private Double similarity;
+
+    @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;
+
+    @ApiModelProperty("人员")
+    private PersonVO personVO;
+
+}

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

@@ -53,11 +53,11 @@ public class PersonVO implements Serializable {
     private String phone;
 
 
-    @ApiModelProperty("人员类型：1：常住人口 2：暂住人口 3：境外长住人口 4：流动人口 5:寄住人口 6: 临时住宿人口 99其他")
-    private String personType;
+    @ApiModelProperty("人口类型：1：常住人口 2：暂住人口 3：境外长住人口 4：流动人口 5:寄住人口 6: 临时住宿人口 99其他")
+    private String populationType;
 
-    @ApiModelProperty("人员类型：1：常住人口 2：暂住人口 3：境外长住人口 4：流动人口 5:寄住人口 6: 临时住宿人口 99其他")
-    private String personTypeName;
+    @ApiModelProperty("人口类型：1：常住人口 2：暂住人口 3：境外长住人口 4：流动人口 5:寄住人口 6: 临时住宿人口 99其他")
+    private String populationTypeName;
 
     @ApiModelProperty("民族")
     private String nation;