From 2c183f0f9d534e37dd69809f0eedc19fabea82e8 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期三, 28 八月 2024 11:16:03 +0800
Subject: [PATCH] 添加查询所有工站接口; 修改查询任务计划列表接口
---
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleSv.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleSv.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleSv.java
index 2df51e4..5080bd1 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleSv.java
+++ b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleSv.java
@@ -1,7 +1,8 @@
package com.dy.pmsProduct.schedule;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
import com.dy.common.webUtil.QueryResultVo;
-import com.dy.pmsGlobal.daoBa.BaPrivilegeMapper;
import com.dy.pmsGlobal.daoBa.BaUserMapper;
import com.dy.pmsGlobal.daoPlt.PltStationMapper;
import com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper;
@@ -20,6 +21,8 @@
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
@Slf4j
@Service
@@ -61,7 +64,6 @@
saveRel(schedule);
return count;
}
-
@Transactional
public int update(PrSchedule schedule) {
scheduleRelDao.deleteByScheduleId(schedule.id);
@@ -121,9 +123,28 @@
return rsVo;
}
- public List<Map<String, Object>> selectPlan(QueryVo vo) {
- List<Map<String, Object>> list = assemblyPlanDao.selectByPlanName(vo.planName);
- return list;
+ public List<JSONObject> selectPlan(QueryVo vo) {
+ List<JSONObject> list = assemblyPlanDao.selectByPlanName(vo.planName);
+ Map<Long, JSONObject> map = new ConcurrentHashMap<>(); // 浣跨敤骞跺彂瀹夊叏鐨凪ap
+ for(JSONObject item:list){
+ Long planId = (Long) item.getObj("planId");
+ JSONObject innerObject = new JSONObject()
+ .set("nodeId", item.getObj("nodeId"))
+ .set("content", item.getObj("content"));
+ if(map.containsKey(planId)){
+ JSONArray array = (JSONArray)map.get(planId).get("nodes");
+ array.add(innerObject);
+ }else{
+ JSONArray array = new JSONArray();
+ array.add(innerObject);
+ JSONObject outObject= new JSONObject()
+ .set("planId", planId)
+ .set("planName", item.getObj("planName"))
+ .set("nodes", array);
+ map.put(planId,outObject);
+ }
+ }
+ return map.values().stream().collect(Collectors.toList());
}
public List<PrSchedule> selectAll(QueryVo queryVo) {
--
Gitblit v1.8.0