From 0375529ac432852eb1c1b1776585834ba74e72b2 Mon Sep 17 00:00:00 2001 From: HAHA Date: Thu, 21 Apr 2022 10:37:01 +0800 Subject: [PATCH] =?UTF-8?q?message:=20=E6=96=B0=E5=A2=9E=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E6=9F=A5=E8=AF=A2=E8=8A=82=E7=82=B9=E8=B4=9F?= =?UTF-8?q?=E8=B4=A3=E4=BA=BA=EF=BC=8C=E6=9F=A5=E8=AF=A2=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=88=97=E8=A1=A8=EF=BC=8C=E6=8C=89?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E7=B1=BB=E5=9E=8B=E8=8E=B7=E5=8F=96=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...erAxisStructListByCategoryCodeFormDTO.java | 9 ++++ ...owerAixsStructListByCategoryResultDTO.java | 9 ++++ .../result/PowerAxisSLeaderResultDTO.java | 12 ++++++ .../axis/result/PowerAxisSimpleListDTO.java | 10 +++++ .../controller/PowerAxisLeaderController.java | 31 +++++++++++++- .../controller/PowerAxisStructController.java | 22 ++++++++++ .../PowerKernelHouseholdController.java | 1 - .../modules/axis/dao/PowerAxisLeaderDao.java | 9 +++- .../modules/axis/dao/PowerAxisStructDao.java | 8 ++++ .../axis/dao/PowerAxisStructLeaderDao.java | 6 ++- .../axis/entity/PowerAxisStructEntity.java | 11 +++++ .../axis/service/PowerAxisLeaderService.java | 6 +++ .../service/PowerAxisStructLeaderService.java | 6 +++ .../axis/service/PowerAxisStructService.java | 10 +++++ .../impl/PowerAxisLeaderServiceImpl.java | 34 ++++++++++++++- .../PowerAxisStructLeaderServiceImpl.java | 7 ++++ .../impl/PowerAxisStructServiceImpl.java | 41 +++++++++++++++++-- .../mapper/poweraxis/PowerAxisLeaderDao.xml | 17 ++++++++ .../mapper/poweraxis/PowerAxisStructDao.xml | 33 +++++++++++++++ .../poweraxis/PowerAxisStructLeaderDao.xml | 19 +++++++++ 20 files changed, 292 insertions(+), 9 deletions(-) create mode 100644 epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructListByCategoryCodeFormDTO.java create mode 100644 epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAixsStructListByCategoryResultDTO.java create mode 100644 epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisSLeaderResultDTO.java create mode 100644 epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisSimpleListDTO.java 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 new file mode 100644 index 0000000..3123ec9 --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructListByCategoryCodeFormDTO.java @@ -0,0 +1,9 @@ +package com.epmet.plugin.power.dto.axis.form; + +import lombok.Data; + +@Data +public class PowerAxisStructListByCategoryCodeFormDTO { + private String agencyId; + private String categoryCode; +} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAixsStructListByCategoryResultDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAixsStructListByCategoryResultDTO.java new file mode 100644 index 0000000..cf07606 --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAixsStructListByCategoryResultDTO.java @@ -0,0 +1,9 @@ +package com.epmet.plugin.power.dto.axis.result; + +import lombok.Data; + +@Data +public class PowerAixsStructListByCategoryResultDTO { + private String id; + private String name; +} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisSLeaderResultDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisSLeaderResultDTO.java new file mode 100644 index 0000000..fe677d4 --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisSLeaderResultDTO.java @@ -0,0 +1,12 @@ +package com.epmet.plugin.power.dto.axis.result; + +import lombok.Data; + +@Data +public class PowerAxisSLeaderResultDTO { + private String name; + private String gender; + private String mobile; + private String interoduction; + private String avatar; +} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisSimpleListDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisSimpleListDTO.java new file mode 100644 index 0000000..58ae108 --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisSimpleListDTO.java @@ -0,0 +1,10 @@ +package com.epmet.plugin.power.dto.axis.result; + +import lombok.Data; + +@Data +public class PowerAxisSimpleListDTO { + private String id; + private String name; + private String mobile; +} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisLeaderController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisLeaderController.java index 9018c96..63c27e3 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisLeaderController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisLeaderController.java @@ -10,8 +10,14 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.plugin.power.dto.axis.PowerAxisLeaderDTO; +import com.epmet.plugin.power.dto.axis.form.PowerAxisStructLeaderFormDTO; +import com.epmet.plugin.power.dto.axis.result.PowerAxisSLeaderResultDTO; +import com.epmet.plugin.power.dto.axis.result.PowerAxisSimpleListDTO; +import com.epmet.plugin.power.modules.axis.dao.PowerAxisStructLeaderDao; import com.epmet.plugin.power.modules.axis.excel.PowerAxisLeaderExcel; import com.epmet.plugin.power.modules.axis.service.PowerAxisLeaderService; +import com.epmet.plugin.power.modules.axis.service.PowerAxisStructLeaderService; +import com.epmet.plugin.power.modules.axis.service.PowerAxisStructService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -33,6 +39,12 @@ public class PowerAxisLeaderController { @Autowired private PowerAxisLeaderService powerAxisLeaderService; + @Autowired + private PowerAxisStructLeaderService powerAxisStructLeaderService; + + @Autowired + private PowerAxisStructService powerAxisStructService; + @RequestMapping("page") public Result> page(@RequestParam Map params){ PageData page = powerAxisLeaderService.page(params); @@ -77,6 +89,23 @@ public class PowerAxisLeaderController { ExcelUtils.exportExcelToTarget(response, null, list, PowerAxisLeaderExcel.class); } - + /** + * 查询节点负责人信息 + */ + @PostMapping("/getLeaderDetail/{axisStructId}") + public Result getLeaderDetail(@PathVariable String axisStructId){ + PowerAxisSLeaderResultDTO dto = powerAxisStructLeaderService.queryLeaderDetailById(axisStructId); + return new Result().ok(dto); + } + + /** + * 查询节点负责人列表 + */ + @PostMapping("/listSimpleByAgency") + public Result getListSimpleByAgency(@RequestBody String agencyId){ + List ids = powerAxisStructService.getIdByAgencyId(agencyId); + List list = powerAxisLeaderService.getSimpleList(ids); + return new Result().ok(list); + } } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java index 645fd6d..da94724 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java @@ -15,6 +15,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.plugin.power.dto.axis.PowerAxisStructDTO; import com.epmet.plugin.power.dto.axis.form.PowerAxisStructLeaderFormDTO; +import com.epmet.plugin.power.dto.axis.form.PowerAxisStructListByCategoryCodeFormDTO; import com.epmet.plugin.power.dto.axis.result.*; import com.epmet.plugin.power.dto.axis.form.PowerAxisStructAddFormDTO; import com.epmet.plugin.power.dto.axis.form.PowerAxisStructFormDTO; @@ -122,6 +123,12 @@ public class PowerAxisStructController { @PostMapping("/addOrg") public Result addOrg(@RequestBody PowerAxisStructEntity form){ int i = powerAxisStructService.addOrg(form); + if(i == -1){ + return new Result().error(1,"名字重复"); + } + if(i == -2){ + return new Result().error(1,"同一组织下只允许存在一个党委"); + } return new Result(); } /** @@ -133,6 +140,12 @@ public class PowerAxisStructController { if(i == 0){ return new Result().error(1,"不能所属自己"); } + if(i == -2){ + return new Result().error(1,"同一组织下只允许存在一个党委"); + } + if(i == -3){ + return new Result().error(1,"名字重复"); + } return new Result(); } @@ -179,4 +192,13 @@ public class PowerAxisStructController { return new Result().ok(power); } + /** + * 按节点类型获取节点列表 + */ + @PostMapping("/listByCategoryCode") + public Result getListByCategoryCode(@RequestBody PowerAxisStructListByCategoryCodeFormDTO form){ + List dto = powerAxisStructService.getListByCategoryCode(form); + return new Result().ok(dto); + } + } 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 78a1925..a895147 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 @@ -79,5 +79,4 @@ public class PowerKernelHouseholdController { } - } 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 345947a..b8b2a53 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 @@ -1,9 +1,14 @@ package com.epmet.plugin.power.modules.axis.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.plugin.power.dto.axis.PowerAxisLeaderDTO; +import com.epmet.plugin.power.dto.axis.result.PowerAxisSimpleListDTO; import com.epmet.plugin.power.modules.axis.entity.PowerAxisLeaderEntity; +import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructLeaderEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 动力主轴领导人 * @@ -12,5 +17,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PowerAxisLeaderDao extends BaseDao { - + + + List getSimpleList(List ids); } \ 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 c6c3353..dbc94e2 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 @@ -5,6 +5,7 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.plugin.power.dto.axis.PowerAxisStructDTO; import com.epmet.plugin.power.dto.axis.form.PowerAxisStructAddFormDTO; import com.epmet.plugin.power.dto.axis.form.PowerAxisStructFormDTO; +import com.epmet.plugin.power.dto.axis.form.PowerAxisStructListByCategoryCodeFormDTO; import com.epmet.plugin.power.dto.axis.result.*; import com.epmet.plugin.power.dto.axis.form.PowerAxisStructLeaderFormDTO; import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructEntity; @@ -62,4 +63,11 @@ public interface PowerAxisStructDao extends BaseDao { List getPartyCommList(); + int queryName(PowerAxisStructEntity form); + + int queryCategory(PowerAxisStructEntity form); + + List getIdsByAgencyId(String agencyId); + + List getListByCategoryCode(PowerAxisStructListByCategoryCodeFormDTO 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/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 607d8fd..e57ddaa 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 @@ -1,6 +1,7 @@ package com.epmet.plugin.power.modules.axis.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.plugin.power.dto.axis.result.PowerAxisSLeaderResultDTO; import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructLeaderEntity; import org.apache.ibatis.annotations.Mapper; @@ -12,5 +13,8 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PowerAxisStructLeaderDao extends BaseDao { - + + String queryId(PowerAxisStructLeaderEntity leaderEntity); + + PowerAxisSLeaderResultDTO queryLeaderDetailById(String axisStructId); } \ 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/entity/PowerAxisStructEntity.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisStructEntity.java index 1b209cd..a411bc1 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisStructEntity.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisStructEntity.java @@ -7,6 +7,7 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; import java.util.Date; /** @@ -67,4 +68,14 @@ public class PowerAxisStructEntity extends BaseEpmetEntity { */ private Integer sort; + /** + * 经度 + */ + private BigDecimal longitude; + + /** + * 纬度 + */ + private BigDecimal latitude; + } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisLeaderService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisLeaderService.java index b5aeb6f..dbf1611 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisLeaderService.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisLeaderService.java @@ -3,6 +3,7 @@ package com.epmet.plugin.power.modules.axis.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.plugin.power.dto.axis.PowerAxisLeaderDTO; +import com.epmet.plugin.power.dto.axis.result.PowerAxisSimpleListDTO; import com.epmet.plugin.power.modules.axis.entity.PowerAxisLeaderEntity; import java.util.List; @@ -75,4 +76,9 @@ public interface PowerAxisLeaderService extends BaseService getSimpleList(List ids); } \ 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/PowerAxisStructLeaderService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructLeaderService.java index 4d9e8ef..46e3f1b 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructLeaderService.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructLeaderService.java @@ -3,6 +3,7 @@ package com.epmet.plugin.power.modules.axis.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.plugin.power.dto.axis.PowerAxisStructLeaderDTO; +import com.epmet.plugin.power.dto.axis.result.PowerAxisSLeaderResultDTO; import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructLeaderEntity; import java.util.List; @@ -75,4 +76,9 @@ public interface PowerAxisStructLeaderService extends BaseService getIdByAgencyId(String agencyId); + + /** + * 按节点类型获取节点列表 + */ + List getListByCategoryCode(PowerAxisStructListByCategoryCodeFormDTO 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 ddbbe82..b982f94 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 @@ -7,13 +7,18 @@ import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.plugin.power.dto.axis.PowerAxisLeaderDTO; +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.PowerAxisStructLeaderEntity; import com.epmet.plugin.power.modules.axis.service.PowerAxisLeaderService; 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 javax.annotation.Resource; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -27,6 +32,8 @@ import java.util.Map; @Service public class PowerAxisLeaderServiceImpl extends BaseServiceImpl implements PowerAxisLeaderService { + @Resource + PowerAxisStructLeaderDao powerAxisStructLeaderDao; @Override public PageData page(Map params) { @@ -63,14 +70,30 @@ public class PowerAxisLeaderServiceImpl extends BaseServiceImpl getSimpleList(List ids) { + List list = baseDao.getSimpleList(ids); + return list; + } + + } \ 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/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 faece10..61d6f2c 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 @@ -6,6 +6,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.plugin.power.dto.axis.result.PowerAxisSLeaderResultDTO; import com.epmet.plugin.power.modules.axis.dao.PowerAxisStructLeaderDao; import com.epmet.plugin.power.dto.axis.PowerAxisStructLeaderDTO; import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructLeaderEntity; @@ -82,4 +83,10 @@ public class PowerAxisStructLeaderServiceImpl extends BaseServiceImpl getIdByAgencyId(String agencyId) { + List ids = baseDao.getIdsByAgencyId(agencyId); + return ids; + } + + /** + * 按节点类型获取节点列表 + */ + @Override + public List getListByCategoryCode(PowerAxisStructListByCategoryCodeFormDTO form) { + List dto = baseDao.getListByCategoryCode(form); + return dto; + } + } \ 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 269d1b5..4c190dc 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 @@ -18,6 +18,23 @@ + \ 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 97a6b20..ab50bea 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 @@ -124,6 +124,39 @@ AND del_flag = 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/PowerAxisStructLeaderDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructLeaderDao.xml index 37ebd28..f557fb2 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 @@ -16,6 +16,25 @@ + + \ No newline at end of file