update

epdc-cloud-commons-yushan

@@ -1 +1 @@
-Subproject commit 60b469fb3d9fccb7220f65c3ddbaa412033ecc01
+Subproject commit 6f363d0fee687011f3fd37341fd7afbbdd2805c4

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

@@ -0,0 +1,53 @@
+package com.elink.esua.epdc.vaccine.common.base;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elink.esua.epdc.commons.mybatis.service.impl.CrudServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+
+import java.util.Map;
+
+/**
+ * 重写一些方法
+ *
+ * @author work@yujt.net.cn
+ */
+public abstract class BaseVimCurdServiceImpl<M extends BaseMapper<T>, T, D> extends CrudServiceImpl<M, T, D> {
+
+
+    @Override
+    public <T1> IPage<T1> getPage(Map<String, Object> params) {
+        //分页参数
+        long curPage = 1;
+        long limit = 10;
+
+        if (params.get(Constant.PAGE) != null) {
+            curPage = Long.parseLong((String) params.get(Constant.PAGE));
+        }
+        if (params.get(Constant.LIMIT) != null) {
+            limit = Long.parseLong((String) params.get(Constant.LIMIT));
+        }
+
+        //分页对象
+        Page<T1> page = new Page<>(curPage, limit);
+
+        //分页参数
+        params.put(Constant.PAGE, page);
+
+        return page;
+    }
+
+    @Override
+    public PageData<D> page(Map<String, Object> params) {
+        IPage<T> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, currentDtoClass());
+    }
+
+
+}

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

@@ -12,6 +12,8 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.IdentityNoUtils;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.vaccine.common.uitls.ValidateUtils;
 import com.elink.esua.epdc.vaccine.epidemic.dao.EpidemicReportUserInfoDao;
 import com.elink.esua.epdc.vaccine.epidemic.dao.EpidemicUserInfoDao;
 import com.elink.esua.epdc.vaccine.epidemic.dao.EpidemicUserInoutRecordDao;
@@ -238,7 +240,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
                 userInoutRecordDTO.setMobile(inoutRecordEntity.getMobile());
             } else {
                 String mobile = userInoutRecordDTO.getMobile();
-                Boolean isMobile = IdentityNoUtils.validateMobilePhone(mobile);
+                Boolean isMobile = ValidateUtils.validateMobilePhone(mobile);
                 if (!isMobile) {
                     return new Result().error("电话号格式不正确");
                 }
@@ -255,7 +257,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
                     userInoutRecordDTO.setRelationPeopleMobile(inoutRecordEntity.getRelationPeopleMobile());
                 } else {
                     String peopleMobile = userInoutRecordDTO.getRelationPeopleMobile();
-                    boolean isMobile = IdentityNoUtils.validateMobilePhone(peopleMobile);
+                    boolean isMobile = ValidateUtils.validateMobilePhone(peopleMobile);
                     if (!isMobile) {
                         return new Result().error("关联人联系电话格式不正确");
                     }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.CrudServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.vaccine.common.base.BaseVimCurdServiceImpl;
 import com.elink.esua.epdc.vaccine.vim.dao.VaccinationInfoDao;
 import com.elink.esua.epdc.vaccine.vim.dto.VaccinationInfoDTO;
 import com.elink.esua.epdc.vaccine.vim.entity.VaccinationInfoEntity;
@@ -23,7 +24,7 @@ import java.util.stream.Collectors;
  * @since 1.0.0 2021-04-16
  */
 @Service
-public class VaccinationInfoServiceImpl extends CrudServiceImpl<VaccinationInfoDao, VaccinationInfoEntity, VaccinationInfoDTO> implements VaccinationInfoService {
+public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl<VaccinationInfoDao, VaccinationInfoEntity, VaccinationInfoDTO> implements VaccinationInfoService {
 
     @Override
     public QueryWrapper<VaccinationInfoEntity> getWrapper(Map<String, Object> params) {
@@ -38,14 +39,14 @@ public class VaccinationInfoServiceImpl extends CrudServiceImpl<VaccinationInfoD
         return wrapper;
     }
 
-    @Override
+    /*@Override
     public PageData<VaccinationInfoDTO> page(Map<String, Object> params) {
         IPage<VaccinationInfoEntity> page = baseDao.selectPage(
                 getPage(params, FieldConstant.CREATED_TIME, false),
                 getWrapper(params)
         );
         return getPageData(page, VaccinationInfoDTO.class);
-    }
+    }*/
 
     @Override
     public List<VaccinationInfoEntity> checkVaccination(VaccinationInfoDTO dto) {