From 4afa387b237899d5f841a3070d04739772c22551 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 30 五月 2025 11:17:47 +0800
Subject: [PATCH] 规范二维码生成
---
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleSv.java | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 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..a56be61 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,13 +64,18 @@
saveRel(schedule);
return count;
}
-
@Transactional
public int update(PrSchedule schedule) {
scheduleRelDao.deleteByScheduleId(schedule.id);
saveRel(schedule);
return scheduleDao.updateByPrimaryKeySelective(schedule);
}
+ @Transactional
+ public long delete(Long id) {
+ this.scheduleRelDao.deleteByScheduleId(id);
+ return scheduleDao.deleteByPrimaryKey(id);
+ }
+
private void saveRel(PrSchedule schedule) {
schedule.relList.forEach(rel -> validateRelData(rel, schedule));
@@ -104,8 +112,8 @@
return scheduleDao.selectByPrimaryKey(id);
}
- public List<BaUser> selectById() {
- List<BaUser> userList = baUserDao.getUserList();
+ public List<BaUser> selectAllUsers() {
+ List<BaUser> userList = baUserDao.selectAll();
return userList;
}
@@ -121,9 +129,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<String, JSONObject> map = new ConcurrentHashMap<>(); // 浣跨敤骞跺彂瀹夊叏鐨凪ap
+ for(JSONObject item:list){
+ String planId = String.valueOf(item.getObj("planId"));
+ JSONObject innerObject = new JSONObject()
+ .set("nodeId", String.valueOf(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