update

epdc-cloud-commons-yushan

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

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

@@ -56,7 +56,7 @@ public class EpidemicReportUserInfoServiceImpl extends CrudServiceImpl<EpidemicR
     @Autowired
     public EpidemicUserErrorService epidemicUserErrorService;
 
-    Logger log = LoggerFactory.getLogger(IpUtils.class);
+    private Logger log = LoggerFactory.getLogger(IpUtils.class);
 
     @Override
     public QueryWrapper<EpidemicReportUserInfoEntity> getWrapper(Map<String, Object> params) {
@@ -150,7 +150,7 @@ public class EpidemicReportUserInfoServiceImpl extends CrudServiceImpl<EpidemicR
      * @date 2021/1/19 16:37
      * @params [mobile]
      */
-    public String mobileEncrypt(String mobile) {
+    private String mobileEncrypt(String mobile) {
         if (TextUtils.isEmpty(mobile) || (mobile.length() != 11)) {
             return mobile;
         }

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

@@ -7,7 +7,6 @@ import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicUserErrorDTO;
 import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserErrorEntity;
 import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserErrorService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -34,13 +33,11 @@ public class EpidemicUserErrorServiceImpl extends CrudServiceImpl<EpidemicUserEr
 
     @Override
     public List<EpidemicUserErrorDTO> getErrorInfoByMax() {
-        List<EpidemicUserErrorDTO> list = baseDao.getErrorInfoByMax();
-        return list;
+        return baseDao.getErrorInfoByMax();
     }
 
-    @Autowired
+    @Override
     public Integer getMaxInsertNo() {
-        Integer insertNo = baseDao.getMaxInsertNo();
-        return insertNo;
+        return baseDao.getMaxInsertNo();
     }
 }

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

@@ -1,15 +1,10 @@
 package com.elink.esua.epdc.vaccine.vim.service.impl;
 
 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.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.VaccineCompanyDao;
-import com.elink.esua.epdc.vaccine.vim.dto.VaccinationSiteDTO;
 import com.elink.esua.epdc.vaccine.vim.dto.VaccineCompanyDTO;
 import com.elink.esua.epdc.vaccine.vim.dto.result.VaccineDto;
-import com.elink.esua.epdc.vaccine.vim.entity.VaccinationSiteEntity;
 import com.elink.esua.epdc.vaccine.vim.entity.VaccineCompanyEntity;
 import com.elink.esua.epdc.vaccine.vim.service.VaccineCompanyService;
 import org.apache.commons.lang3.StringUtils;
@@ -25,12 +20,10 @@ import java.util.Map;
  * @since 1.0.0 2021-04-16
  */
 @Service
-public class VaccineCompanyServiceImpl extends CrudServiceImpl<VaccineCompanyDao, VaccineCompanyEntity, VaccineCompanyDTO> implements VaccineCompanyService {
+public class VaccineCompanyServiceImpl extends BaseVimCurdServiceImpl<VaccineCompanyDao, VaccineCompanyEntity, VaccineCompanyDTO> implements VaccineCompanyService {
 
     @Override
     public QueryWrapper<VaccineCompanyEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get("id");
-
         QueryWrapper<VaccineCompanyEntity> wrapper = new QueryWrapper<>();
         wrapper.orderByDesc("CREATED_TIME");
         String companyName= (String) params.get("companyName");
@@ -38,15 +31,6 @@ public class VaccineCompanyServiceImpl extends CrudServiceImpl<VaccineCompanyDao
         return wrapper;
     }
 
-    @Override
-    public PageData<VaccineCompanyDTO> page(Map<String, Object> params) {
-        IPage<VaccineCompanyEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, VaccineCompanyDTO.class);
-    }
-
     @Override
     public List<VaccineDto> compantyList() {
         return baseDao.selectCompantyList();