Merge branch 'dev_power_axis' into dev_contract

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerAxisLeaderDTO.java

@@ -4,6 +4,8 @@ import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 
 /**
  * 动力主轴领导人 
@@ -29,16 +31,19 @@ public class PowerAxisLeaderDTO implements Serializable {
     /**
      * 姓名
      */
+    @NotBlank(message = "姓名不能为空")
 	private String name;
 
     /**
      * 关联动力主轴ID
      */
+    @NotBlank(message = "绑定动力主轴不能为空")
 	private String structReferenceId;
 
     /**
      * 性别 1男2女0未知
      */
+    @NotBlank(message = "性别不能为空")
 	private String gender;
 
     /**

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisDataListPositionFormDTO.java

@@ -0,0 +1,17 @@
+package com.epmet.plugin.power.dto.axis.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class PowerAxisDataListPositionFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 832591628268584219L;
+
+    /**
+     * 组织id
+     */
+    private String agencyId;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelHouseFormDTO.java

@@ -2,8 +2,27 @@ package com.epmet.plugin.power.dto.axis.form;
 
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 绑定党员中心户（房屋）
+ *
+ * @author work@yujt.net.cn
+ * @date 2022/4/25/0025 16:48
+ */
 @Data
-public class PowerKernelHouseFormDTO {
+public class PowerKernelHouseFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3319310604730621237L;
+
+    /**
+     * 动力主轴节点ID
+     */
     private String axisStructId;
-    private String[] houseIdList;
+
+    /**
+     * 要绑定的房屋ID集合
+     */
+    private List<String> houseIdList;
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   pli-power-base-server:
     container_name: pli-power-base-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/pli-power-base-server:0.3.83
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/pli-power-base-server:version_placeholder
     ports:
       - "8201:8201"
     network_mode: host # 使用现有网络

epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml

@@ -226,8 +226,12 @@
                 <spring.datasource.druid.username>epmet_pli_power_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
+<!--                <spring.redis.index>0</spring.redis.index>-->
+<!--                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>-->
+<!--                <spring.redis.port>6379</spring.redis.port>-->
+<!--                <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>-->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java

@@ -101,9 +101,9 @@ public class PowerAxisDataVisualController {
      * @date 2022/4/23 10:19
      */
     @PostMapping("axis/{structLevel}/listPosition")
-    public ResultDTO getListPosition(@PathVariable int structLevel) {
+    public ResultDTO getListPosition(@PathVariable int structLevel,@RequestBody PowerAxisDataListPositionFormDTO form) {
-        List<PowerAxisListPositionResultDTO> list = powerAxisStructService.getListPosition(structLevel);
+        List<PowerAxisListPositionResultDTO> list = powerAxisStructService.getListPosition(structLevel,form);
-        return ResultDTO.success("成功", list, powerAxisStructService.queryTotal(structLevel));
+        return ResultDTO.success("成功", list, powerAxisStructService.queryTotal(structLevel,form));
     }
 
 

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java

@@ -75,9 +75,9 @@ public interface PowerAxisStructDao extends BaseDao<PowerAxisStructEntity> {
 
     List<String> getIdsByAgencyId(String agencyId, String customerId);
 
-    int queryGridParty(String agencyId,String customerId,String gridCateGoryCode);
+    int queryGridParty(@Param("agencyId") String agencyId,@Param("customerId") String customerId,@Param("gridCateGoryCode") String gridCateGoryCode);
 
-    int queryGroupParty(String agencyId,String customerId,String groupCateGoryCode);
+    int queryGroupParty(@Param("agencyId") String agencyId,@Param("customerId") String customerId,@Param("groupCateGoryCode") String groupCateGoryCode);
 
     int getKernelHouseHold(PowerAxisStructViewFormDTO form);
 
@@ -87,10 +87,10 @@ public interface PowerAxisStructDao extends BaseDao<PowerAxisStructEntity> {
 
     String queryCategoryCode(PowerAxisListPositionFormDTO form);
 
-    List<PowerAxisListPositionResultDTO> querylistPosition(String customerId, String code);
+    List<PowerAxisListPositionResultDTO> querylistPosition(@Param("customerId") String customerId,@Param("code") String code ,@Param("agencyId") String agencyId);
 
 
-    long queryTotal(String customerId, String code);
+    long queryTotal(@Param("customerId") String customerId,@Param("code") String code,@Param("agencyId") String agencyId);
 
     /**
      * 根据节点接报，组装其上级节点树

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructLeaderDao.java

@@ -36,12 +36,10 @@ public interface PowerAxisStructLeaderDao extends BaseDao<PowerAxisStructLeaderE
      *
      * @param customerId   客户ID
      * @param axisStructId 节点ID
-     * @param leaderId     负责人ID
      * @return void
      * @author work@yujt.net.cn
      * @date 2022/4/25/0025 9:16
      */
     void deleteStructLeader(@Param("customerId") String customerId,
-                            @Param("axisStructId") String axisStructId,
+                            @Param("axisStructId") String axisStructId);
-                            @Param("leaderId") String leaderId);
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java

@@ -1,7 +1,6 @@
 package com.epmet.plugin.power.modules.axis.dao;
 
 
-
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.plugin.power.dto.axis.form.PowerKernelHouseFormDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerKernelHouseHoldViewListFormDTO;
@@ -28,12 +27,23 @@ public interface PowerKernelHouseholdDao extends BaseDao<PowerKernelHouseholdEnt
 
     long getTotal(PowerKernelHouseHoldViewListFormDTO form);
 
-    List<PowerKernelListPostitionResultDTO> getListPosition(PowerKernelListPostitionFormDTO form,List<String> axisStructIds);
+    List<PowerKernelListPostitionResultDTO> getListPosition(PowerKernelListPostitionFormDTO form, List<String> axisStructIds);
 
     long getListTotal(PowerKernelListPostitionFormDTO form);
 
-
+    /**
-    List<String> queryHouseIdList(String[] houseIdList, String customerId,String axisStructId);
+     * 根据节点ID查询已绑定的房屋ID
+     *
+     * @param houseIdList  需要绑定的房屋ID
+     * @param customerId   客户ID
+     * @param axisStructId 动力主轴节点
+     * @return java.util.List<java.lang.String>
+     * @author work@yujt.net.cn
+     * @date 2022/4/25/0025 16:49
+     */
+    List<String> queryHouseIdList(@Param("houseIdList") List<String> houseIdList,
+                                  @Param("customerId") String customerId,
+                                  @Param("axisStructId") String axisStructId);
 
 
     List<String> queryIds(String customerId, String axisStructId);

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java

@@ -143,9 +143,9 @@ public interface PowerAxisStructService extends BaseService<PowerAxisStructEntit
      */
     List<PowerAxisStructTreeResultDTO> getStructTree(PowerAxisStructStructTreeFormDTO form);
 
-    List<PowerAxisListPositionResultDTO> getListPosition(int structLevel);
+    List<PowerAxisListPositionResultDTO> getListPosition(int structLevel,PowerAxisDataListPositionFormDTO form);
 
-    long queryTotal(int structLevel);
+    long queryTotal(int structLevel,PowerAxisDataListPositionFormDTO form);
 
     /**
      * 根据节点接报，组装其上级节点树

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisLeaderServiceImpl.java

@@ -1,6 +1,5 @@
 package com.epmet.plugin.power.modules.axis.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -15,7 +14,6 @@ import com.epmet.plugin.power.dto.axis.result.PowerAxisSimpleListDTO;
 import com.epmet.plugin.power.modules.axis.dao.PowerAxisLeaderDao;
 import com.epmet.plugin.power.modules.axis.dao.PowerAxisStructLeaderDao;
 import com.epmet.plugin.power.modules.axis.entity.PowerAxisLeaderEntity;
-import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructEntity;
 import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructLeaderEntity;
 import com.epmet.plugin.power.modules.axis.service.PowerAxisLeaderService;
 import org.apache.commons.lang3.StringUtils;
@@ -93,9 +91,7 @@ public class PowerAxisLeaderServiceImpl extends BaseServiceImpl<PowerAxisLeaderD
         boolean i = updateById(entity);
         if (i) {
             // 关联表，先删除（by structReferenceId）,再插入
-            powerAxisStructLeaderDao.deleteStructLeader(
+            powerAxisStructLeaderDao.deleteStructLeader(dto.getCustomerId(), dto.getStructReferenceId());
-                    dto.getCustomerId(), dto.getStructReferenceId(), dto.getId()
-            );
             addStructLeaderRelation(
                     dto.getCustomerId(), dto.getStructReferenceId(), entity.getId(), dto.getCategoryCode()
             );

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructLeaderServiceImpl.java

@@ -120,7 +120,7 @@ public class PowerAxisStructLeaderServiceImpl extends BaseServiceImpl<PowerAxisS
 
             LambdaQueryWrapper<PowerAxisStructEntity> lqw = new LambdaQueryWrapper<>();
             lqw.eq(PowerAxisStructEntity::getCustomerId, customerId)
-                    .eq(PowerAxisStructEntity::getPid, axisStructId)
+                    .eq(PowerAxisStructEntity::getId, axisStructId)
                     .eq(PowerAxisStructEntity::getDelFlag, EpmetDelFlagEnum.NORMAL.value());
 
             PowerAxisStructEntity axisStructEntity = powerAxisStructDao.selectOne(lqw);
@@ -138,10 +138,10 @@ public class PowerAxisStructLeaderServiceImpl extends BaseServiceImpl<PowerAxisS
 
     @Override
     public void bindAxisStructLeader(TokenDto tokenDto, StructLeaderBindFormDTO formDto) {
-        baseDao.deleteStructLeader(formDto.getCustomerId(), formDto.getAxisStructId(), formDto.getLeaderId());
+        baseDao.deleteStructLeader(loginUserUtil.getLoginUserCustomerId(), formDto.getAxisStructId());
 
         PowerAxisStructLeaderEntity structLeader = new PowerAxisStructLeaderEntity();
-        structLeader.setCustomerId(formDto.getCustomerId());
+        structLeader.setCustomerId(loginUserUtil.getLoginUserCustomerId());
         structLeader.setLeaderId(formDto.getLeaderId());
         structLeader.setStructReferenceId(formDto.getAxisStructId());
         structLeader.setCategoryCode(formDto.getCategoryCode());

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java

@@ -230,58 +230,22 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
         form.setCustomerId(loginUserUtil.getLoginUserCustomerId());
 
         // 查网格党支部数 grid_party
-        String gridCateGoryCode = baseDao.getCateGoryCode(form.getCustomerId(),PowerTagLevelEnum.CHILD_FIRST.level(),PowerTagCategoryEnum.STRUCT.category());
+        String gridCateGoryCode = baseDao.getCateGoryCode(form.getCustomerId(), PowerTagLevelEnum.CHILD_FIRST.level(), PowerTagCategoryEnum.STRUCT.category());
-        int gridParty = baseDao.queryGridParty(form.getAgencyId(),form.getCustomerId(),gridCateGoryCode);
+        int gridParty = baseDao.queryGridParty(form.getAgencyId(), form.getCustomerId(), gridCateGoryCode);
 
         // 查楼院党小组数 group_party
-        String groupCateGoryCode = baseDao.getCateGoryCode(form.getCustomerId(),PowerTagLevelEnum.CHILD_SECOND.level(),PowerTagCategoryEnum.STRUCT.category());
+        String groupCateGoryCode = baseDao.getCateGoryCode(form.getCustomerId(), PowerTagLevelEnum.CHILD_SECOND.level(), PowerTagCategoryEnum.STRUCT.category());
-        int groupParty = baseDao.queryGroupParty(form.getAgencyId(),form.getCustomerId(),groupCateGoryCode);
+        int groupParty = baseDao.queryGroupParty(form.getAgencyId(), form.getCustomerId(), groupCateGoryCode);
-        // 查询党员数
-        int partyNum = 0;
         // 查询党员中心户数
         int kernelHouseHold = baseDao.getKernelHouseHold(form);
         // 查询服务站数
         int serviceStation = baseDao.getServiceStation(form);
-        // 查询志愿者队伍数
-        int volunteerTeamNum = 0;
 
         PowerAxisStructViewResultDTO result = new PowerAxisStructViewResultDTO();
         result.setGridNum(gridParty);
         result.setGroupNum(groupParty);
-        result.setPartyMemberNum(partyNum);
         result.setKernelHouseHoldNum(kernelHouseHold);
         result.setServiceStationNum(serviceStation);
-        result.setVolunteerTeamNum(volunteerTeamNum);
-
-
-        List<PowerAxisTagCategoryResultDTO> tagList = powerAxisTagService.listSimple(PowerTagCategoryEnum.PARAM.category(), loginUserUtil.getLoginUserCustomerId());
-        tagList.forEach(
-                item -> {
-                    int numTemp;
-                    switch (item.getCategoryCode()) {
-                        case "volunteerTeamNum":
-                            numTemp = Integer.parseInt(item.getCategoryName());
-                            if (numTemp > NumConstant.ZERO) {
-                                result.setVolunteerTeamNum(numTemp);
-                            }
-                            break;
-                        case "partyMemberNum":
-                            numTemp = Integer.parseInt(item.getCategoryName());
-                            if (numTemp > NumConstant.ZERO) {
-                                result.setPartyMemberNum(numTemp);
-                            }
-                            break;
-                        case "kernelHouseHoldNum":
-                            numTemp = Integer.parseInt(item.getCategoryName());
-                            if (numTemp > NumConstant.ZERO) {
-                                result.setKernelHouseHoldNum(numTemp);
-                            }
-                            break;
-                        default:
-                            break;
-                    }
-                }
-        );
 
         return result;
     }
@@ -294,26 +258,26 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
     }
 
     @Override
-    public List<PowerAxisListPositionResultDTO> getListPosition(int structLevel) {
+    public List<PowerAxisListPositionResultDTO> getListPosition(int structLevel,PowerAxisDataListPositionFormDTO form) {
-        PowerAxisListPositionFormDTO form = new PowerAxisListPositionFormDTO();
+        PowerAxisListPositionFormDTO dto = new PowerAxisListPositionFormDTO();
         String customerId = loginUserUtil.getLoginUserCustomerId();
-        form.setCustomerId(customerId);
+        dto.setCustomerId(customerId);
-        form.setStructLevel(structLevel);
+        dto.setStructLevel(structLevel);
-        form.setTagCategory(PowerTagCategoryEnum.STRUCT.category());
+        dto.setTagCategory(PowerTagCategoryEnum.STRUCT.category());
-        String code = baseDao.queryCategoryCode(form);
+        String code = baseDao.queryCategoryCode(dto);
-        List<PowerAxisListPositionResultDTO> list = baseDao.querylistPosition(customerId, code);
+        List<PowerAxisListPositionResultDTO> list = baseDao.querylistPosition(customerId, code ,form.getAgencyId());
         return list;
     }
 
     @Override
-    public long queryTotal(int structLevel) {
+    public long queryTotal(int structLevel,PowerAxisDataListPositionFormDTO form) {
-        PowerAxisListPositionFormDTO form = new PowerAxisListPositionFormDTO();
+        PowerAxisListPositionFormDTO dto = new PowerAxisListPositionFormDTO();
         String customerId = loginUserUtil.getLoginUserCustomerId();
-        form.setCustomerId(customerId);
+        dto.setCustomerId(customerId);
-        form.setStructLevel(structLevel);
+        dto.setStructLevel(structLevel);
-        form.setTagCategory(PowerTagCategoryEnum.STRUCT.category());
+        dto.setTagCategory(PowerTagCategoryEnum.STRUCT.category());
-        String code = baseDao.queryCategoryCode(form);
+        String code = baseDao.queryCategoryCode(dto);
-        long total = baseDao.queryTotal(customerId, code);
+        long total = baseDao.queryTotal(customerId, code, form.getAgencyId());
         return total;
     }
 

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java

@@ -1,13 +1,11 @@
 package com.epmet.plugin.power.modules.axis.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 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.constant.FieldConstant;
-import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.exception.EpmetErrorCode;
-import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -21,13 +19,10 @@ import com.epmet.plugin.power.dto.axis.form.PowerKernelHouseHoldViewListFormDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerKernelListPostitionFormDTO;
 import com.epmet.plugin.power.dto.axis.result.PowerKernelHouseHoldViewListResultDTO;
 import com.epmet.plugin.power.dto.axis.result.PowerKernelListPostitionResultDTO;
-import com.epmet.plugin.power.enums.PowerTagCategoryEnum;
 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.PowerAxisTagService;
 import com.epmet.plugin.power.modules.axis.service.PowerKernelHouseholdService;
-import org.apache.commons.compress.utils.Lists;
+import com.google.common.collect.Sets;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -45,9 +40,6 @@ import java.util.*;
 @Service
 public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl<PowerKernelHouseholdDao, PowerKernelHouseholdEntity> implements PowerKernelHouseholdService {
 
-    @Autowired
-    private PowerKernelHouseholdRedis powerKernelHouseholdRedis;
-
     @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
 
@@ -57,9 +49,6 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl<PowerKernel
     @Autowired
     private PowerKernelHouseholdService powerKernelHouseholdService;
 
-    @Autowired
-    private PowerAxisTagService powerAxisTagService;
-
     @Override
     public PageData<PowerKernelHouseholdDTO> page(Map<String, Object> params) {
         IPage<PowerKernelHouseholdEntity> page = baseDao.selectPage(
@@ -135,7 +124,7 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl<PowerKernel
 
     @Override
     public List<PowerKernelListPostitionResultDTO> getListPosition(PowerKernelListPostitionFormDTO form) {
-        return baseDao.queryListPosition(form.getAxisStructId(),form.getCustomerId(),form.getLimit());
+        return baseDao.queryListPosition(form.getAxisStructId(), form.getCustomerId(), form.getLimit());
     }
 
 
@@ -148,29 +137,33 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl<PowerKernel
     @Override
     public void bind(PowerKernelHouseFormDTO form) {
         String customerId = loginUserUtil.getLoginUserCustomerId();
-
+        // 需要绑定的房屋ID集合
-        // 查询出重复的houseId
+        List<String> houseIdList = form.getHouseIdList();
-        List<String> idList = baseDao.queryHouseIdList(form.getHouseIdList(), form.getAxisStructId(), customerId);
+        // 查询已绑定的houseId集合
-        // 将idList转换为Set集合进行去重
+        List<String> existHouseIdList = baseDao.queryHouseIdList(houseIdList, customerId, form.getAxisStructId());
-        Set<String> setIdList = new HashSet<>();
+        // 倒序，取差集
-        for (String id : idList) {
+        for (int i = houseIdList.size() - 1; i >= 0; i--) {
-            setIdList.add(id);
+            if (existHouseIdList.contains(houseIdList.get(i))) {
+                houseIdList.remove(i);
+            }
         }
-        // 将前端发送的houseId放入Set集合
-        Set<String> houseIds = new HashSet<>();
-        Collections.addAll(houseIds, form.getHouseIdList());
-        // 去重
-        houseIds.removeAll(setIdList);
 
-        Result<List<HouseInfoDTO>> listResult = govOrgOpenFeignClient.queryListHouseInfo(houseIds, customerId);
+        if (CollUtil.isEmpty(houseIdList)) {
+            return;
+        }
+        // 查询房屋信息
+        Result<List<HouseInfoDTO>> listResult = govOrgOpenFeignClient.queryListHouseInfo(Sets.newHashSet(houseIdList), customerId);
         if (!listResult.success()) {
             return;
         }
         List<HouseInfoDTO> houseList = listResult.getData();
         PowerKernelHouseholdEntity entity;
 
+        Result<IcHouseDTO> icHouseDTOResult;
         for (HouseInfoDTO houseInfo : houseList) {
-            Result<IcHouseDTO> icHouseDTOResult = govOrgOpenFeignClient.get(houseInfo.getHomeId());
+
+            // 查询房屋与房主信息
+            icHouseDTOResult = govOrgOpenFeignClient.get(houseInfo.getHomeId());
             if (!icHouseDTOResult.success()) {
                 continue;
             }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/db/migration/V0.0.1__demo.sql

@@ -0,0 +1 @@
+select 0;

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml

@@ -47,10 +47,10 @@
             l.MOBILE as LEADER_MOBILE,
             t.STRUCT_LEVEL
         from pli_power_axis_struct s
-        left join pli_power_axis_struct_leader sl on s.ID = sl.STRUCT_REFERENCE_ID
+        left join pli_power_axis_struct_leader sl on s.ID = sl.STRUCT_REFERENCE_ID and sl.del_flag = '0'
-        left join pli_power_axis_leader l on l.ID = sl.LEADER_ID
+        left join pli_power_axis_leader l on l.ID = sl.LEADER_ID and l.del_flag = '0'
-        left join pli_power_axis_tag t on s.CATEGORY_CODE = t.CATEGORY_CODE
+        left join pli_power_axis_tag t on s.CATEGORY_CODE = t.CATEGORY_CODE and t.DEL_FLAG = '0'
-        where s.DEL_FLAG = '0' and sl.del_flag = '0' and l.del_flag = '0'
+        where s.DEL_FLAG = '0'
         <if test="agencyId != null and agencyId != ''">
             and s.AGENCY_ID = #{agencyId}
         </if>
@@ -159,12 +159,12 @@
             leader.NAME AS leaderName
         FROM
             pli_power_axis_struct AS struct
-            LEFT JOIN pli_power_axis_struct_leader AS sl ON struct.id = sl.STRUCT_REFERENCE_ID
+            LEFT JOIN pli_power_axis_struct_leader AS sl ON struct.id = sl.STRUCT_REFERENCE_ID and sl.DEL_FLAG = '0'
-            LEFT JOIN pli_power_axis_leader AS leader ON sl.LEADER_ID = leader.id
+            LEFT JOIN pli_power_axis_leader AS leader ON sl.LEADER_ID = leader.id and leader.DEL_FLAG = '0'
         WHERE
-	        struct.agency_id = #{agencyId}
+            struct.DEL_FLAG = '0'
-	    AND
+	    AND struct.agency_id = #{agencyId}
-	        struct.customer_id = #{customerId}
+	    AND struct.customer_id = #{customerId}
     </select>
     <select id="queryCategoryCode" resultType="java.lang.String">
         SELECT
@@ -191,6 +191,8 @@
 	            CUSTOMER_ID = #{customerId}
 	        and
 	            CATEGORY_CODE = #{code}
+	        and
+	            AGENCY_ID = #{agencyId}
     </select>
     <select id="queryTotal" resultType="java.lang.Long">
         select
@@ -201,6 +203,8 @@
 	        CUSTOMER_ID = #{customerId}
 	    AND
 	        CATEGORY_CODE = #{code}
+	    and
+	        AGENCY_ID = #{agencyId}
     </select>
     <select id="listParentTreeByLevel"
             resultType="com.epmet.plugin.power.dto.axis.result.PowerAxisStructTreeResultDTO">

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructLeaderDao.xml

@@ -17,7 +17,7 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
     <delete id="deleteStructLeader">
-        delete from pli_power_axis_struct_leader where CUSTOMER_ID = #{customerId} and STRUCT_REFERENCE_ID = #{axisStructId} and LEADER_ID = #{leaderId}
+        delete from pli_power_axis_struct_leader where CUSTOMER_ID = #{customerId} and STRUCT_REFERENCE_ID = #{axisStructId}
     </delete>
     <select id="queryLeaderDetailById"
             resultType="com.epmet.plugin.power.dto.axis.result.PowerAxisSLeaderResultDTO">

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml

@@ -90,20 +90,20 @@
     </select>
     <select id="queryHouseIdList" resultType="java.lang.String">
         SELECT
-            HOUSE_ID
+            distinct HOUSE_ID
         FROM
 	        pli_power_kernel_household
 	    <where>
-            house_id in
+            del_flag = '0'
-            <foreach collection="houseIdList" item="houseId" open="(" close=")" separator=",">
+            AND customer_id = #{customerId}
-                #{houseId}
+            <if test="houseIdList != null and houseIdList.size() > 0">
-            </foreach>
+              and house_id in
+                <foreach collection="houseIdList" item="houseId" open="(" close=")" separator=",">
+                    #{houseId}
+                </foreach>
+            </if>
             AND
                 STRUCT_REFERENCE_ID = #{axisStructId}
-            AND
-                customer_id = #{customerId}
-            AND
-                del_flag = '0'
         </where>
     </select>
     <select id="queryIds" resultType="java.lang.String">