From caf2d4d1922fa34bfb92bb0c6eca0e0a41e21671 Mon Sep 17 00:00:00 2001 From: YUJT Date: Sun, 24 Apr 2022 19:37:45 +0800 Subject: [PATCH] append --- .../dto/axis/form/StructLeaderBriefFormDTO.java | 12 ++++++++++++ .../dto/axis/result/PowerAxisSimpleListDTO.java | 6 +++++- .../controller/PowerAxisStructLeaderController.java | 9 +++++++++ .../modules/axis/dao/PowerAxisStructLeaderDao.java | 13 ++++++++++--- .../axis/service/PowerAxisStructLeaderService.java | 11 ++++++++++- 5 files changed, 46 insertions(+), 5 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/StructLeaderBriefFormDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/StructLeaderBriefFormDTO.java index fded377..372d0ee 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/StructLeaderBriefFormDTO.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/StructLeaderBriefFormDTO.java @@ -4,6 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; import java.io.Serializable; @Data @@ -13,10 +14,21 @@ public class StructLeaderBriefFormDTO implements Serializable { private static final long serialVersionUID = 523592353978009455L; + /** + * 节点级别 + */ + @NotBlank(message = "节点级别不能为空") private int structLevel; + /** + * 节点ID + */ + @NotBlank(message = "绑定节点不能为空") private String axisStructId; + /** + * 手机号或姓名 + */ private String keyWord; 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/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 index 58ae108..c87ce5a 100644 --- 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 @@ -2,8 +2,12 @@ package com.epmet.plugin.power.dto.axis.result; import lombok.Data; +import java.io.Serializable; + @Data -public class PowerAxisSimpleListDTO { +public class PowerAxisSimpleListDTO implements Serializable { + + private static final long serialVersionUID = 1760957932589482970L; 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/PowerAxisStructLeaderController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructLeaderController.java index 418af81..cb45e25 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructLeaderController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructLeaderController.java @@ -81,6 +81,15 @@ public class PowerAxisStructLeaderController { ExcelUtils.exportExcelToTarget(response, null, list, PowerAxisStructLeaderExcel.class); } + /** + * 查询当前组织下绑定的所有负责人 + * + * @param tokenDto 用户信息 + * @param formDto 查询条件 + * @return com.epmet.commons.tools.utils.Result> + * @author work@yujt.net.cn + * @date 2022/4/24/0024 19:35 + */ @PostMapping("listbrief") public Result> listLeaderByStructId(@LoginUser TokenDto tokenDto, @RequestBody StructLeaderBriefFormDTO formDto) { return new Result().ok(powerAxisStructLeaderService.listLeaderByStructId(tokenDto, formDto)); 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 2412501..f95a615 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 @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; /** - * 动力主轴负责人关系 + * 动力主轴负责人关系 * * @author generator generator@elink-cn.com * @since v1.0.0 2022-04-19 @@ -18,8 +18,15 @@ import java.util.List; @Mapper public interface PowerAxisStructLeaderDao extends BaseDao { - PowerAxisSLeaderResultDTO queryLeaderDetailById(String axisStructId,String customerId); - + PowerAxisSLeaderResultDTO queryLeaderDetailById(String axisStructId, String customerId); + /** + * 查询当前组织下绑定的所有负责人 + * + * @param formDto 查询条件 + * @return java.util.List + * @author work@yujt.net.cn + * @date 2022/4/24/0024 19:35 + */ List listLeaderBriefByRootStructId(StructLeaderBriefFormDTO formDto); } \ 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 0da7c77..680fb08 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 @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; /** - * 动力主轴负责人关系 + * 动力主轴负责人关系 * * @author generator generator@elink-cn.com * @since v1.0.0 2022-04-19 @@ -85,5 +85,14 @@ public interface PowerAxisStructLeaderService extends BaseService + * @author work@yujt.net.cn + * @date 2022/4/24/0024 19:35 + */ List listLeaderByStructId(TokenDto tokenDto, StructLeaderBriefFormDTO formDto); } \ No newline at end of file