From 92705ac08a97ddc4904795f024723aab69e1abd8 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期六, 05 四月 2025 21:47:59 +0800
Subject: [PATCH] 修改

---
 src/main/java/com/example/client/service/ImportLevel2Service.java |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/example/client/service/ImportLevel2Service.java b/src/main/java/com/example/client/service/ImportLevel2Service.java
index 4ce0d88..6e568b4 100644
--- a/src/main/java/com/example/client/service/ImportLevel2Service.java
+++ b/src/main/java/com/example/client/service/ImportLevel2Service.java
@@ -6,6 +6,8 @@
 import com.example.server.progressTrack.model.DjJdgzNetworkLevel1;
 import com.example.server.progressTrack.model.DjJdgzNetworkLevel2List;
 import com.example.server.progressTrack.service.DjJdgzNetworkLevel2ListService;
+import com.example.server.user.model.SysUser;
+import com.example.server.utils.UserAndSiteUtils;
 import com.mxgraph.view.mxGraph;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -56,6 +58,7 @@
         frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
         frame.setLocationRelativeTo(null);
         frame.setVisible(true);
+
         GridBagLayout layout = new GridBagLayout();
         frame.setLayout(layout);
 
@@ -130,10 +133,16 @@
                         return;
                     }
 
+                    SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
+                    if (user==null){
+                        JOptionPane.showMessageDialog(null, "鐢ㄦ埛澶辨晥璇烽��鍑哄苟閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
+                        return;
+                    }
+
                     model.setDataVector(data, columnIdentifiers);
                     table.setModel(model);
-                    table.getColumnModel().getColumn(0).setPreferredWidth(600);
-                    table.getColumnModel().getColumn(1).setPreferredWidth(100);
+                    table.getColumnModel().getColumn(0).setPreferredWidth(550);
+                    table.getColumnModel().getColumn(1).setPreferredWidth(150);
 
 
                     table.getColumnModel().getColumn(0).setCellRenderer(new TableViewRenderer());
@@ -183,7 +192,7 @@
                                 frame.dispose();
                                 List<DjJdgzNetworkLevel2List> list = level2ListService.getList(netWorkId);
                                 CommonTable.refreshTable(list,columnDto,subTable);
-                                level2ListService.save(netWorkId,jPanel,graph);
+                                level2ListService.saveDiagram(netWorkId,jPanel,graph);
                                 System.out.println("瀵煎叆鎴愬姛鏃堕棿" + new Date());
                             } else {
                                 waitUtil.dispose();
@@ -235,6 +244,14 @@
                         JOptionPane.showMessageDialog(null, "鍙兘涓婁紶.xlsx鎴�.xls鐨勬枃浠讹紝涓斾笉瓒呰繃2G\"", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
                         return flag;
                     }
+
+                    SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
+                    if (user==null){
+                        flag = false;
+                        JOptionPane.showMessageDialog(null, "鐢ㄦ埛澶辨晥璇烽��鍑哄苟閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
+                        return flag;
+                    }
+
                     model.setDataVector(data, columnIdentifiers);
                     table.setModel(model);
                     table.getColumnModel().getColumn(0).setPreferredWidth(650);

--
Gitblit v1.9.1