新增查询标签编码接口

README.md

@@ -9,7 +9,7 @@
  >>> 建议新模块的context-path以'/pli/'为前缀 
  
  ### 私服依赖下载
- > 本地maven的settings.xml文件，在<servers>标签下新建子元素
+ > 本地maven的settings.xml文件，在<servers>标签下新建子元素，在account与password处，填入私服的账号密码
  ```xml
 <server>
     <id>epmet</id>

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;
+}

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;
@@ -34,20 +35,20 @@ public class PowerAxisTagController {
     private PowerAxisTagService powerAxisTagService;
 
     @RequestMapping("page")
-    public Result<PageData<PowerAxisTagDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<PowerAxisTagDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<PowerAxisTagDTO> page = powerAxisTagService.page(params);
         return new Result<PageData<PowerAxisTagDTO>>().ok(page);
     }
 
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
-    public Result<PowerAxisTagDTO> get(@PathVariable("id") String id){
+    public Result<PowerAxisTagDTO> get(@PathVariable("id") String id) {
         PowerAxisTagDTO data = powerAxisTagService.get(id);
         return new Result<PowerAxisTagDTO>().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<List<PowerAxisTagCategoryResultDTO>> listSimple(@PathVariable("tagCategory") String tagCategory) {
+        return new Result().ok(powerAxisTagService.listSimple(tagCategory));
+    }
 
 }

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.PowerAxisTagCategoryResultDTO;
 import com.epmet.plugin.power.modules.axis.entity.PowerAxisTagEntity;
 
 import java.util.List;
@@ -76,4 +77,14 @@ public interface PowerAxisTagService extends BaseService<PowerAxisTagEntity> {
      * @date 2022-04-18
      */
     void delete(String[] ids);
+
+    /**
+     * 按标签类别查询标签列表
+     *
+     * @param tagCategory
+     * @return java.util.List<com.epmet.plugin.power.dto.axis.result.PowerAxisTagCategoryResultDTO>
+     * @author work@yujt.net.cn
+     * @date 2022/4/18/0018 17:24
+     */
+    List<PowerAxisTagCategoryResultDTO> listSimple(String tagCategory);
 }

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;
@@ -29,8 +35,12 @@ import java.util.Map;
 @Service
 public class PowerAxisTagServiceImpl extends BaseServiceImpl<PowerAxisTagDao, PowerAxisTagEntity> implements PowerAxisTagService {
 
+//    @Autowired
+//    private PowerAxisTagRedis powerAxisTagRedis;
+
     @Autowired
-    private PowerAxisTagRedis powerAxisTagRedis;
+    private LoginUserUtil loginUserUtil;
+
 
     @Override
     public PageData<PowerAxisTagDTO> page(Map<String, Object> params) {
@@ -48,8 +58,8 @@ public class PowerAxisTagServiceImpl extends BaseServiceImpl<PowerAxisTagDao, Po
         return ConvertUtils.sourceToTarget(entityList, PowerAxisTagDTO.class);
     }
 
-    private QueryWrapper<PowerAxisTagEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<PowerAxisTagEntity> getWrapper(Map<String, Object> params) {
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<PowerAxisTagEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -84,4 +94,19 @@ public class PowerAxisTagServiceImpl extends BaseServiceImpl<PowerAxisTagDao, Po
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public List<PowerAxisTagCategoryResultDTO> listSimple(String tagCategory) {
+
+        if (StringUtils.isBlank(tagCategory)) {
+            throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "缺少参数", EpmetErrorCode.SERVER_ERROR.getMsg());
+        }
+
+        QueryWrapper<PowerAxisTagEntity> 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);
+    }
 }