ソースを参照

导入带图像

suntianwu 3 年 前
コミット
f87b0452dd

+ 3 - 15
src/main/java/com/iden/bms/service/PersonService.java

@@ -2,30 +2,21 @@ package com.iden.bms.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.write.metadata.WriteSheet;
-import com.alibaba.excel.write.metadata.fill.FillConfig;
 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.bms.face.FaceIdenService;
 import com.iden.bms.face.FaceIdenTool;
 import com.iden.common.entity.IdenCommunity;
 import com.iden.common.entity.IdenCrowd;
 import com.iden.common.entity.IdenPerson;
 
 import com.iden.common.entity.IdenPersonCrowdRef;
-import com.iden.common.enums.CredentialsTyoeEnum;
+import com.iden.common.enums.CredentialsTypeEnum;
 import com.iden.common.enums.GenderEnum;
 import com.iden.common.enums.PersonTypeEnum;
 import com.iden.common.enums.PopulationTypeEnum;
-import com.iden.common.exceltool.CommonExcelParse;
-import com.iden.common.exceltool.ExcelUtil;
-import com.iden.common.exceltool.IExcelParser;
-import com.iden.common.exceltool.MultipartFileToFile;
 import com.iden.common.exception.BDException;
 import com.iden.common.service.IdenCommunityService;
 import com.iden.common.service.IdenCrowdService;
@@ -33,7 +24,6 @@ import com.iden.common.service.IdenPersonCrowdRefService;
 import com.iden.common.service.IdenPersonService;
 import com.iden.common.util.DateUtils;
 import com.iden.common.util.ImgUtil;
-import com.iden.common.util.MyBeanUtils;
 import com.iden.common.vo.*;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -53,8 +43,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.util.*;
@@ -165,7 +153,7 @@ public class PersonService {
                     resVO.setPopulationTypeName(PopulationTypeEnum.getValueToName(resVO.getPopulationType()));
                     resVO.setTypeName(PersonTypeEnum.getValueToName(resVO.getType()));
                     resVO.setGenderName(GenderEnum.getValueToName(resVO.getGender()));
-                    resVO.setCredentialsTyoeName(CredentialsTyoeEnum.getValueToName(resVO.getCredentialsTyoe()));
+                    resVO.setCredentialsTypeName(CredentialsTypeEnum.getValueToName(resVO.getCredentialsType()));
 
                     try {
                         resVO.setImageUrl(new URL(resVO.getImage()));
@@ -230,7 +218,7 @@ public class PersonService {
                 resVO.setPopulationTypeName(PopulationTypeEnum.getValueToName(resVO.getPopulationType()));
                 resVO.setTypeName(PersonTypeEnum.getValueToName(resVO.getType()));
                 resVO.setGenderName(GenderEnum.getValueToName(resVO.getGender()));
-                resVO.setCredentialsTyoeName(CredentialsTyoeEnum.getValueToName(resVO.getCredentialsTyoe()));
+                resVO.setCredentialsTypeName(CredentialsTypeEnum.getValueToName(resVO.getCredentialsType()));
 
                 try {
                     resVO.setImageUrl(new URL(resVO.getImage()));

+ 2 - 2
src/main/java/com/iden/common/enums/CredentialsTyoeEnum.java

@@ -7,7 +7,7 @@ import cn.hutool.core.util.StrUtil;
  * @Author:java
  * @Date: 2021/05/27
  */
-public enum CredentialsTyoeEnum {
+public enum CredentialsTypeEnum {
     /**
      * 证件类型类型
      */
@@ -16,7 +16,7 @@ public enum CredentialsTyoeEnum {
     OL("3","军官证");
     private String value;
     private String name;
-    CredentialsTyoeEnum(String value, String name) {
+    CredentialsTypeEnum(String value, String name) {
         this.value = value;
         this.name = name;
     }