From b0f56573ea27a8798764314c72cf39e9eb0651dc Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 27 三月 2025 16:04:31 +0800
Subject: [PATCH] 综合利用率图表接口
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/MdcProductionController.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 53 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/MdcProductionController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/MdcProductionController.java
index 3b88a1c..555cd8c 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/MdcProductionController.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/MdcProductionController.java
@@ -19,6 +19,7 @@
import org.jeecg.modules.system.model.MdcProductionTreeModel;
import org.jeecg.modules.system.model.ProductionIdModel;
import org.jeecg.modules.system.service.IMdcProductionService;
+import org.jeecg.modules.system.vo.MdcProOptionsVo;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -86,6 +87,26 @@
return result;
}
+ @AutoLog(value = "浜х嚎琛�-鏍戝舰鍒楄〃(MDC)")
+ @ApiOperation(value = "浜х嚎琛�-鏍戝舰鍒楄〃(MDC)", notes = "浜х嚎琛�-鏍戝舰鍒楄〃(MDC)")
+ @GetMapping(value = "/queryTreeListByMdc")
+ public Result<List<MdcProductionTreeModel>> queryTreeListByMdc(@RequestParam(name = "ids", required = false) String ids) {
+ Result<List<MdcProductionTreeModel>> result = new Result<>();
+ try {
+ if (oConvertUtils.isNotEmpty(ids)) {
+ List<MdcProductionTreeModel> productionList = mdcProductionService.queryTreeListByMdc(ids);
+ result.setResult(productionList);
+ } else {
+ List<MdcProductionTreeModel> list = mdcProductionService.queryTreeListByMdc();
+ result.setResult(list);
+ }
+ result.setSuccess(true);
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ }
+ return result;
+ }
+
@AutoLog(value = "浜х嚎琛�-鏍戝舰鍒楄〃(娣诲姞绯荤粺閰嶇疆)")
@ApiOperation(value = "浜х嚎琛�-鏍戝舰鍒楄〃(娣诲姞绯荤粺閰嶇疆)", notes = "浜х嚎琛�-鏍戝舰鍒楄〃(娣诲姞绯荤粺閰嶇疆)")
@GetMapping(value = "/queryTreeListByConfig")
@@ -106,7 +127,6 @@
return result;
}
- @AutoLog(value = "浜х嚎琛�-鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」")
@ApiOperation(value = "浜х嚎琛�-鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」", notes = "浜х嚎琛�-鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」")
@GetMapping(value = "/loadProductionTreeOptions")
public Result<List<ProductionIdModel>> loadProductionTreeOptions() {
@@ -302,4 +322,36 @@
return super.importExcel(request, response, MdcProduction.class);
}
+ @ApiOperation(value = "浜х嚎琛�-鏍规嵁鐢ㄦ埛id鑾峰彇MDC浜х嚎(涓績)鎴栫彮缁勪笅鎷夐�夐」", notes = "浜х嚎琛�-鏍规嵁鐢ㄦ埛id鑾峰彇MDC浜х嚎(涓績)鎴栫彮缁勪笅鎷夐�夐」")
+ @GetMapping(value = "/loadProductionOptions")
+ public Result<?> loadProductionOptions(String productionId) {
+ Result<List<MdcProOptionsVo>> result = new Result<>();
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ try {
+ List<MdcProOptionsVo> list = mdcProductionService.loadProductionOptions(userId, productionId);
+ result.setSuccess(true);
+ result.setResult(list);
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ }
+ return result;
+ }
+
+ @ApiOperation(value = "浜х嚎琛�-鏍规嵁鐝粍id鑾峰彇閰嶉�佺粍涓嬫媺閫夐」", notes = "浜х嚎琛�-鏍规嵁鐝粍id鑾峰彇閰嶉�佺粍涓嬫媺閫夐」")
+ @GetMapping(value = "/loadTeamOptions")
+ public Result<?> loadTeamOptions(@RequestParam(name = "productionId", required = true) String productionId) {
+ Result<List<MdcProOptionsVo>> result = new Result<>();
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ try {
+ List<MdcProOptionsVo> list = mdcProductionService.loadTeamOptions(userId, productionId);
+ result.setSuccess(true);
+ result.setResult(list);
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ }
+ return result;
+ }
+
}
--
Gitblit v1.9.3