rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix/master-20250425' into feature/202504-1

This commit is contained in:
曹鹏飞 2025-04-25 11:29:09 +08:00
parent 489213eec8 705ba21015
commit 651d6189bc
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java
View File

@ -224,7 +224,7 @@ public class TicketController extends ControllerBase {
* @return 部件列表 * @return 部件列表
*/ */
@GetMapping("getDeviceComponents") @GetMapping("getDeviceComponents")
public ApiResult<List<String>> getDeviceComponents(@RequestParam String name){ public ApiResult<List<ComponentInfo>> getDeviceComponents(@RequestParam String name){
return ApiResult.success(partService.getSimpleList(name)); return ApiResult.success(partService.getSimpleList(name));
} }

2
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ComponentInfo.java
View File

@ -1,8 +1,10 @@
package com.nflg.mobilebroken.common.pojo.vo; package com.nflg.mobilebroken.common.pojo.vo;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors;
@Data @Data
@Accessors(chain = true)
public class ComponentInfo { public class ComponentInfo {
/** /**

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBasePartService.java
View File

@ -24,7 +24,7 @@ public interface ITBasePartService extends IService<TBasePart> {
List<ExportPartDTO> exportPart(@Param("partNo")String partNo, @Param("partName") String partName); List<ExportPartDTO> exportPart(@Param("partNo")String partNo, @Param("partName") String partName);
List<String> getSimpleList(String name); List<ComponentInfo> getSimpleList(String name);
List<ComponentInfo> getAllDeviceComponents(String language); List<ComponentInfo> getAllDeviceComponents(String language);

4
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBasePartServiceImpl.java
View File

@ -44,13 +44,13 @@ public class TBasePartServiceImpl extends ServiceImpl<TBasePartMapper, TBasePart
} }
@Override @Override
public List<String> getSimpleList(String name) { public List<ComponentInfo> getSimpleList(String name) {
return lambdaQuery() return lambdaQuery()
.eq(TBasePart::getEnable, 1) .eq(TBasePart::getEnable, 1)
.like(StrUtil.isNotBlank(name),TBasePart::getPartName, name) .like(StrUtil.isNotBlank(name),TBasePart::getPartName, name)
.list() .list()
.stream() .stream()
.map(TBasePart::getPartName) .map(p->new ComponentInfo().setId(p.getId()).setName(p.getPartName()))
.collect(Collectors.toList()); .collect(Collectors.toList());
} }