From 8c834663344b1cc9c2ca569e6911900edd407f73 Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期四, 06 六月 2024 16:44:14 +0800 Subject: [PATCH] 修改 --- modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/OperatConditModelService.java | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 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..06eda77 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,29 @@ 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.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; /** * 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 +33,22 @@ */ public List<OperatConditModel> page(QueryFilter queryFilter) { List<OperatConditModel> list = baseDao.getList(queryFilter.getQueryParams()); + for (OperatConditModel conditModel : list) { + List<ModelRbd> modelList = baseDao.getModelList(conditModel.getId()); + conditModel.setModelList(modelList); + } return TreeUtils.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 +60,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