From cd00884c3db8fa6808b3b5949ab1a2b1459d6bdc Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 11 六月 2025 10:36:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java
index c834e49..5c1e872 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java
@@ -13,7 +13,6 @@
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.mdc.dto.MdcEquipmentDto;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor;
import org.jeecg.modules.mdc.model.MdcEquipmentTree;
@@ -109,6 +108,17 @@
Page<MdcEquipment> page = new Page<MdcEquipment>(pageNo, pageSize);
IPage<MdcEquipment> pageList = mdcEquipmentService.findEquipmentList(page, userId, mdcEquipment);
return Result.OK(pageList);
+ }
+
+ /**
+ * 鏍规嵁鐢ㄦ埛鏌ヨ璁惧鍒楄〃淇℃伅
+ */
+ @AutoLog(value = "璁惧琛�-鏍规嵁鐢ㄦ埛鏌ヨ璁惧鍒楄〃淇℃伅")
+ @ApiOperation(value = "璁惧琛�-鏍规嵁鐢ㄦ埛鏌ヨ璁惧鍒楄〃淇℃伅", notes = "璁惧琛�-鏍规嵁鐢ㄦ埛鏌ヨ璁惧鍒楄〃淇℃伅")
+ @GetMapping(value = "/getEquipmentList")
+ public Result<List<MdcEquipment>> getEquipmentList() {
+ List<MdcEquipment> list = mdcEquipmentService.getEquipmentList();
+ return Result.OK(list);
}
/**
@@ -405,12 +415,12 @@
@AutoLog(value = "璁惧琛�-鍔犺浇浜х嚎璁惧鏍�")
@ApiOperation(value = "璁惧琛�-鍔犺浇浜х嚎璁惧鏍�", notes = "璁惧琛�-鍔犺浇浜х嚎璁惧鏍�")
@GetMapping(value = "/queryTreeListByProduction")
- public Result<List<MdcEquipmentTree>> queryTreeListByProduction(String type) {
+ public Result<List<MdcEquipmentTree>> queryTreeListByProduction() {
Result<List<MdcEquipmentTree>> result = new Result<>();
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = user.getId();
try {
- List<MdcEquipmentTree> mdcEquipmentTreeList = mdcEquipmentService.loadTreeListByProduction(userId,type);
+ List<MdcEquipmentTree> mdcEquipmentTreeList = mdcEquipmentService.loadTreeListByProduction(userId);
result.setSuccess(true);
result.setResult(mdcEquipmentTreeList);
} catch (Exception e) {
@@ -530,10 +540,10 @@
@AutoLog(value = "璁惧琛�-閫氳繃杞﹂棿ids鑾峰彇璁惧鏍�")
@ApiOperation(value = "璁惧琛�-閫氳繃杞﹂棿ids鑾峰彇璁惧鏍�", notes = "璁惧琛�-閫氳繃杞﹂棿ids鑾峰彇璁惧鏍�")
@GetMapping(value = "/loadTreeListByProductionIds")
- public Result<?> loadTreeListByProductionIds(@RequestParam(name = "ids", required = true) String ids,@RequestParam(name = "type", required = true)String type) {
+ public Result<?> loadTreeListByProductionIds(@RequestParam(name = "ids", required = true) String ids) {
Result<List<MdcEquipmentTree>> result = new Result<>();
try {
- List<MdcEquipmentTree> mdcEquipmentTreeList = mdcEquipmentService.loadTreeListByProductionIds(ids,type);
+ List<MdcEquipmentTree> mdcEquipmentTreeList = mdcEquipmentService.loadTreeListByProductionIds(ids);
result.setSuccess(true);
result.setResult(mdcEquipmentTreeList);
} catch (Exception e) {
--
Gitblit v1.9.3