From 84a936f3c0cf8ed42362c6405e9e9ba4b9e04156 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 30 Aug 2022 14:27:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92=E7=96=AB?= =?UTF-8?q?=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/VaccinePrarmeterListFormDTO.java | 9 +++++++++ .../controller/IcVaccinePrarmeterController.java | 16 +++++++++++++--- .../epmet/service/IcVaccinePrarmeterService.java | 2 +- .../impl/IcVaccinePrarmeterServiceImpl.java | 9 ++++++++- .../resources/mapper/IcVaccinePrarmeterDao.xml | 4 ++++ 5 files changed, 35 insertions(+), 5 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java index 4fbc71217b..859a30a01d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinePrarmeterListFormDTO.java @@ -30,6 +30,15 @@ public class VaccinePrarmeterListFormDTO extends PageFormDTO implements Serializ */ private String idCard; + /** + * 客户ID + */ + private String customerId; + /** + * 部门ID + */ + private String agencyId; + private String isVaccination; private String gridId; private String villageId; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java index 674686ca73..cddabc98ad 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java @@ -5,8 +5,10 @@ import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.dto.form.PageFormDTO; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ExcelPoiUtils; import com.epmet.commons.tools.utils.ExcelUtils; @@ -61,9 +63,9 @@ public class IcVaccinePrarmeterController { @RequestMapping("page") // @MaskResponse(fieldNames = {"MOBILE", "ID_CARD"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params, @LoginUser TokenDto tokenDto){ // PageData page = icVaccinePrarmeterService.page(params); - PageData page = icVaccinePrarmeterService.getPhrasePage(params); + PageData page = icVaccinePrarmeterService.getPhrasePage(params,tokenDto); return new Result>().ok(page); } @@ -75,9 +77,10 @@ public class IcVaccinePrarmeterController { @NoRepeatSubmit @PostMapping("save") - public Result save(@RequestBody IcVaccinePrarmeterDTO dto){ + public Result save(@RequestBody IcVaccinePrarmeterDTO dto, @LoginUser TokenDto tokenDto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + dto.setCustomerId(tokenDto.getCustomerId()); icVaccinePrarmeterService.save(dto); return new Result(); } @@ -116,6 +119,13 @@ public class IcVaccinePrarmeterController { @PostMapping("vaccine-export") public void vaccineExport(HttpServletResponse response, @RequestBody VaccinePrarmeterListFormDTO formDTO, @LoginUser TokenDto tokenDto) throws Exception { ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + // 获取工作人员缓存信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + if (null == staffInfo) { + throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", tokenDto.getUserId())); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); List list = icVaccinePrarmeterDao.vaccineExport(formDTO); ExcelUtils.exportExcelToTarget(response, null, list, IcVaccinePrarmeterExcel.class); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java index 41137212df..edadf0fabf 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java @@ -35,7 +35,7 @@ public interface IcVaccinePrarmeterService extends BaseService getPhrasePage(Map params); + PageData getPhrasePage(Map params, TokenDto tokenDto); /** * 默认查询 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 6edf94b941..1f3e85df9e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -124,7 +124,14 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl getPhrasePage(Map params) { + public PageData getPhrasePage(Map params, TokenDto tokenDto) { + params.put("customerId",tokenDto.getCustomerId()); + // 获取工作人员缓存信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + if (null == staffInfo) { + throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", tokenDto.getUserId())); + } + params.put("agencyId",staffInfo.getAgencyId()); IPage page = getPage(params); List list = baseDao.getPhrasePage(params); return new PageData<>(list, page.getTotal()); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml index b06633761b..ebbebfe289 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml @@ -78,6 +78,8 @@ CHECK_REASON from ic_vaccine_prarmeter where DEL_FLAG = 0 + and CUSTOMER_ID = #{customerId} + AND (AGENCY_ID = #{agencyId} OR PIDS LIKE CONCAT('%',#{agencyId},'%')) and NAME like CONCAT('%' ,#{name}, '%') @@ -150,6 +152,8 @@ CHECK_REASON from ic_vaccine_prarmeter where DEL_FLAG = 0 + and CUSTOMER_ID = #{customerId} + AND (AGENCY_ID = #{agencyId} OR PIDS LIKE CONCAT('%',#{agencyId},'%')) and NAME like CONCAT('%' ,#{name}, '%')