添加模板下载

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

@@ -191,7 +191,6 @@ public class FaceIdenService {
                                                 idenFaceImage.setSimilarity(similarity);
                                             }
                                         }
-
                                     }
                                     logger.info("FaceIdenService.handleCameraImage 6...");
                                     if (idenFaceImage.getPersonId() == null) { //没有关联上，是陌生人
@@ -214,7 +213,6 @@ public class FaceIdenService {
                                     idenFaceImageService.saveBatch(idenFaceImageList);
                                     logger.info("FaceIdenService.handleCameraImage 9...");
                                 }
-
                             }
                         }
                     }
@@ -247,9 +245,7 @@ public class FaceIdenService {
                 return list.get(vo.getIndex()).getUid();
             }
         }
-
         return null;
-
     }
 
 
@@ -287,7 +283,6 @@ public class FaceIdenService {
                 return false;
             }
 
-
         } else {
             return false;
         }

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.iden.bms.face.FaceIdenTool;
+import com.iden.common.cache.DictCache;
 import com.iden.common.entity.IdenCommunity;
 import com.iden.common.entity.IdenCrowd;
 import com.iden.common.entity.IdenPerson;
@@ -157,6 +158,8 @@ public class PersonService {
                     resVO.setTypeName(PersonTypeEnum.getValueToName(resVO.getType()));
                     resVO.setGenderName(GenderEnum.getValueToName(resVO.getGender()));
                     resVO.setCredentialsTypeName(CredentialsTypeEnum.getValueToName(resVO.getCredentialsType()));
+                    resVO.setMarriageName(DictCache.getNameByValue("marriage", resVO.getMarriage()));
+                    resVO.setPolicitalStatusName(DictCache.getNameByValue("policital_status", resVO.getPolicitalStatus()));
                     Long communityId1 = resVO.getCommunityId();
                     if(communityId1 != null){
                         IdenCommunity idenCommunity = this.idenCommunityService.getById(communityId1);
@@ -234,6 +237,8 @@ public class PersonService {
                 resVO.setTypeName(PersonTypeEnum.getValueToName(item.getType()));
                 resVO.setGenderName(GenderEnum.getValueToName(item.getGender()));
                 resVO.setCredentialsTypeName(CredentialsTypeEnum.getValueToName(item.getCredentialsType()));
+                resVO.setMarriageName(DictCache.getNameByValue("marriage", item.getMarriage()));
+                resVO.setPolicitalStatusName(DictCache.getNameByValue("policital_status", item.getPolicitalStatus()));
 
                 try {
                     resVO.setImageUrl(new URL(item.getImage()));
@@ -394,11 +399,11 @@ public class PersonService {
                             }
                         } else if (9 == j) {//政治面貌
                             if (StringUtils.isNotBlank(value)){
-                                personVO.setPolicitalStatus(value);
+                                personVO.setPolicitalStatus(DictCache.getValueByName("policital_status",value));
                             }
                         }  else if (10 == j) {//婚姻
                             if (StringUtils.isNotBlank(value)){
-                                personVO.setMarriage(value);
+                                personVO.setMarriage(DictCache.getValueByName("marriage",value));
                             }
                         }  else if (11 == j) {//口音
                             if (StringUtils.isNotBlank(value)){
@@ -588,6 +593,8 @@ public class PersonService {
             BeanUtil.copyProperties(idenPerson,resVO);
             resVO.setPopulationTypeName(PopulationTypeEnum.getValueToName(resVO.getPopulationType()));
             resVO.setTypeName(PersonTypeEnum.getValueToName(resVO.getType()));
+            resVO.setMarriageName(DictCache.getNameByValue("marriage", resVO.getMarriage()));
+            resVO.setPolicitalStatusName(DictCache.getNameByValue("policital_status", resVO.getPolicitalStatus()));
 
             QueryWrapper<IdenPersonCrowdRef> queryWrapper1 = new QueryWrapper<>();
             queryWrapper1.lambda().eq(IdenPersonCrowdRef::getPersonId,resVO.getId());

src/main/java/com/iden/common/cache/DictCache.java

@@ -30,4 +30,17 @@ public class DictCache {
         }
       return null;
     }
+
+    public static String getValueByName(String dictType,String name){
+        List<SysDictItemVO> listSysDictItemVO = ListSysDictItemVOMap.get(dictType);
+        if(CollUtil.isEmpty(listSysDictItemVO)){
+            return null;
+        }
+        for(SysDictItemVO vo : listSysDictItemVO){
+            if(name.equals(vo.getName())){
+                return vo.getValue();
+            }
+        }
+        return null;
+    }
 }

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

@@ -12,7 +12,8 @@ public enum CredentialsTypeEnum {
      * 证件类型类型
      */
     IDCARD("1","身份证"),
-    PASSPORT("2","护照");
+    PASSPORT("2","护照"),
+     OL("3","军官证");
     private String value;
     private String name;
     CredentialsTypeEnum(String value, String name) {
@@ -34,6 +35,8 @@ public enum CredentialsTypeEnum {
             return  IDCARD.name;
         } else if (PASSPORT.getValue().equals(value)) {
             return PASSPORT.name;
+        } else if (OL.getValue().equals(value)) {
+            return OL.name;
         }
         return null;
     }
@@ -45,6 +48,8 @@ public enum CredentialsTypeEnum {
             return  IDCARD.value;
         } else if (PASSPORT.getName().equals(name)) {
             return PASSPORT.value;
+        }  else if (OL.getName().equals(name)) {
+            return OL.value;
         }
         return null;
     }

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

@@ -71,12 +71,12 @@ public class PersonExcelVO implements Serializable {
 
     @ApiModelProperty("政治面貌")
     @ExcelProperty("政治面貌")
-    private String policitalStatus;
+    private String policitalStatusName;
 
 
     @ApiModelProperty("婚姻")
     @ExcelProperty("婚姻")
-    private String marriage;
+    private String marriageName;
 
 
     @ApiModelProperty("口音")

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

@@ -76,10 +76,15 @@ public class PersonVO implements Serializable {
     @ApiModelProperty("政治面貌")
     private String policitalStatus;
 
+    @ApiModelProperty("政治面貌")
+    private String policitalStatusName;
 
     @ApiModelProperty("婚姻")
     private String marriage;
 
+    @ApiModelProperty("婚姻")
+    private String marriageName;
+
 
     @ApiModelProperty("口音")
     private String voice;