From af67fb927c3f30fa70df834f0e97f0b4a91e6119 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 10 四月 2025 14:58:22 +0800
Subject: [PATCH] 修改
---
src/main/java/com/example/client/service/ImportLevel3Service.java | 81 ++++++++++++++++++++++++++++------------
1 files changed, 57 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/example/client/service/ImportLevel3Service.java b/src/main/java/com/example/client/service/ImportLevel3Service.java
index 18236cf..33556db 100644
--- a/src/main/java/com/example/client/service/ImportLevel3Service.java
+++ b/src/main/java/com/example/client/service/ImportLevel3Service.java
@@ -3,26 +3,23 @@
import com.example.client.dto.ColumnDto;
import com.example.client.dto.JComboBoxItem;
import com.example.client.utils.*;
-import com.example.server.progressTrack.model.DjJdgzNetworkLevel2List;
+import com.example.server.cabin.service.CabinService;
import com.example.server.progressTrack.model.DjJdgzNetworkLevel3;
import com.example.server.progressTrack.service.*;
+import com.example.server.teamGroup.service.SysTeamGroupClassService;
+import com.example.server.user.model.SysUser;
+import com.example.server.utils.UserAndSiteUtils;
import com.example.server.utils.DownLoadTmpFile;
-import com.mxgraph.view.mxGraph;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.swing.*;
-import javax.swing.event.ChangeEvent;
import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableCellRenderer;
import java.awt.*;
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.Transferable;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
+import java.awt.event.*;
import java.io.File;
import java.util.Date;
import java.util.List;
@@ -44,17 +41,28 @@
@Autowired
private DjJdgzNetworkLevel2Service level2Service;
@Autowired
- private DjJdgzNetworkLevel1ListService level1ListService;
+ private SysTeamGroupClassService sysTeamGroupClassService;
+ @Autowired
+ private CabinService cabinService;
@Autowired
private DjJdgzNetworkLevel1Service level1Service;
+ @Value("${data.tmp-path}")
+ private String tmpPath;
- public void FileUpload(List<ColumnDto> columnDto, JTable subTable,JFrame jFrame) {
- frame = new JFrame("瀵煎叆");
+ public void FileUpload(List<ColumnDto> columnDto, JTable subTable, JFrame jFrame) {
+ frame = new JFrame("瀵煎叆涓夌骇缃戠粶鍥�");
frame.setSize(900, 600);
frame.setResizable(true);
frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
frame.setLocationRelativeTo(null);
frame.setVisible(true);
+ frame.addWindowListener(new WindowAdapter() {
+ //娣诲姞绗簩涓晫闈㈢殑鍏抽棴浜嬩欢:
+ public void windowClosing(WindowEvent e) {
+ //娣诲姞浜嬩欢:
+ jFrame.setEnabled(true);//灏嗕富鐣岄潰鍐嶈缃负鍙搷浣滅殑
+ }
+ });
GridBagLayout layout = new GridBagLayout();
frame.setLayout(layout);
@@ -77,7 +85,7 @@
JLabel label0 = new JLabel("宸ョ▼");
JComboBox<JComboBoxItem> comboBox0 = new JComboBox<>(projectList);
- JLabel label1 = new JLabel("浜岀骇缃戠粶鍥�");
+ JLabel label1 = new JLabel("涓�绾х綉缁滃浘鑺傜偣");
JComboBox<JComboBoxItem> comboBox1 = new JComboBox<>();
comboBox1.setModel(new DefaultComboBoxModel<>(level2List));
@@ -87,7 +95,11 @@
@Override
public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
- setText(truncateText(value.toString(), 15)); // 鎴柇鏂囨湰
+ if(value!=null){
+ setText(truncateText(value.toString(), 15)); // 鎴柇鏂囨湰
+ }else{
+ setText("");
+ }
return this;
}
@@ -149,7 +161,7 @@
downloadbtn.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- DownLoadTmpFile.down("涓夌骇缃戠粶鍥惧鍏ユā鏉�.xlsx",frame);
+ DownLoadTmpFile.down(tmpPath + "涓夌骇缃戠粶鍥惧鍏ユā鏉�.xlsx", frame);
}
});
@@ -229,15 +241,21 @@
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());
table.getColumnModel().getColumn(1).setCellRenderer(new TableCellRendererButton());
- table.getColumnModel().getColumn(1).setCellEditor(new TableCellEditorButton(null,null));
+ table.getColumnModel().getColumn(1).setCellEditor(new TableCellEditorButton(null, null));
} else {
Object[] options = {"OK ", "CANCEL "};
@@ -266,7 +284,7 @@
String filePath = result.toString();
- String flag = level3Service.importDiagramFromExcel(filePath,level1Id[0],level2Id[0],level2NodeId[0] );
+ String flag = level3Service.importDiagramFromExcel(filePath, level1Id[0], level2Id[0], level2NodeId[0]);
return flag;
}
@@ -280,9 +298,16 @@
if (uploadSucceeded.equals("true")) {
waitUtil.dispose();
frame.dispose();
- List<DjJdgzNetworkLevel3> list = level3Service.getList(null);
- CommonTable.refreshTable(list,columnDto,subTable);
- level3ManageService.tableModelListener(list,subTable,jFrame);
+ jFrame.setEnabled(true);//灏嗕富鐣岄潰鍐嶈缃负鍙搷浣滅殑
+ JComboBoxItem[] deptList = sysTeamGroupClassService.getDeptList();
+ JComboBoxItem[] teamList = sysTeamGroupClassService.getTeamList(null);
+ JComboBoxItem[] cabinList = cabinService.getList();
+ String[] typeList = new String[]{
+ "","鏀硅", "鍔犺", "鎹㈣", "淇悊","鏀硅繘鎬т慨鐞�"
+ };
+ List<DjJdgzNetworkLevel3> list = level3Service.getList(null, deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0],0,null);
+ CommonTable.refreshTable(list, columnDto, subTable);
+ level3ManageService.tableModelListener(list, subTable, jFrame);
System.out.println("瀵煎叆鎴愬姛鏃堕棿" + new Date());
} else {
waitUtil.dispose();
@@ -334,14 +359,22 @@
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);
- table.getColumnModel().getColumn(1).setPreferredWidth(80);
+ table.getColumnModel().getColumn(0).setPreferredWidth(550);
+ table.getColumnModel().getColumn(1).setPreferredWidth(150);
table.getColumnModel().getColumn(0).setCellRenderer(new TableViewRenderer());
table.getColumnModel().getColumn(1).setCellRenderer(new TableCellRendererButton());
- table.getColumnModel().getColumn(1).setCellEditor(new TableCellEditorButton(null,null));
+ table.getColumnModel().getColumn(1).setCellEditor(new TableCellEditorButton(null, null));
return true;
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1