From 904727f59b7e10a291ce7d1576e33192a619f2f2 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 05 八月 2025 17:08:39 +0800
Subject: [PATCH] MDC设备树和设备权限改造

---
 src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java |   64 +++++++++++++++++++++++++++++---
 1 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java b/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java
index 13fc9dd..ec495da 100644
--- a/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java
+++ b/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java
@@ -13,10 +13,12 @@
 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.base.model.FactoryIdModel;
 import org.jeecg.modules.mdc.entity.MdcEquipment;
 import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor;
 import org.jeecg.modules.mdc.model.MdcEquipmentTree;
 import org.jeecg.modules.mdc.model.ProductionIdModel;
+import org.jeecg.modules.mdc.service.IFactoryEquipmentService;
 import org.jeecg.modules.mdc.service.IMdcEquipmentDepartService;
 import org.jeecg.modules.mdc.service.IMdcEquipmentService;
 import org.jeecg.modules.mdc.service.IMdcProductionEquipmentService;
@@ -55,7 +57,10 @@
     private IMdcEquipmentDepartService mdcEquipmentDepartService;
 
     @Resource
-    private IMdcProductionEquipmentService mdcProductionEquipmentService;
+    private IFactoryEquipmentService factoryEquipmentService;
+
+//    @Resource
+//    private IMdcProductionEquipmentService mdcProductionEquipmentService;
 
     /**
      * 鍒嗛〉鍒楄〃鏌ヨ
@@ -244,7 +249,7 @@
     public Result<MdcEquipment> add(@RequestBody MdcEquipment mdcEquipment) {
         Result<MdcEquipment> result = new Result<>();
         String selectedDeparts = mdcEquipment.getSelectedDeparts();
-        String selectedProduction = mdcEquipment.getSelectedProduction();
+        String selectedProduction = mdcEquipment.getSelectedFactory();
         mdcEquipment.setEquipmentStatus(CommonConstant.STATUS_NORMAL);
         try {
             mdcEquipmentService.saveMdcEquipment(mdcEquipment, selectedDeparts, selectedProduction);
@@ -367,11 +372,11 @@
      */
     @AutoLog(value = "璁惧琛�-鏌ヨ鎸囧畾璁惧鍜屼骇绾垮叧鑱旂殑鏁版嵁")
     @ApiOperation(value = "璁惧琛�-鏌ヨ鎸囧畾璁惧鍜屼骇绾垮叧鑱旂殑鏁版嵁", notes = "璁惧琛�-鏌ヨ鎸囧畾璁惧鍜屼骇绾垮叧鑱旂殑鏁版嵁")
-    @GetMapping(value = "/equipmentProductionList")
-    public Result<List<ProductionIdModel>> getEquipmentProductionList(@RequestParam(name = "equipmentId", required = true) String equipmentId) {
-        Result<List<ProductionIdModel>> result = new Result<>();
+    @GetMapping(value = "/equipmentFactoryList")
+    public Result<List<FactoryIdModel>> equipmentFactoryList(@RequestParam(name = "equipmentId", required = true) String equipmentId) {
+        Result<List<FactoryIdModel>> result = new Result<>();
         try {
-            List<ProductionIdModel> proIdModelList = this.mdcProductionEquipmentService.queryProductionIdsOfEquipment(equipmentId);
+            List<FactoryIdModel> proIdModelList = this.factoryEquipmentService.queryFactoryIdsOfEquipment(equipmentId);
             if (proIdModelList != null && !proIdModelList.isEmpty()) {
                 result.setSuccess(true);
                 result.setMessage("鏌ユ壘鎴愬姛");
@@ -388,6 +393,33 @@
             return result;
         }
     }
+
+//    /**
+//     * 鏌ヨ鎸囧畾璁惧鍜屼骇绾垮叧鑱旂殑鏁版嵁
+//     */
+//    @AutoLog(value = "璁惧琛�-鏌ヨ鎸囧畾璁惧鍜屼骇绾垮叧鑱旂殑鏁版嵁")
+//    @ApiOperation(value = "璁惧琛�-鏌ヨ鎸囧畾璁惧鍜屼骇绾垮叧鑱旂殑鏁版嵁", notes = "璁惧琛�-鏌ヨ鎸囧畾璁惧鍜屼骇绾垮叧鑱旂殑鏁版嵁")
+//    @GetMapping(value = "/equipmentProductionList")
+//    public Result<List<ProductionIdModel>> getEquipmentProductionList(@RequestParam(name = "equipmentId", required = true) String equipmentId) {
+//        Result<List<ProductionIdModel>> result = new Result<>();
+//        try {
+//            List<ProductionIdModel> proIdModelList = this.mdcProductionEquipmentService.queryProductionIdsOfEquipment(equipmentId);
+//            if (proIdModelList != null && !proIdModelList.isEmpty()) {
+//                result.setSuccess(true);
+//                result.setMessage("鏌ユ壘鎴愬姛");
+//                result.setResult(proIdModelList);
+//            } else {
+//                result.setSuccess(false);
+//                result.setMessage("鏌ユ壘澶辫触");
+//            }
+//            return result;
+//        } catch (Exception e) {
+//            log.error(e.getMessage(), e);
+//            result.setSuccess(false);
+//            result.setMessage("鏌ユ壘杩囩▼涓嚭鐜颁簡寮傚父: " + e.getMessage());
+//            return result;
+//        }
+//    }
 
     /**
      * 鍔犺浇閮ㄩ棬璁惧鏍�
@@ -430,6 +462,26 @@
     }
 
     /**
+     * 鍔犺浇浜х嚎璁惧鏍�
+     */
+    @AutoLog(value = "璁惧琛�-鍔犺浇浜х嚎璁惧鏍�")
+    @ApiOperation(value = "璁惧琛�-鍔犺浇浜х嚎璁惧鏍�", notes = "璁惧琛�-鍔犺浇浜х嚎璁惧鏍�")
+    @GetMapping(value = "/queryTreeListByFactory")
+    public Result<List<MdcEquipmentTree>> queryTreeListByFactory() {
+        Result<List<MdcEquipmentTree>> result = new Result<>();
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String userId = user.getId();
+        try {
+            List<MdcEquipmentTree> mdcEquipmentTreeList = mdcEquipmentService.loadTreeListByProduction(userId);
+            result.setSuccess(true);
+            result.setResult(mdcEquipmentTreeList);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+        return result;
+    }
+
+    /**
      * 瀵煎嚭excel
      *
      * @param request

--
Gitblit v1.9.3