diff --git a/laws-modules/src/main/java/com/jero/modules/laws/labeldatabase/controller/LawsLabelDatabaseController.java b/laws-modules/src/main/java/com/jero/modules/laws/labeldatabase/controller/LawsLabelDatabaseController.java index dae1c0b1..dd9ec871 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/labeldatabase/controller/LawsLabelDatabaseController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/labeldatabase/controller/LawsLabelDatabaseController.java @@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * @ClassName: LawsLabelDatabaseController * @Description: @@ -34,7 +36,7 @@ public class LawsLabelDatabaseController { } /** - * 标准化活动-树结构查询 + * 标签库-树结构查询 * @return */ @AutoLog(value = "标签库-树结构查询") @@ -49,4 +51,15 @@ public class LawsLabelDatabaseController { Integer pageSize) { return Result.OK(lawsLabelDatabaseService.queryTreeList(firstNodeName, pageNo, pageSize)); } + + /** + * 标签库-树结构查询 + * @return + */ + @AutoLog(value = "标签库-零部件树选中回显") + @ApiOperation(value="标签库-零部件树选中回显", notes="标签库-零部件树选中回显") + @GetMapping(value = "/queryByCodes") + public Result> queryByCodes(@ApiParam("选中的节点名称") String selectNodeCodes) { + return Result.OK(lawsLabelDatabaseService.queryByCodes(selectNodeCodes)); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/labeldatabase/service/ILawsLabelDatabaseService.java b/laws-modules/src/main/java/com/jero/modules/laws/labeldatabase/service/ILawsLabelDatabaseService.java index f430400b..056b9839 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/labeldatabase/service/ILawsLabelDatabaseService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/labeldatabase/service/ILawsLabelDatabaseService.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.laws.labeldatabase.entity.LawsLabelDatabase; +import java.util.List; + /** * @InterfaceName: ILawsLabelDatabaseService * @Description: @@ -21,4 +23,11 @@ public interface ILawsLabelDatabaseService extends IService { * @return */ IPage queryTreeList(String firstNodeName, Integer pageNo, Integer pageSize); + + /** + * 零部件树选中回显 + * @param selectNodeCodes + * @return + */ + List queryByCodes(String selectNodeCodes); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/labeldatabase/service/impl/LawsLabelDatabaseServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/labeldatabase/service/impl/LawsLabelDatabaseServiceImpl.java index af8b3dc1..59a4eb38 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/labeldatabase/service/impl/LawsLabelDatabaseServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/labeldatabase/service/impl/LawsLabelDatabaseServiceImpl.java @@ -11,8 +11,7 @@ import com.jero.modules.laws.labeldatabase.service.ILawsLabelDatabaseService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -61,6 +60,24 @@ public class LawsLabelDatabaseServiceImpl return page; } + @Override + public List queryByCodes(String selectNodeCodes) { + if (StringUtils.isBlank(selectNodeCodes)){ + return new ArrayList<>(); + } + List lawsLabelDatabaseList = new ArrayList<>(); + List codeList = Arrays.asList(selectNodeCodes.split(",")); + + List list = list(new LambdaQueryWrapper() + .in(LawsLabelDatabase::getCode, codeList)); + // 排序 + for (String code : codeList) { + Optional optional = list.stream().filter(v -> code.equals(v.getCode())).findFirst(); + optional.ifPresent(v -> lawsLabelDatabaseList.add(optional.get())); + } + return lawsLabelDatabaseList; + } + /** * 递归构建子节点 * @param tree diff --git a/laws-modules/src/main/java/com/jero/modules/tag/entity/LawsTag.java b/laws-modules/src/main/java/com/jero/modules/tag/entity/LawsTag.java index f66d6b5b..08fbc40a 100644 --- a/laws-modules/src/main/java/com/jero/modules/tag/entity/LawsTag.java +++ b/laws-modules/src/main/java/com/jero/modules/tag/entity/LawsTag.java @@ -5,13 +5,14 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; +import java.util.Date; + /** *标签库 *@author liJiaRao @@ -443,4 +444,12 @@ public class LawsTag implements Serializable { @TableField(exist = false) private String showAreaEnName; + + + /** + * 使用范围(1:国标 2:企标) + */ + @ApiModelProperty(value = "使用范围(1:国标 2:企标)") + @Dict(dicCode = "standard_source") + private String usableRange; }