From 664db98c9e8595ce4dd636a27f480e3a08b81ff5 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 21 二月 2025 11:13:51 +0800
Subject: [PATCH] 新增可忽略的维修时间
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/OperatConditModelService.java | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/OperatConditModelService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/OperatConditModelService.java
index 4c96615..3fcb932 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/OperatConditModelService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/OperatConditModelService.java
@@ -1,23 +1,31 @@
package com.zt.life.modules.mainPart.taskReliability.service;
+import com.alibaba.fastjson.JSON;
import com.zt.common.service.BaseService;
import com.zt.common.utils.TreeUtils;
+import com.zt.common.utils.TreeUtils2;
import com.zt.life.modules.mainPart.taskReliability.dao.OperatConditModelDao;
+import com.zt.life.modules.mainPart.taskReliability.model.ModelNodes;
+import com.zt.life.modules.mainPart.taskReliability.model.ModelRbd;
import com.zt.life.modules.mainPart.taskReliability.model.OperatConditModel;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
+
import javax.annotation.Resource;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* operat_condit_model
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2024-03-29
*/
@Service
-public class OperatConditModelService extends BaseService<OperatConditModelDao, OperatConditModel> {
+public class OperatConditModelService extends BaseService<OperatConditModelDao, OperatConditModel> {
/**
* 鍒嗛〉鏌ヨ
@@ -27,7 +35,25 @@
*/
public List<OperatConditModel> page(QueryFilter queryFilter) {
List<OperatConditModel> list = baseDao.getList(queryFilter.getQueryParams());
- return TreeUtils.build(list);
+ List<ModelRbd> modelList = baseDao.getModelList(queryFilter.getQueryParams());
+ for (OperatConditModel conditModel : list) {
+ //List<ModelRbd> modelList = baseDao.getModelList(conditModel.getProductId());
+ List<ModelRbd> myList = modelList.stream().filter(item ->
+ item.getProductId().equals(conditModel.getProductId())).collect(Collectors.toList());
+ conditModel.setModelList(myList);
+ }
+ return TreeUtils2.build(list);
+ }
+
+
+ public Map getModelNodes(Long shipId) {
+ List<ModelNodes> list = baseDao.getModelNodes(shipId);
+ Map<String, String> map = new HashMap<>();
+ for (ModelNodes node : list) {
+ map.put(node.getModelId().toString(), node.getNodeIds());
+ }
+ //String json= JSON.toJSONString(map);
+ return map;
}
/**
@@ -39,4 +65,15 @@
super.deleteLogic(ids);
}
+ public void save(OperatConditModel parent) {
+ Long operatConditId = parent.getOperatConditId();
+ baseDao.deleteByOperatConditId(operatConditId);
+ this.saveIteration(parent);
+ }
+ public void saveIteration(OperatConditModel parent) {
+ baseDao.insert(parent);
+ for (OperatConditModel sub : parent.getChildren()) {
+ this.saveIteration(sub);
+ }
+ }
}
--
Gitblit v1.9.1