diff --git a/README.md b/README.md index 96e1a73..a7fa5e2 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ >>> 建议新模块的context-path以'/pli/'为前缀 ### 私服依赖下载 - > 本地maven的settings.xml文件，在标签下新建子元素 + > 本地maven的settings.xml文件，在标签下新建子元素，在account与password处，填入私服的账号密码 ```xml epmet 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 new file mode 100644 index 0000000..de3962e --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisTagCategoryResultDTO.java @@ -0,0 +1,28 @@ +package com.epmet.plugin.power.dto.axis.result; + + +import lombok.Data; + +import java.io.Serializable; + +/** + * 动力主轴相关标签信息 + * + * @author work@yujt.net.cn + * @date 2022/4/18/0018 17:14 + */ +@Data +public class PowerAxisTagCategoryResultDTO implements Serializable { + + private static final long serialVersionUID = -2228160345628508079L; + + /** + * 标签类别 动力主轴结构：STRUCT；动力主轴领导人： LEADER + */ + private String tagCategory; + + /** + * 标签类别编码 + */ + private String categoryCode; +} 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 b3652ba..320e881 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.PowerAxisTagCategoryResultDTO; import com.epmet.plugin.power.modules.axis.excel.PowerAxisTagExcel; import com.epmet.plugin.power.modules.axis.service.PowerAxisTagService; import org.springframework.beans.factory.annotation.Autowired; @@ -21,7 +22,7 @@ import java.util.Map; /** - * 动力主轴标签 + * 动力主轴标签 * * @author generator generator@elink-cn.com * @since v1.0.0 2022-04-18 @@ -34,20 +35,20 @@ public class PowerAxisTagController { private PowerAxisTagService powerAxisTagService; @RequestMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params) { PageData page = powerAxisTagService.page(params); return new Result>().ok(page); } - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id) { PowerAxisTagDTO data = powerAxisTagService.get(id); return new Result().ok(data); } @NoRepeatSubmit @PostMapping("save") - public Result save(@RequestBody PowerAxisTagDTO dto){ + public Result save(@RequestBody PowerAxisTagDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); powerAxisTagService.save(dto); @@ -56,7 +57,7 @@ public class PowerAxisTagController { @NoRepeatSubmit @PostMapping("update") - public Result update(@RequestBody PowerAxisTagDTO dto){ + public Result update(@RequestBody PowerAxisTagDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); powerAxisTagService.update(dto); @@ -64,7 +65,7 @@ public class PowerAxisTagController { } @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ + public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); powerAxisTagService.delete(ids); @@ -77,6 +78,9 @@ public class PowerAxisTagController { ExcelUtils.exportExcelToTarget(response, null, list, PowerAxisTagExcel.class); } - + @PostMapping("listSimple/{tagCategory}") + public Result> listSimple(@PathVariable("tagCategory") String tagCategory) { + return new Result().ok(powerAxisTagService.listSimple(tagCategory)); + } } 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 f6424c0..61c0c2a 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,13 +4,14 @@ 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.PowerAxisTagCategoryResultDTO; import com.epmet.plugin.power.modules.axis.entity.PowerAxisTagEntity; import java.util.List; import java.util.Map; /** - * 动力主轴标签 + * 动力主轴标签 * * @author generator generator@elink-cn.com * @since v1.0.0 2022-04-18 @@ -76,4 +77,14 @@ public interface PowerAxisTagService extends BaseService { * @date 2022-04-18 */ void delete(String[] ids); + + /** + * 按标签类别查询标签列表 + * + * @param tagCategory + * @return java.util.List + * @author work@yujt.net.cn + * @date 2022/4/18/0018 17:24 + */ + List listSimple(String tagCategory); } \ 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 6709202..811b5a6 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 @@ -2,11 +2,17 @@ package com.epmet.plugin.power.modules.axis.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.enums.EpmetDelFlagEnum; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.RenException; 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.PowerAxisTagCategoryResultDTO; import com.epmet.plugin.power.modules.axis.dao.PowerAxisTagDao; import com.epmet.plugin.power.modules.axis.entity.PowerAxisTagEntity; import com.epmet.plugin.power.modules.axis.redis.PowerAxisTagRedis; @@ -21,7 +27,7 @@ import java.util.List; import java.util.Map; /** - * 动力主轴标签 + * 动力主轴标签 * * @author generator generator@elink-cn.com * @since v1.0.0 2022-04-18 @@ -29,8 +35,12 @@ import java.util.Map; @Service public class PowerAxisTagServiceImpl extends BaseServiceImpl implements PowerAxisTagService { +// @Autowired +// private PowerAxisTagRedis powerAxisTagRedis; + @Autowired - private PowerAxisTagRedis powerAxisTagRedis; + private LoginUserUtil loginUserUtil; + @Override public PageData page(Map params) { @@ -48,8 +58,8 @@ public class PowerAxisTagServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -84,4 +94,19 @@ public class PowerAxisTagServiceImpl extends BaseServiceImpl listSimple(String tagCategory) { + + if (StringUtils.isBlank(tagCategory)) { + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "缺少参数", EpmetErrorCode.SERVER_ERROR.getMsg()); + } + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("TAG_CATEGORY", tagCategory) + .eq("FORBIDDEN_FLAG", EpmetDelFlagEnum.NORMAL.value()) + .eq(FieldConstant.CUSTOMER_ID, loginUserUtil.getLoginUserCustomerId()) + .orderByAsc("SORT", FieldConstant.CREATED_TIME); + + return ConvertUtils.sourceToTarget(baseDao.selectList(wrapper), PowerAxisTagCategoryResultDTO.class); + } } \ No newline at end of file