From db5dc52c255d8ffb8b131812b7bdfff395463d52 Mon Sep 17 00:00:00 2001 From: YUJT Date: Mon, 9 May 2022 14:35:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B1=85=E6=B0=91=E7=AB=AF?= =?UTF-8?q?=E5=85=9A=E5=91=98=E9=A3=8E=E9=87=87=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/StyleShowListResiFormDTO.java | 22 +++++++++++ .../IcPartymemberStyleController.java | 39 ++++++++++++++----- .../service/IcPartymemberStyleService.java | 14 +++++++ .../impl/IcPartymemberStyleServiceImpl.java | 35 ++++++++++------- 4 files changed, 88 insertions(+), 22 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/StyleShowListResiFormDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/StyleShowListResiFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/StyleShowListResiFormDTO.java new file mode 100644 index 0000000000..102a99b3e7 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/StyleShowListResiFormDTO.java @@ -0,0 +1,22 @@ +package com.epmet.resi.partymember.dto.partymember.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 党员风采列表接口参数 + * + * @author work@yujt.net.cn + * @date 2022/5/9/0009 14:22 + */ +@Data +public class StyleShowListResiFormDTO extends StyleShowListFormDTO implements Serializable { + + private static final long serialVersionUID = -7548077165302515633L; + + @NotBlank(message = "所属组织不能为空") + private String agencyId; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java index b22de7b1f6..f73a8bd961 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java @@ -40,6 +40,7 @@ import com.epmet.modules.partymember.service.IcPartymemberStyleService; import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO; import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO; import com.epmet.resi.partymember.dto.partymember.form.StyleShowListFormDTO; +import com.epmet.resi.partymember.dto.partymember.form.StyleShowListResiFormDTO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FilenameUtils; @@ -75,27 +76,27 @@ import java.util.stream.Collectors; @RestController @RequestMapping("icpartymemberstyle") public class IcPartymemberStyleController { - + @Autowired private IcPartymemberStyleService icPartymemberStyleService; @Autowired private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; @GetMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params) { PageData page = icPartymemberStyleService.page(params); return new Result>().ok(page); } @PostMapping("detail") - public Result get(@RequestBody IcPartymemberStyleDTO dto){ + public Result get(@RequestBody IcPartymemberStyleDTO dto) { IcPartymemberStyleDTO data = icPartymemberStyleService.get(dto.getId()); return new Result().ok(data); } @PostMapping("save") @NoRepeatSubmit - public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartymemberStyleDTO dto){ + public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartymemberStyleDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); icPartymemberStyleService.save(tokenDto, dto); @@ -103,7 +104,7 @@ public class IcPartymemberStyleController { } @PostMapping("delete") - public Result delete(@RequestBody IcPartymemberStyleDTO dto){ + public Result delete(@RequestBody IcPartymemberStyleDTO dto) { //效验数据 icPartymemberStyleService.delete(dto.getId()); return new Result(); @@ -156,7 +157,7 @@ public class IcPartymemberStyleController { InputStream inputStream = null; try { inputStream = file.getInputStream(); - }catch (Exception e){ + } catch (Exception e) { ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO(); input.setOperatorId(tokenDto.getUserId()); input.setTaskId(result.getData().getTaskId()); @@ -172,23 +173,43 @@ public class IcPartymemberStyleController { /** * 数据分析-党员风采列表查询 + * * @param tokenDto * @return */ @PostMapping("showlist") - public Result> showList(@LoginUser TokenDto tokenDto, @RequestBody StyleShowListFormDTO formDTO){ + public Result> showList(@LoginUser TokenDto tokenDto, @RequestBody StyleShowListFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); - ValidatorUtils.validateEntity(formDTO,StyleShowListFormDTO.AddUserInternalGroup.class); + ValidatorUtils.validateEntity(formDTO, StyleShowListFormDTO.AddUserInternalGroup.class); return new Result>().ok(icPartymemberStyleService.showList(formDTO)); } + /** + * 党员风采列表 + * + * @param tokenDto 登录用户 + * @param formDto 查询条件 + * @return com.epmet.commons.tools.utils.Result> + * @author work@yujt.net.cn + * @date 2022/5/9/0009 14:23 + */ + @PostMapping("showlistbyagency") + public Result> showListByAgency(@LoginUser TokenDto tokenDto, @RequestBody StyleShowListResiFormDTO formDto) { + formDto.setCustomerId(tokenDto.getCustomerId()); + // 此接口不包含userId相关业务处理 + formDto.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDto, StyleShowListFormDTO.AddUserInternalGroup.class); + return new Result().ok(icPartymemberStyleService.showListByAgency(formDto)); + } + /** * 下载党员风采导入模板 + * * @param response * @throws IOException */ - @RequestMapping(value = "import/template-download" ,method = {RequestMethod.GET, RequestMethod.POST}) + @RequestMapping(value = "import/template-download", method = {RequestMethod.GET, RequestMethod.POST}) public void downloadTemplate(HttpServletResponse response) throws IOException { response.setCharacterEncoding("UTF-8"); response.addHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-Disposition"); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java index 4a9ec6ba5c..9e004e03c5 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java @@ -25,6 +25,7 @@ import com.epmet.modules.partymember.entity.IcPartymemberStyleEntity; import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO; import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO; import com.epmet.resi.partymember.dto.partymember.form.StyleShowListFormDTO; +import com.epmet.resi.partymember.dto.partymember.form.StyleShowListResiFormDTO; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; @@ -93,6 +94,7 @@ public interface IcPartymemberStyleService extends BaseService} * @Author zhaoqifeng @@ -102,6 +104,7 @@ public interface IcPartymemberStyleService extends BaseService showList(StyleShowListFormDTO formDTO); + + /** + * 党员风采列表查询 + * + * @param formDto + * @return com.epmet.commons.tools.page.PageData + * @author work@yujt.net.cn + * @date 2022/5/9/0009 14:22 + */ + PageData showListByAgency(StyleShowListResiFormDTO formDto); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java index 3c5871637c..b488b7e15f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java @@ -60,6 +60,7 @@ import com.epmet.modules.partymember.service.IcPartymemberStyleService; import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO; import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO; import com.epmet.resi.partymember.dto.partymember.form.StyleShowListFormDTO; +import com.epmet.resi.partymember.dto.partymember.form.StyleShowListResiFormDTO; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -72,10 +73,8 @@ import org.apache.http.entity.ContentType; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; -import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.commons.CommonsMultipartFile; import javax.annotation.Resource; @@ -131,7 +130,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl { if (StringUtils.isNotBlank(item.getGridId())) { GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getGridId()); - if(gridInfo == null) { + if (gridInfo == null) { log.warn("未找到网格信息:{}", item.getGridId()); return; } @@ -145,8 +144,8 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -168,7 +167,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl list = baseDao.selectList(wrapper); PageInfo pageInfo = new PageInfo<>(list); @@ -289,13 +288,13 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl> gridOptionResult = govOrgOpenFeignClient.getGridIListByAgency(staffInfoCache.getAgencyId()); + Result> gridOptionResult = govOrgOpenFeignClient.getGridIListByAgency(staffInfoCache.getAgencyId()); if (!gridOptionResult.success()) { throw new EpmetException(gridOptionResult.getCode(), gridOptionResult.getMsg()); } Map gridMap = gridOptionResult.getData().stream().collect(Collectors.toMap(CustomerGridDTO::getGridName, CustomerGridDTO::getId)); //获取党员风采所有分类:key:分类名称； - Map categoryDictMap=icPartymemberStyleCategoryDictService.getCategoryDictMap(tokenDto.getCustomerId()); + Map categoryDictMap = icPartymemberStyleCategoryDictService.getCategoryDictMap(tokenDto.getCustomerId()); //1.数据校验 只允许导入当前组织下的网格的数据 //网格名称不一样的数据舍弃或者分类名称不存在也舍弃 Iterator iterator = result.iterator(); @@ -346,7 +345,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl showList(StyleShowListFormDTO formDTO) { - CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + String customerId = formDTO.getCustomerId(); + CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(customerId, formDTO.getUserId()); if (null == staff || StringUtils.isBlank(staff.getAgencyId())) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询当前工作人员缓存信息失败", "查询用户信息异常"); } - PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectShowList(staff.getAgencyId(), formDTO.getCustomerId())); + return showListByAgency(formDTO.getPageNo(), formDTO.getPageSize(), staff.getAgencyId(), customerId); + } + + @Override + public PageData showListByAgency(StyleShowListResiFormDTO formDto) { + return showListByAgency(formDto.getPageNo(), formDto.getPageSize(), formDto.getAgencyId(), formDto.getCustomerId()); + } + + private PageData showListByAgency(int pageNo, int pageSize, String agencyId, String customerId) { + PageInfo pageInfo = PageHelper.startPage(pageNo, pageSize).doSelectPageInfo(() -> baseDao.selectShowList(agencyId, customerId)); if (CollectionUtils.isNotEmpty(pageInfo.getList())) { //赋值网格名称 for (IcPartymemberStyleDTO dto : pageInfo.getList()) { @@ -468,5 +478,4 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl(pageInfo.getList(), pageInfo.getTotal()); } - }