From 2c9427b2aa0e5c80850a40b833ffc1580f3f5eb4 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 24 三月 2025 13:27:26 +0800
Subject: [PATCH] MDC设备产线树接口
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/MdcProductionController.java | 20 ++++++++++
/dev/null | 23 -----------
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IMdcProductionService.java | 10 +++++
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 2
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProductionEquipmentServiceImpl.java | 1
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java | 33 ++++++++++++++++
6 files changed, 65 insertions(+), 24 deletions(-)
diff --git a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index 5954d6f..e55a56b 100644
--- a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -380,7 +380,7 @@
@Override
public List<MdcEquipmentTree> loadTreeListByProduction(String userId) {
//鑾峰彇鎵�鏈変骇绾挎暟鎹�
- List<MdcProduction> productionList = mdcProductionService.list(new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString()).orderByAsc(MdcProduction::getProductionOrder));
+ List<MdcProduction> productionList = mdcProductionService.list(new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString()).eq(MdcProduction::getMdcFlag, CommonConstant.DEFAULT_1).orderByAsc(MdcProduction::getProductionOrder));
//鏍规嵁鐢ㄦ埛id鑾峰彇鎷ユ湁鐨勪骇绾夸俊鎭泦鍚�
List<String> productionIds = mdcUserProductionService.queryProductionIdsByUserId(userId);
List<String> allProductionIds = new ArrayList<>();
diff --git a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProductionEquipmentServiceImpl.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProductionEquipmentServiceImpl.java
index 1a7675d..13cf827 100644
--- a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProductionEquipmentServiceImpl.java
+++ b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProductionEquipmentServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.service.IMdcProductionEquipmentService;
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/ControlSystem.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/ControlSystem.java
deleted file mode 100644
index b1aa309..0000000
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/ControlSystem.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.jeecg.modules.mdc.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * @author: LiuS
- * @create: 2023-04-07 11:12
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("ControlSystem")
-@ApiModel(value = "鎺у埗绯荤粺琛�")
-public class ControlSystem implements Serializable {
- private static final long serialVersionUID = 1529244980533421687L;
-
- /**
- * 涓婚敭
- */
- @TableId
- private String code;
- /**
- * 璁惧绫诲瀷
- */
- @TableField(value = "driveType")
- private String driveType;
- /**
- * 鏄惁閲囬泦鐗瑰緛鍙傛暟 1:閲囬泦 2:涓嶉噰闆�
- */
- @TableField(value = "dataFlag")
- private Integer dataFlag;
- //澶囨敞
- private String remark;
-}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/ControlSystemMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/ControlSystemMapper.java
deleted file mode 100644
index 118e589..0000000
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/ControlSystemMapper.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.jeecg.modules.mdc.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.mdc.entity.ControlSystem;
-
-/**
- * @author: LiuS
- * @create: 2023-04-07 11:17
- */
-public interface ControlSystemMapper extends BaseMapper<ControlSystem> {
-}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IControlSystemService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IControlSystemService.java
deleted file mode 100644
index 2e73e41..0000000
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IControlSystemService.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.jeecg.modules.mdc.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.mdc.entity.ControlSystem;
-
-/**
- * @author: LiuS
- * @create: 2023-04-07 11:15
- */
-public interface IControlSystemService extends IService<ControlSystem> {
-
- ControlSystem getByDriveType(String driveType);
-}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/ControlSystemServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/ControlSystemServiceImpl.java
deleted file mode 100644
index 0de49de..0000000
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/ControlSystemServiceImpl.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.jeecg.modules.mdc.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.modules.mdc.entity.ControlSystem;
-import org.jeecg.modules.mdc.mapper.ControlSystemMapper;
-import org.jeecg.modules.mdc.service.IControlSystemService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @author: LiuS
- * @create: 2023-04-07 11:16
- */
-@Service
-public class ControlSystemServiceImpl extends ServiceImpl<ControlSystemMapper, ControlSystem> implements IControlSystemService {
- @Override
- public ControlSystem getByDriveType(String driveType) {
- List<ControlSystem> list = lambdaQuery().eq(ControlSystem::getDriveType, driveType).eq(ControlSystem::getDataFlag, CommonConstant.STATUS_1).list();
- return !list.isEmpty() ? list.get(0) : null;
- }
-}
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..697150e 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
@@ -86,6 +86,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")
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IMdcProductionService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IMdcProductionService.java
index 67bec11..56d25eb 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IMdcProductionService.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IMdcProductionService.java
@@ -131,4 +131,14 @@
* @return
*/
List<String> findParentIdsForProduction(String parentId, List<String> idList);
+
+ /**
+ * 鏌ヨ鎵�鏈変骇绾夸俊鎭紝骞跺垎鑺傜偣杩涜鏄剧ず
+ */
+ List<MdcProductionTreeModel> queryTreeListByMdc(String ids);
+
+ /**
+ * 鏌ヨ鎵�鏈変骇绾夸俊鎭紝骞跺垎鑺傜偣杩涜鏄剧ず
+ */
+ List<MdcProductionTreeModel> queryTreeListByMdc();
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java
index 9f36ccf..f94adf6 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java
@@ -488,6 +488,39 @@
return idList;
}
+ @Override
+ public List<MdcProductionTreeModel> queryTreeListByMdc(String ids) {
+ List<MdcProductionTreeModel> listResult = new ArrayList<>();
+ LambdaQueryWrapper<MdcProduction> query = new LambdaQueryWrapper<MdcProduction>();
+ query.eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
+ query.eq(MdcProduction::getMdcFlag, CommonConstant.DEFAULT_1);
+ if (oConvertUtils.isNotEmpty(ids)) {
+ query.in(true, MdcProduction::getId, ids.split(","));
+ }
+ query.orderByAsc(MdcProduction::getProductionOrder);
+ List<MdcProduction> list = this.list(query);
+ for (MdcProduction production : list) {
+ if (production.getDescription().isEmpty()){
+ production.setDescription("");
+ }
+ listResult.add(new MdcProductionTreeModel(production));
+ }
+ return listResult;
+ }
+
+ @Override
+ public List<MdcProductionTreeModel> queryTreeListByMdc() {
+ LambdaQueryWrapper<MdcProduction> query = new LambdaQueryWrapper<MdcProduction>();
+ query.eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
+ query.eq(MdcProduction::getMdcFlag, CommonConstant.DEFAULT_1);
+ query.orderByAsc(MdcProduction::getProductionOrder);
+ List<MdcProduction> list = this.list(query);
+ //璁剧疆鐢ㄦ埛id锛岃鍓嶅彴鏄剧ず
+ this.setUserIdsByProList(list);
+ //璋冪敤wrapTreeDataToTreeList鏂规硶鐢熸垚鏍戠姸鏁版嵁
+ return FindsProductionsChildrenUtil.wrapTreeDataToTreeList(list);
+ }
+
/**
* 鎵撳紑 鐖惰妭鐐� 鍙� 浠ヤ笂鐨刴dc鏍囪
* @param parentId
--
Gitblit v1.9.3