From c71714508fbe3ace3543423c7700d7bbcca90056 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 12 八月 2025 13:41:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/base/controller/FactoryController.java | 27 ++++++++-------------------
1 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/base/controller/FactoryController.java b/src/main/java/org/jeecg/modules/base/controller/FactoryController.java
index dc46151..cfb5a5a 100644
--- a/src/main/java/org/jeecg/modules/base/controller/FactoryController.java
+++ b/src/main/java/org/jeecg/modules/base/controller/FactoryController.java
@@ -221,25 +221,14 @@
return result;
}
- @ApiOperation(value = "浜х嚎琛ㄩ泦鍚�", notes = "浜х嚎琛ㄩ泦鍚�")
- @GetMapping(value = "/queryTreeAppList")
- public Result<List<FactoryModel>> queryTreeAppList() {
- Result<List<FactoryModel>> result = new Result<>();
- try {
- List<Factory> factoryList = factoryService.list(new LambdaQueryWrapper<Factory>()
- .eq(Factory::getDelFlag, CommonConstant.DEL_FLAG_0)
- .orderByAsc(Factory::getSorter));
-
- List<FactoryModel> factoryModels = factoryList.stream()
- .map(factory -> new FactoryModel(factory.getId(), factory.getFactoryName()))
- .collect(Collectors.toList());
-
- result.setSuccess(true);
- result.setResult(factoryModels);
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- }
- return result;
+ @ApiOperation(value = "鑾峰彇鎵�鏈変骇绾垮垪琛�", notes = "鑾峰彇鎵�鏈変骇绾垮垪琛�")
+ @GetMapping(value = "/queryProductionLineList")
+ public Result<List<FactoryModel>> queryProductionLineList() {
+ List<Factory> factoryList = factoryService.queryProductionLineList();
+ List<FactoryModel> factoryModels = factoryList.stream()
+ .map(factory -> new FactoryModel(factory.getId(), factory.getFactoryName()))
+ .collect(Collectors.toList());
+ return Result.ok(factoryModels);
}
--
Gitblit v1.9.3