diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisAllTagCategoryResultDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisAllTagCategoryResultDTO.java new file mode 100644 index 0000000..294a401 --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisAllTagCategoryResultDTO.java @@ -0,0 +1,29 @@ +package com.epmet.plugin.power.dto.axis.result; + + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 动力主轴相关标签信息 + * + * @author work@yujt.net.cn + * @date 2022/4/18/0018 17:14 + */ +@Data +public class PowerAxisAllTagCategoryResultDTO implements Serializable { + + private static final long serialVersionUID = 5442367149527835607L; + + /** + * 标签类别 动力主轴结构：struct；动力主轴领导人： leader + */ + private String tagCategory; + + /** + * 标签类别编码集合 + */ + private List tagList; +} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisTagCategoryResultDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisTagCategoryResultDTO.java index de3962e..c60eda3 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisTagCategoryResultDTO.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisTagCategoryResultDTO.java @@ -17,12 +17,12 @@ public class PowerAxisTagCategoryResultDTO implements Serializable { private static final long serialVersionUID = -2228160345628508079L; /** - * 标签类别 动力主轴结构：STRUCT；动力主轴领导人： LEADER + * 标签类别编码 */ - private String tagCategory; + private String categoryCode; /** - * 标签类别编码 + * 标签类别名称 */ - private String categoryCode; + private String categoryName; } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisTagController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisTagController.java index 320e881..c8661b6 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisTagController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisTagController.java @@ -10,6 +10,7 @@ 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.PowerAxisTagDTO; +import com.epmet.plugin.power.dto.axis.result.PowerAxisAllTagCategoryResultDTO; import com.epmet.plugin.power.dto.axis.result.PowerAxisTagCategoryResultDTO; import com.epmet.plugin.power.modules.axis.excel.PowerAxisTagExcel; import com.epmet.plugin.power.modules.axis.service.PowerAxisTagService; @@ -78,9 +79,29 @@ public class PowerAxisTagController { ExcelUtils.exportExcelToTarget(response, null, list, PowerAxisTagExcel.class); } + /** + * 根据标签类别，查询标签列表 + * + * @param tagCategory + * @return com.epmet.commons.tools.utils.Result> + * @author work@yujt.net.cn + * @date 2022/4/18/0018 18:12 + */ @PostMapping("listSimple/{tagCategory}") public Result> listSimple(@PathVariable("tagCategory") String tagCategory) { return new Result().ok(powerAxisTagService.listSimple(tagCategory)); } + /** + * 查询全部标签 + * + * @return com.epmet.commons.tools.utils.Result> + * @author work@yujt.net.cn + * @date 2022/4/19/0019 9:24 + */ + @PostMapping("listSimpleAll") + public Result> listSimpleAll() { + return new Result().ok(powerAxisTagService.listSimpleAll()); + } + } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisTagDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisTagDao.java index 151cf7b..81f435b 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisTagDao.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisTagDao.java @@ -1,16 +1,27 @@ package com.epmet.plugin.power.modules.axis.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.plugin.power.dto.axis.result.PowerAxisAllTagCategoryResultDTO; import com.epmet.plugin.power.modules.axis.entity.PowerAxisTagEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** - * 动力主轴标签 + * 动力主轴标签 * * @author generator generator@elink-cn.com * @since v1.0.0 2022-04-18 */ @Mapper public interface PowerAxisTagDao extends BaseDao { - + + /** + * 查询全部标签，按标签类别分组 + * + * @return java.util.List + * @author work@yujt.net.cn + * @date 2022/4/19/0019 9:14 + */ + List listSimpleAll(); } \ 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/PowerAxisTagService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisTagService.java index 61c0c2a..e2d55a1 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisTagService.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisTagService.java @@ -4,6 +4,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.PowerAxisTagDTO; +import com.epmet.plugin.power.dto.axis.result.PowerAxisAllTagCategoryResultDTO; import com.epmet.plugin.power.dto.axis.result.PowerAxisTagCategoryResultDTO; import com.epmet.plugin.power.modules.axis.entity.PowerAxisTagEntity; @@ -87,4 +88,13 @@ public interface PowerAxisTagService extends BaseService { * @date 2022/4/18/0018 17:24 */ List listSimple(String tagCategory); + + /** + * 查询所有标签 + * + * @return java.util.List + * @author work@yujt.net.cn + * @date 2022/4/19/0019 9:23 + */ + List listSimpleAll(); } \ 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/PowerAxisTagServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java index 811b5a6..99ca439 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java @@ -12,6 +12,7 @@ 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.PowerAxisTagDTO; +import com.epmet.plugin.power.dto.axis.result.PowerAxisAllTagCategoryResultDTO; import com.epmet.plugin.power.dto.axis.result.PowerAxisTagCategoryResultDTO; import com.epmet.plugin.power.modules.axis.dao.PowerAxisTagDao; import com.epmet.plugin.power.modules.axis.entity.PowerAxisTagEntity; @@ -109,4 +110,9 @@ public class PowerAxisTagServiceImpl extends BaseServiceImpl listSimpleAll() { + return baseDao.listSimpleAll(); + } } \ No newline at end of file diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisTagDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisTagDao.xml index 1a02406..96a2d9f 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisTagDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisTagDao.xml @@ -19,5 +19,17 @@ + + + + + + + + + + \ No newline at end of file