update

epdc-cloud-admin/src/main/resources/application.yml

@@ -34,6 +34,12 @@ spring:
       sampler:
         # 将采样比例设置为 1.0，也就是全部都需要。默认是 0.1
         probability: 1.0
+  servlet:
+    multipart:
+      enabled: true
+      file-size-threshold: 0
+      max-file-size: 20MB
+      max-request-size: 50MB
 
 management:
   endpoints:

epdc-cloud-commons-yushan

@@ -1 +1 @@
-Subproject commit 60b469fb3d9fccb7220f65c3ddbaa412033ecc01
+Subproject commit 9596cd2ada0a9e7de4bfdc86d85791d71040965b

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/common/base/BaseVimCurdServiceImpl.java

@@ -19,7 +19,7 @@ public abstract class BaseVimCurdServiceImpl<M extends BaseMapper<T>, T, D> exte
 
 
     @Override
-    public <T1> IPage<T1> getPage(Map<String, Object> params) {
+    protected  <T1> IPage<T1> getPage(Map<String, Object> params) {
         //分页参数
         long curPage = 1;
         long limit = 10;

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicReportUserInfoServiceImpl.java

@@ -6,7 +6,6 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.CrudServiceImpl;
-import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.*;
@@ -34,9 +33,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -196,26 +193,6 @@ public class EpidemicReportUserInfoServiceImpl extends CrudServiceImpl<EpidemicR
         return list;
     }
 
-    /*
-     *
-     * 校验身份证号
-     * @param identityNo
-     * @author wk
-     * @date 2021-01-19 16:39
-     * @return java.lang.String
-     */
-    private String fixAndCheckIdentityNo(String identityNo) {
-        identityNo = ModuleUtils.replaceIllegalCharacter(identityNo);
-        if (StringUtils.isBlank(identityNo)) {
-            throw new RenException("身份证号不能为空");
-        }
-        String verification = IdentityNoUtils.IdentityNoVerification(identityNo);
-        if (StringUtils.isNotBlank(verification)) {
-            throw new RenException(verification);
-        }
-        return identityNo;
-    }
-
     @Override
     public EpidemicReportUserInfoDetailDTO getDetailById(Long id) {
         EpidemicReportUserInfoDetailDTO result = baseDao.getDetailById(id);
@@ -681,29 +658,4 @@ public class EpidemicReportUserInfoServiceImpl extends CrudServiceImpl<EpidemicR
         return false;
     }
 
-    /**
-     * 时间格式化
-     *
-     * @param dateString
-     * @return
-     */
-    private String dateFormat(String dateString) {
-        if (StringUtils.isBlank(dateString)) {
-            return "";
-        }
-        if (dateString.length() == 10 && "-".equals(dateString.substring(4, 5)) && "-".equals(dateString.substring(7, 8))) {
-            return dateString;
-        }
-        Date d = null;
-        SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd");
-        try {
-            d = new Date(dateString);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return "格式错误";
-        }
-        return f.format(d);
-    }
-
-
 }