From 23f02e6b45dd7cf0ab2e7827144913ca59575ea4 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 04 三月 2025 18:59:23 +0800
Subject: [PATCH] jar
---
src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel2ListService.java | 46 ++++++++++++++++++----------------------------
1 files changed, 18 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel2ListService.java b/src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel2ListService.java
index 3478a9f..19d4d01 100644
--- a/src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel2ListService.java
+++ b/src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel2ListService.java
@@ -7,6 +7,7 @@
import com.example.server.major.service.SysMajorService;
import com.example.server.progressTrack.Dto.DiagramMajorDto;
import com.example.server.progressTrack.Dto.DiagramNode2Dto;
+import com.example.server.progressTrack.Dto.DiagramNodeDto;
import com.example.server.progressTrack.dao.DjJdgzNetworkLevel2ListDao;
import com.example.server.progressTrack.model.DjJdgzNetworkLevel1;
import com.example.server.progressTrack.model.DjJdgzNetworkLevel1List;
@@ -92,14 +93,10 @@
baseDao.updateData(djJdgzNetworkLevel2List.getId(), djJdgzNetworkLevel2List.getExpireSituation());
}
- public void save(Long networkId, JPanel jPanel, mxGraph graph) {
+ public void saveDiagram(Long networkId, JPanel jPanel, mxGraph graph) {
+ List<DiagramNodeDto> list2 = baseDao.getNodeList(networkId);
+ String simpleDiagram = netWorkDiagramService.createSimpleDiagram(list2);
DjJdgzNetworkLevel2 level2 = djJdgzNetworkLevel2Service.get(networkId);
- DjJdgzNetworkLevel1 level1 = djJdgzNetworkLevel1Service.get(level2.getLevel1NetworkId());
-
- List<DiagramMajorDto> majorList = baseDao.getMajorList(networkId);
- List<DiagramNode2Dto> node2List = baseDao.getNodeList(networkId);
- String simpleDiagram = netWorkDiagramService.createDiagram(majorList,node2List,level1.getStartDate(),5000,10);
-
level2.setContent(simpleDiagram);
djJdgzNetworkLevel2Service.update(level2);
netWorkDiagramService.getCsDiagram(graph,simpleDiagram,null,jPanel.getWidth(),jPanel.getHeight());
@@ -146,7 +143,6 @@
sheetName = sheet.getSheetName(); //鑾峰彇褰撳墠sheet鍚嶇О
sum = sum + num;
- Map<String, Long> mapMajors = new HashMap<>();
for (int j = 1; j < num; j++) {
DjJdgzNetworkLevel2List data = new DjJdgzNetworkLevel2List();
data.setNetworkId(projectId);
@@ -155,28 +151,10 @@
row1 = j + 1;
String pattern = "yyyy-MM-dd";
Row row = sheet.getRow(j);
- Map<String, String> mapMajor = sysMajorService.getMapMajor(false, String.valueOf(20000), null, "");
- String majorName = ImportUtil.getCellValue(row, 0, pattern); //宸ョ▼涓撲笟
- String processName = ImportUtil.getCellValue(row, 1, pattern); // 杩囩▼鍚嶇О
- String requiredCompletionTime = ImportUtil.getCellValue(row, 2, pattern); // 瑕佹眰瀹屾垚鏃堕棿
-
-
- if (StringUtils.isEmpty(majorName)) {
- isErr = true;
- result = "绗�"+j+"琛�"+"涓撲笟涓嶈兘涓虹┖";
- } else {
- String majorIdStr = mapMajor.get(majorName);
- if (majorIdStr == null) {
- isErr = true;
- result = "绗�"+j+"琛�"+"涓撲笟涓嶅瓨鍦�";
- } else {
- data.setMajorId(Convert.toLong(majorIdStr));
- }
-
- }
- data.setMajorName(majorName);
+ String processName = ImportUtil.getCellValue(row, 0, pattern); // 杩囩▼鍚嶇О
+ String requiredCompletionTime = ImportUtil.getCellValue(row, 1, pattern); // 瑕佹眰瀹屾垚鏃堕棿
if (StringUtils.isEmpty(processName)) {
isErr = true;
@@ -235,6 +213,18 @@
return baseDao.getNode(networkId);
}
+ public void save(List<DjJdgzNetworkLevel2List> list, Long networkId, JPanel jPanel, mxGraph finalGraph) {
+ for (DjJdgzNetworkLevel2List data : list){
+ data.setNetworkId(networkId);
+ if (data.getId()!=null){
+ this.update(data);
+ }else{
+ this.insert(data);
+ }
+ }
+ this.saveDiagram(networkId,jPanel,finalGraph);
+ }
+
/* public String getDiagram(Long networkId, Date startDate, Integer diagramWidth, Integer lineNodeNum) {
List<DiagramMajorDto> majorList = baseDao.getMajorList(networkId);
List<DiagramNode2Dto> node2List = baseDao.getNodeList(networkId);
--
Gitblit v1.9.1