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/ImportTrackRecordService.java | 54 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/example/client/service/ImportTrackRecordService.java b/src/main/java/com/example/client/service/ImportTrackRecordService.java
index b411498..bab2ebc 100644
--- a/src/main/java/com/example/client/service/ImportTrackRecordService.java
+++ b/src/main/java/com/example/client/service/ImportTrackRecordService.java
@@ -4,11 +4,13 @@
import com.example.client.dto.JComboBoxItem;
import com.example.client.utils.*;
import com.example.server.cabin.service.CabinService;
-import com.example.server.progressTrack.model.DjJdgzNetworkLevel3;
import com.example.server.progressTrack.model.DjJdgzTrackRecord;
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 org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -18,10 +20,7 @@
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;
@@ -38,7 +37,7 @@
@Autowired
private Level3ManageService level3ManageService;
@Autowired
- private DjJdgzNetworkLevel3Service level3Service;
+ private TrackRecordManageService trackRecordManageService;
@Autowired
private DjJdgzNetworkLevel2ListService level2ListService;
@Autowired
@@ -63,6 +62,13 @@
frame.setVisible(true);
GridBagLayout layout = new GridBagLayout();
frame.setLayout(layout);
+ frame.addWindowListener(new WindowAdapter() {
+ //娣诲姞绗簩涓晫闈㈢殑鍏抽棴浜嬩欢:
+ public void windowClosing(WindowEvent e) {
+ //娣诲姞浜嬩欢:
+ jFrame.setEnabled(true);//灏嗕富鐣岄潰鍐嶈缃负鍙搷浣滅殑
+ }
+ });
table = new JTable();
table.setRowHeight(40);
@@ -83,7 +89,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));
@@ -176,6 +182,9 @@
for (JComboBoxItem item : selectedItems) {
selectedIds.append(item.getId()).append(",");
}
+ if (StringUtils.isNotBlank(selectedIds)){
+ selectedIds.deleteCharAt(selectedIds.length()-1);
+ }
List<DjJdgzTrackRecord> list = djJdgzTrackRecordService.getListByImport(level1Id,level2Id,level2NodeId,selectedIds.toString());
DownLoadTmpFile.buildTrack(list,tmpPath + "璺熻釜璁板綍瀵煎叆妯℃澘.xlsx", frame);
}
@@ -260,10 +269,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());
@@ -297,7 +312,7 @@
String filePath = result.toString();
- String flag = level3Service.importDiagramFromExcel(filePath, level1Id[0], level2Id[0], level2NodeId[0]);
+ String flag = djJdgzTrackRecordService.importDiagramFromExcel(filePath);
return flag;
}
@@ -311,15 +326,16 @@
if (uploadSucceeded.equals("true")) {
waitUtil.dispose();
frame.dispose();
+ 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],null);
+ List<DjJdgzTrackRecord> list = djJdgzTrackRecordService.getList(level1Id[0], deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], 0,0, null);
CommonTable.refreshTable(list, columnDto, subTable);
- level3ManageService.tableModelListener(list, subTable, jFrame);
+ trackRecordManageService.tableModelListener(subTable, jFrame, list);
System.out.println("瀵煎叆鎴愬姛鏃堕棿" + new Date());
} else {
waitUtil.dispose();
@@ -371,10 +387,18 @@
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());
--
Gitblit v1.9.1