diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerAxisLeaderDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerAxisLeaderDTO.java index 159d00f..b33b8cd 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerAxisLeaderDTO.java +++ b/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; /** diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisDataListPositionFormDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisDataListPositionFormDTO.java new file mode 100644 index 0000000..64289a6 --- /dev/null +++ b/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; + +} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelHouseFormDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelHouseFormDTO.java index 907b360..20104c3 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelHouseFormDTO.java +++ b/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 houseIdList; } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/deploy/docker-compose-prod.yml b/epmet-plugins-module/pli-power-base/pli-power-base-server/deploy/docker-compose-prod.yml index da64eaf..5f186d8 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/deploy/docker-compose-prod.yml +++ b/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 # 使用现有网络 diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml index 0009c57..eb336a1 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml @@ -226,8 +226,12 @@ epmet_pli_power_user EpmEt-db-UsEr + + + + 0 - r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com + 192.168.10.150 6379 EpmEtrEdIs!q@w diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java index 7841605..a05c49f 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java +++ b/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) { - List list = powerAxisStructService.getListPosition(structLevel); - return ResultDTO.success("成功", list, powerAxisStructService.queryTotal(structLevel)); + public ResultDTO getListPosition(@PathVariable int structLevel,@RequestBody PowerAxisDataListPositionFormDTO form) { + List list = powerAxisStructService.getListPosition(structLevel,form); + return ResultDTO.success("成功", list, powerAxisStructService.queryTotal(structLevel,form)); } 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 e81be15..3146d03 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 @@ -75,9 +75,9 @@ public interface PowerAxisStructDao extends BaseDao { List 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 { String queryCategoryCode(PowerAxisListPositionFormDTO form); - List querylistPosition(String customerId, String code); + List 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); /** * 根据节点接报，组装其上级节点树 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 db7c98a..2311760 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 @@ -36,12 +36,10 @@ public interface PowerAxisStructLeaderDao extends BaseDao getListPosition(PowerKernelListPostitionFormDTO form,List axisStructIds); + List getListPosition(PowerKernelListPostitionFormDTO form, List axisStructIds); long getListTotal(PowerKernelListPostitionFormDTO form); - - List queryHouseIdList(String[] houseIdList, String customerId,String axisStructId); + /** + * 根据节点ID查询已绑定的房屋ID + * + * @param houseIdList 需要绑定的房屋ID + * @param customerId 客户ID + * @param axisStructId 动力主轴节点 + * @return java.util.List + * @author work@yujt.net.cn + * @date 2022/4/25/0025 16:49 + */ + List queryHouseIdList(@Param("houseIdList") List houseIdList, + @Param("customerId") String customerId, + @Param("axisStructId") String axisStructId); List queryIds(String customerId, String axisStructId); 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 84d2489..0c7771d 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 @@ -143,9 +143,9 @@ public interface PowerAxisStructService extends BaseService getStructTree(PowerAxisStructStructTreeFormDTO form); - List getListPosition(int structLevel); + List getListPosition(int structLevel,PowerAxisDataListPositionFormDTO form); - long queryTotal(int structLevel); + long queryTotal(int structLevel,PowerAxisDataListPositionFormDTO 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/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 70b91c6..dfc8564 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 @@ -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 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 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 getListPosition(int structLevel) { - PowerAxisListPositionFormDTO form = new PowerAxisListPositionFormDTO(); + public List getListPosition(int structLevel,PowerAxisDataListPositionFormDTO form) { + PowerAxisListPositionFormDTO dto = 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); + dto.setCustomerId(customerId); + dto.setStructLevel(structLevel); + dto.setTagCategory(PowerTagCategoryEnum.STRUCT.category()); + String code = baseDao.queryCategoryCode(dto); + List list = baseDao.querylistPosition(customerId, code ,form.getAgencyId()); return list; } @Override - public long queryTotal(int structLevel) { - PowerAxisListPositionFormDTO form = new PowerAxisListPositionFormDTO(); + public long queryTotal(int structLevel,PowerAxisDataListPositionFormDTO form) { + PowerAxisListPositionFormDTO dto = 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); + dto.setCustomerId(customerId); + dto.setStructLevel(structLevel); + dto.setTagCategory(PowerTagCategoryEnum.STRUCT.category()); + String code = baseDao.queryCategoryCode(dto); + long total = baseDao.queryTotal(customerId, code, form.getAgencyId()); return total; } 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 ec2a1e2..6bb4233 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 @@ -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 implements PowerKernelHouseholdService { - @Autowired - private PowerKernelHouseholdRedis powerKernelHouseholdRedis; - @Autowired private GovOrgOpenFeignClient govOrgOpenFeignClient; @@ -57,9 +49,6 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -135,7 +124,7 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl 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 idList = baseDao.queryHouseIdList(form.getHouseIdList(), form.getAxisStructId(), customerId); - // 将idList转换为Set集合进行去重 - Set setIdList = new HashSet<>(); - for (String id : idList) { - setIdList.add(id); + // 需要绑定的房屋ID集合 + List houseIdList = form.getHouseIdList(); + // 查询已绑定的houseId集合 + List existHouseIdList = baseDao.queryHouseIdList(houseIdList, customerId, form.getAxisStructId()); + // 倒序，取差集 + for (int i = houseIdList.size() - 1; i >= 0; i--) { + if (existHouseIdList.contains(houseIdList.get(i))) { + houseIdList.remove(i); + } } - // 将前端发送的houseId放入Set集合 - Set houseIds = new HashSet<>(); - Collections.addAll(houseIds, form.getHouseIdList()); - // 去重 - houseIds.removeAll(setIdList); - Result> listResult = govOrgOpenFeignClient.queryListHouseInfo(houseIds, customerId); + if (CollUtil.isEmpty(houseIdList)) { + return; + } + // 查询房屋信息 + Result> listResult = govOrgOpenFeignClient.queryListHouseInfo(Sets.newHashSet(houseIdList), customerId); if (!listResult.success()) { return; } List houseList = listResult.getData(); PowerKernelHouseholdEntity entity; + Result icHouseDTOResult; for (HouseInfoDTO houseInfo : houseList) { - Result icHouseDTOResult = govOrgOpenFeignClient.get(houseInfo.getHomeId()); + + // 查询房屋与房主信息 + icHouseDTOResult = govOrgOpenFeignClient.get(houseInfo.getHomeId()); if (!icHouseDTOResult.success()) { continue; } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/db/migration/V0.0.1__demo.sql b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/db/migration/V0.0.1__demo.sql new file mode 100644 index 0000000..7a51a3f --- /dev/null +++ b/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; \ No newline at end of file diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml index 9e1f729..d3347a8 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml +++ b/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_leader l on l.ID = sl.LEADER_ID - left join pli_power_axis_tag t on s.CATEGORY_CODE = t.CATEGORY_CODE - where s.DEL_FLAG = '0' and sl.del_flag = '0' and l.del_flag = '0' + 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 and l.del_flag = '0' + 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 s.AGENCY_ID = #{agencyId} @@ -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_leader AS leader ON sl.LEADER_ID = leader.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 and leader.DEL_FLAG = '0' WHERE - struct.agency_id = #{agencyId} - AND - struct.customer_id = #{customerId} + struct.DEL_FLAG = '0' + AND struct.agency_id = #{agencyId} + AND struct.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 0c08a74..e57ce77 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 @@ -90,20 +90,20 @@