From 147d7ad31ba6a6051ee0d38748d82233d96fefeb Mon Sep 17 00:00:00 2001 From: HAHA Date: Sat, 23 Apr 2022 10:16:07 +0800 Subject: [PATCH] =?UTF-8?q?message:=20=E5=AE=8C=E5=96=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6customerId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/PowerAxisLeaderDetailFormDTO.java | 1 + .../form/PowerAxisListPositionFormDTO.java | 10 +++ .../dto/axis/form/PowerAxisStructFormDTO.java | 1 + ...erAxisStructListByCategoryCodeFormDTO.java | 1 + .../PowerAxisStructStructTreeFormDTO.java | 1 + .../axis/form/PowerAxisStructViewFormDTO.java | 1 + .../PowerKernelHouseHoldViewListFormDTO.java | 1 + .../form/PowerKernelListPostitionFormDTO.java | 1 + .../PowerAxisListPositionResultDTO.java | 11 ++++ .../PowerAxisStructViewController.java | 17 ++--- .../PowerViewServiceStationController.java | 7 ++ .../PowerKernelHouseholdController.java | 42 +----------- .../modules/axis/dao/PowerAxisLeaderDao.java | 2 +- .../modules/axis/dao/PowerAxisStructDao.java | 19 ++++-- .../axis/dao/PowerAxisStructLeaderDao.java | 2 +- .../axis/service/PowerAxisStructService.java | 4 ++ .../service/PowerKernelHouseholdService.java | 2 + .../impl/PowerAxisLeaderServiceImpl.java | 8 ++- .../PowerAxisStructLeaderServiceImpl.java | 8 ++- .../impl/PowerAxisStructServiceImpl.java | 44 +++++++++++-- .../impl/PowerKernelHouseholdServiceImpl.java | 65 ++++++++++++++++++- .../mapper/poweraxis/PowerAxisLeaderDao.xml | 3 + .../mapper/poweraxis/PowerAxisStructDao.xml | 57 ++++++++++++++-- .../poweraxis/PowerAxisStructLeaderDao.xml | 1 + .../poweraxis/PowerKernelHouseholdDao.xml | 8 +++ 25 files changed, 245 insertions(+), 72 deletions(-) create mode 100644 epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisListPositionFormDTO.java create mode 100644 epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisListPositionResultDTO.java diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisLeaderDetailFormDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisLeaderDetailFormDTO.java index 8d5e9d4..688e551 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisLeaderDetailFormDTO.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisLeaderDetailFormDTO.java @@ -6,4 +6,5 @@ import lombok.Data; public class PowerAxisLeaderDetailFormDTO { private String axisStructId; private String leaderId; + private String customerId; } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisListPositionFormDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisListPositionFormDTO.java new file mode 100644 index 0000000..cc2622f --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisListPositionFormDTO.java @@ -0,0 +1,10 @@ +package com.epmet.plugin.power.dto.axis.form; + +import lombok.Data; + +@Data +public class PowerAxisListPositionFormDTO { + private String tagCategory; + private String customerId; + private int structLevel; +} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructFormDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructFormDTO.java index 67e2e62..de4662c 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructFormDTO.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructFormDTO.java @@ -10,4 +10,5 @@ import lombok.NoArgsConstructor; public class PowerAxisStructFormDTO{ private String agencyId; private String name; + private String customerId; } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructListByCategoryCodeFormDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructListByCategoryCodeFormDTO.java index 3123ec9..c71c9ec 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructListByCategoryCodeFormDTO.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructListByCategoryCodeFormDTO.java @@ -6,4 +6,5 @@ import lombok.Data; public class PowerAxisStructListByCategoryCodeFormDTO { private String agencyId; private String categoryCode; + private String customerId; } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructStructTreeFormDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructStructTreeFormDTO.java index 9915db5..90e8a0a 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructStructTreeFormDTO.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructStructTreeFormDTO.java @@ -5,4 +5,5 @@ import lombok.Data; @Data public class PowerAxisStructStructTreeFormDTO { private String agencyId; + private String customerId; } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructViewFormDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructViewFormDTO.java index 81fd549..8d89707 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructViewFormDTO.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructViewFormDTO.java @@ -4,5 +4,6 @@ import lombok.Data; @Data public class PowerAxisStructViewFormDTO { + private String customerId; private String agencyId; } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelHouseHoldViewListFormDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelHouseHoldViewListFormDTO.java index 6177579..7ab0648 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelHouseHoldViewListFormDTO.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelHouseHoldViewListFormDTO.java @@ -7,4 +7,5 @@ public class PowerKernelHouseHoldViewListFormDTO { private String axisStructId; private int pageNo; private int pageSize; + private String customerId; } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelListPostitionFormDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelListPostitionFormDTO.java index a6b2dbc..f1b677b 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelListPostitionFormDTO.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelListPostitionFormDTO.java @@ -6,4 +6,5 @@ import lombok.Data; public class PowerKernelListPostitionFormDTO { private String axisStructId; private int limit; + private String customerId; } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisListPositionResultDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisListPositionResultDTO.java new file mode 100644 index 0000000..0e0257c --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisListPositionResultDTO.java @@ -0,0 +1,11 @@ +package com.epmet.plugin.power.dto.axis.result; + +import lombok.Data; + +@Data +public class PowerAxisListPositionResultDTO { + private String axisStructId; + private String longitude; + private String latitude; + private String axisStructName; +} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxisStructViewController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxisStructViewController.java index 6403727..4874aed 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxisStructViewController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxisStructViewController.java @@ -1,21 +1,16 @@ package com.epmet.plugin.power.modules.axis.ViewController; import com.epmet.commons.tools.utils.Result; +import com.epmet.plugin.power.dto.axis.ResultDTO; import com.epmet.plugin.power.dto.axis.form.PowerAxisLeaderDetailFormDTO; import com.epmet.plugin.power.dto.axis.form.PowerAxisStructStructTreeFormDTO; import com.epmet.plugin.power.dto.axis.form.PowerAxisStructViewFormDTO; -import com.epmet.plugin.power.dto.axis.result.PowerAxisLeaderDetailResultDTO; -import com.epmet.plugin.power.dto.axis.result.PowerAxisStructResultDTO; -import com.epmet.plugin.power.dto.axis.result.PowerAxisStructTreeResultDTO; -import com.epmet.plugin.power.dto.axis.result.PowerAxisStructViewResultDTO; +import com.epmet.plugin.power.dto.axis.result.*; import com.epmet.plugin.power.modules.axis.service.PowerAxisLeaderService; import com.epmet.plugin.power.modules.axis.service.PowerAxisStructService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -55,4 +50,10 @@ public class PowerAxisStructViewController { List dto = powerAxisStructService.getStructTree(form); return new Result().ok(dto); } + + @PostMapping("/{structLevel}/listPosition") + public ResultDTO getListPosition(@PathVariable int structLevel){ + List list = powerAxisStructService.getListPosition(structLevel); + return ResultDTO.success("成功",list,powerAxisStructService.queryTotal(structLevel)); + } } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerViewServiceStationController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerViewServiceStationController.java index 1b01759..308d597 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerViewServiceStationController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerViewServiceStationController.java @@ -21,6 +21,13 @@ public class PowerViewServiceStationController { @Autowired private PowerServiceStationService powerServiceStationService; + /** + * 党群服务站集合坐标 + * @param form + * @return com.epmet.plugin.power.dto.axis.ResultDTO + * @author LZN + * @date 2022/4/22 19:53 + */ @PostMapping("/listPosition") public ResultDTO getListPostition(@RequestBody PowerAxisServiceStationFormDTO form){ List list = powerServiceStationService.getListPosition(form); diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerKernelHouseholdController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerKernelHouseholdController.java index 1fc4ade..12b2ef8 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerKernelHouseholdController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerKernelHouseholdController.java @@ -42,11 +42,7 @@ public class PowerKernelHouseholdController { @Autowired private PowerKernelHouseholdService powerKernelHouseholdService; - @Autowired - private GovOrgOpenFeignClient govOrgOpenFeignClient; - @Autowired - private LoginUserUtil loginUserUtil; @RequestMapping("page") public Result> page(@RequestParam Map params){ @@ -97,43 +93,7 @@ public class PowerKernelHouseholdController { */ @PostMapping("/bind") public Result Bind(@RequestBody PowerKernelHouseFormDTO form){ - String customerId = loginUserUtil.getLoginUserCustomerId(); - Set houseIds = new HashSet<>(); - Collections.addAll(houseIds,form.getHouseIdList()); - Result> listResult = govOrgOpenFeignClient.queryListHouseInfo(houseIds, customerId); - if(!listResult.success()){ - return listResult; - } - List houseList = listResult.getData(); - List list = Lists.newArrayList(); - PowerKernelHouseholdEntity entity; - - for(HouseInfoDTO houseInfo : houseList){ - Result icHouseDTOResult = govOrgOpenFeignClient.get(houseInfo.getHomeId()); - if(!icHouseDTOResult.success()){ - continue ; - } - IcHouseDTO houseDto = icHouseDTOResult.getData(); - entity = new PowerKernelHouseholdEntity(); - entity.setHouseId(houseInfo.getHomeId()); - - if(!StringUtils.isEmpty(houseInfo.getBuildingLatitude()) && !StringUtils.isEmpty(houseInfo.getBuildingLongitude())){ - entity.setLatitude(new BigDecimal(houseInfo.getBuildingLatitude())); - entity.setLongitude(new BigDecimal(houseInfo.getBuildingLongitude())); - } else { - entity.setLatitude(BigDecimal.ZERO); - entity.setLongitude(BigDecimal.ZERO); - } - entity.setAddress(houseInfo.getAllName()); - entity.setCustomerId(loginUserUtil.getLoginUserCustomerId()); - - entity.setOwnerPhone(houseDto.getOwnerPhone()); - entity.setOwnerIdCard(houseDto.getOwnerIdCard()); - entity.setOwnerName(houseDto.getOwnerName()); - - entity.setStructReferenceId(form.getAxisStructId()); - powerKernelHouseholdService.insert(entity); - } + powerKernelHouseholdService.bind(form); return new Result(); } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisLeaderDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisLeaderDao.java index 45406cc..631fbd3 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisLeaderDao.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisLeaderDao.java @@ -21,7 +21,7 @@ import java.util.List; public interface PowerAxisLeaderDao extends BaseDao { - List getSimpleList(List ids); + List getSimpleList(List ids,String customerId); PowerAxisLeaderDetailResultDTO getLeaderDetail(PowerAxisLeaderDetailFormDTO form); } \ No newline at end of file diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java index 7660104..49415ee 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java @@ -47,24 +47,24 @@ public interface PowerAxisStructDao extends BaseDao { /** * 获取上级网格党支部 */ - List getGridPartyBranchList(); + List getGridPartyBranchList(String customerId); /** * 获取pid */ - List getPid(); + List getPid(String customerId); /** * 获取上级党委 */ - List getPartyCommList(); + List getPartyCommList(String customerId); int countRepeatStructByName(PowerAxisStructEntity form); int countRepeatStructByCategory(PowerAxisStructEntity form); - List getIdsByAgencyId(String agencyId); + List getIdsByAgencyId(String agencyId,String customerId); List getListByCategoryCode(PowerAxisStructListByCategoryCodeFormDTO form); @@ -72,9 +72,16 @@ public interface PowerAxisStructDao extends BaseDao { int queryGroupParty(PowerAxisStructViewFormDTO form); - int getKernelHouseHold(); + int getKernelHouseHold(PowerAxisStructViewFormDTO form); - int getServiceStation(); + int getServiceStation(PowerAxisStructViewFormDTO form); List getStructTree(PowerAxisStructStructTreeFormDTO form); + + String queryCategoryCode(PowerAxisListPositionFormDTO form); + + List querylistPosition(String customerId, String code); + + + long queryTotal(String customerId, String code); } \ No newline at end of file diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructLeaderDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructLeaderDao.java index 20ec62a..2780461 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructLeaderDao.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructLeaderDao.java @@ -14,5 +14,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface PowerAxisStructLeaderDao extends BaseDao { - PowerAxisSLeaderResultDTO queryLeaderDetailById(String axisStructId); + PowerAxisSLeaderResultDTO queryLeaderDetailById(String axisStructId,String customerId); } \ No newline at end of file diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java index 30777cd..2225736 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java @@ -156,4 +156,8 @@ public interface PowerAxisStructService extends BaseService getStructTree(PowerAxisStructStructTreeFormDTO form); + + List getListPosition(int structLevel); + + long queryTotal(int structLevel); } \ No newline at end of file diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerKernelHouseholdService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerKernelHouseholdService.java index 04b363e..9f69830 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerKernelHouseholdService.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerKernelHouseholdService.java @@ -95,4 +95,6 @@ public interface PowerKernelHouseholdService extends BaseService getListPosition(PowerKernelListPostitionFormDTO form); long getListTotal(PowerKernelListPostitionFormDTO form); + + void bind(PowerKernelHouseFormDTO form); } \ No newline at end of file diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisLeaderServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisLeaderServiceImpl.java index aec5228..7d8b8d6 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisLeaderServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisLeaderServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.plugin.power.dto.axis.PowerAxisLeaderDTO; import com.epmet.plugin.power.dto.axis.form.PowerAxisLeaderDetailFormDTO; @@ -39,6 +40,9 @@ public class PowerAxisLeaderServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -105,11 +109,13 @@ public class PowerAxisLeaderServiceImpl extends BaseServiceImpl getSimpleList(List ids) { - return baseDao.getSimpleList(ids); + String customerId = loginUserUtil.getLoginUserCustomerId(); + return baseDao.getSimpleList(ids,customerId); } @Override public PowerAxisLeaderDetailResultDTO getLeaderDetail(PowerAxisLeaderDetailFormDTO form) { + form.setCustomerId(loginUserUtil.getLoginUserCustomerId()); return baseDao.getLeaderDetail(form); } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructLeaderServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructLeaderServiceImpl.java index 84d8cd8..b7242ce 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructLeaderServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructLeaderServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.plugin.power.dto.axis.result.PowerAxisSLeaderResultDTO; @@ -12,6 +13,7 @@ import com.epmet.plugin.power.dto.axis.PowerAxisStructLeaderDTO; import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructLeaderEntity; import com.epmet.plugin.power.modules.axis.service.PowerAxisStructLeaderService; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -31,6 +33,9 @@ public class PowerAxisStructLeaderServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -85,7 +90,8 @@ public class PowerAxisStructLeaderServiceImpl extends BaseServiceImpl queryDeptByName(PowerAxisStructFormDTO form) { + String customerId = loginUserUtil.getLoginUserCustomerId(); + form.setCustomerId(customerId); List list = powerAxisStructDao.queryDeptByName(form); return list; } @@ -229,19 +231,22 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl getGridPartyBranchList() { - List list = baseDao.getGridPartyBranchList(); + String customerId = loginUserUtil.getLoginUserCustomerId(); + List list = baseDao.getGridPartyBranchList(customerId); return list; } @Override public List getPid() { - List pid = baseDao.getPid(); + String customerId = loginUserUtil.getLoginUserCustomerId(); + List pid = baseDao.getPid(customerId); return pid; } @Override public List getPartyCommList() { - List list = baseDao.getPartyCommList(); + String customerId = loginUserUtil.getLoginUserCustomerId(); + List list = baseDao.getPartyCommList(customerId); return list; } @@ -253,7 +258,8 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl getIdByAgencyId(String agencyId) { - List ids = baseDao.getIdsByAgencyId(agencyId); + String customerId = loginUserUtil.getLoginUserCustomerId(); + List ids = baseDao.getIdsByAgencyId(agencyId,customerId); return ids; } @@ -262,6 +268,7 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl getListByCategoryCode(PowerAxisStructListByCategoryCodeFormDTO form) { + form.setCustomerId(loginUserUtil.getLoginUserCustomerId()); List dto = baseDao.getListByCategoryCode(form); return dto; } @@ -276,9 +283,9 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl getStructTree(PowerAxisStructStructTreeFormDTO form) { + form.setCustomerId(loginUserUtil.getLoginUserCustomerId()); List dto = baseDao.getStructTree(form); return TreeUtils.build(dto); } + @Override + public List getListPosition(int structLevel) { + PowerAxisListPositionFormDTO form = new PowerAxisListPositionFormDTO(); + String customerId = loginUserUtil.getLoginUserCustomerId(); + form.setCustomerId(customerId); + form.setStructLevel(structLevel); + form.setTagCategory(PowerTagCategoryEnum.STRUCT.category()); + String code = baseDao.queryCategoryCode(form); + List list = baseDao.querylistPosition(customerId,code); + return list; + } + + @Override + public long queryTotal(int structLevel) { + PowerAxisListPositionFormDTO form = new PowerAxisListPositionFormDTO(); + String customerId = loginUserUtil.getLoginUserCustomerId(); + form.setCustomerId(customerId); + form.setStructLevel(structLevel); + form.setTagCategory(PowerTagCategoryEnum.STRUCT.category()); + String code = baseDao.queryCategoryCode(form); + long total = baseDao.queryTotal(customerId,code); + return total; + } + } \ No newline at end of file diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java index 8308186..728aed9 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java @@ -6,7 +6,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.IcHouseDTO; +import com.epmet.dto.result.HouseInfoDTO; +import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.plugin.power.dto.axis.PowerKernelHouseholdDTO; import com.epmet.plugin.power.dto.axis.form.PowerKernelHouseFormDTO; import com.epmet.plugin.power.dto.axis.form.PowerKernelHouseHoldViewListFormDTO; @@ -17,14 +22,14 @@ import com.epmet.plugin.power.modules.axis.dao.PowerKernelHouseholdDao; import com.epmet.plugin.power.modules.axis.entity.PowerKernelHouseholdEntity; import com.epmet.plugin.power.modules.axis.redis.PowerKernelHouseholdRedis; import com.epmet.plugin.power.modules.axis.service.PowerKernelHouseholdService; +import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.math.BigDecimal; +import java.util.*; /** * 动力主轴党员中心户 @@ -38,6 +43,15 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -100,25 +114,70 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl getList(PowerKernelHouseHoldViewListFormDTO form) { form.setPageNo((form.getPageNo() - 1) * form.getPageSize()); + form.setCustomerId(loginUserUtil.getLoginUserCustomerId()); List dto = baseDao.getList(form); return dto; } @Override public long getTotal(PowerKernelHouseHoldViewListFormDTO form) { + form.setCustomerId(loginUserUtil.getLoginUserCustomerId()); return baseDao.getTotal(form); } @Override public List getListPosition(PowerKernelListPostitionFormDTO form) { + form.setCustomerId(loginUserUtil.getLoginUserCustomerId()); List dto = baseDao.getListPosition(form); return dto; } @Override public long getListTotal(PowerKernelListPostitionFormDTO form) { + form.setCustomerId(loginUserUtil.getLoginUserCustomerId()); return baseDao.getListTotal(form); } + @Override + public void bind(PowerKernelHouseFormDTO form) { + String customerId = loginUserUtil.getLoginUserCustomerId(); + Set houseIds = new HashSet<>(); + Collections.addAll(houseIds,form.getHouseIdList()); + Result> listResult = govOrgOpenFeignClient.queryListHouseInfo(houseIds, customerId); + if(!listResult.success()){ + return ; + } + List houseList = listResult.getData(); + List list = Lists.newArrayList(); + PowerKernelHouseholdEntity entity; + + for(HouseInfoDTO houseInfo : houseList){ + Result icHouseDTOResult = govOrgOpenFeignClient.get(houseInfo.getHomeId()); + if(!icHouseDTOResult.success()){ + continue ; + } + IcHouseDTO houseDto = icHouseDTOResult.getData(); + entity = new PowerKernelHouseholdEntity(); + entity.setHouseId(houseInfo.getHomeId()); + + if(!org.springframework.util.StringUtils.isEmpty(houseInfo.getBuildingLatitude()) && !org.springframework.util.StringUtils.isEmpty(houseInfo.getBuildingLongitude())){ + entity.setLatitude(new BigDecimal(houseInfo.getBuildingLatitude())); + entity.setLongitude(new BigDecimal(houseInfo.getBuildingLongitude())); + } else { + entity.setLatitude(BigDecimal.ZERO); + entity.setLongitude(BigDecimal.ZERO); + } + entity.setAddress(houseInfo.getAllName()); + entity.setCustomerId(loginUserUtil.getLoginUserCustomerId()); + + entity.setOwnerPhone(houseDto.getOwnerPhone()); + entity.setOwnerIdCard(houseDto.getOwnerIdCard()); + entity.setOwnerName(houseDto.getOwnerName()); + + entity.setStructReferenceId(form.getAxisStructId()); + powerKernelHouseholdService.insert(entity); + } + } + } \ No newline at end of file diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml index a43d55d..a7cdb97 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml @@ -33,6 +33,7 @@ STRUCT_REFERENCE_ID = #{id} + and ppal.customer_id = #{customerId} SELECT @@ -155,7 +160,7 @@ AGENCY_ID = #{agencyId} and CUSTOMER_ID = #{customerId} and CATEGORY_CODE = #{categoryCode} + + + diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructLeaderDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructLeaderDao.xml index 44c7a36..648c89e 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructLeaderDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructLeaderDao.xml @@ -31,6 +31,7 @@ LEFT JOIN pli_power_axis_struct_leader sl ON sl.LEADER_ID = l.ID WHERE sl.STRUCT_REFERENCE_ID = #{axisStructId} AND sl.DEL_FLAG = '0' AND l.DEL_FLAG = '0' + and l.customer_id = #{customerId} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml index 81620ed..d988167 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml @@ -28,6 +28,8 @@ pli_power_kernel_household WHERE STRUCT_REFERENCE_ID = #{axisStructId} + AND + customer_id = #{customerrId}