From efce7ce3e63712ecc8b4c3039a73b508fc3ea880 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 28 四月 2025 10:20:37 +0800
Subject: [PATCH] 修改
---
src/main/java/com/example/client/service/Level2AddOrUpdate.java | 92 +++++++++++++++++++++++++++++++++++----------
1 files changed, 71 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/example/client/service/Level2AddOrUpdate.java b/src/main/java/com/example/client/service/Level2AddOrUpdate.java
index a65d3ce..6bedfa1 100644
--- a/src/main/java/com/example/client/service/Level2AddOrUpdate.java
+++ b/src/main/java/com/example/client/service/Level2AddOrUpdate.java
@@ -9,6 +9,8 @@
import com.example.server.progressTrack.model.DjJdgzNetworkLevel2;
import com.example.server.progressTrack.model.DjJdgzNetworkLevel2List;
import com.example.server.progressTrack.service.*;
+import com.example.server.user.model.SysUser;
+import com.example.server.utils.UserAndSiteUtils;
import com.mxgraph.swing.mxGraphComponent;
import com.mxgraph.view.mxGraph;
import org.apache.commons.lang3.StringUtils;
@@ -68,10 +70,11 @@
JSpinner.DateEditor timeEditor = new JSpinner.DateEditor(timeSpinner, "yyyy-MM-dd");
timeSpinner.setEditor(timeEditor);
- /* JButton btnInsert = new JButton("鏂板");*/
+ JButton btnInsert = new JButton("鏂板");
JButton btnImport = new JButton("瀵煎叆鏁版嵁");
+ JButton btnSave= new JButton("淇濆瓨");
- JLabel label1 = new JLabel("璧峰鏃堕棿");
+ /* JLabel label1 = new JLabel("璧峰鏃堕棿");
JXDatePicker beginDate = new JXDatePicker();
beginDate.setPreferredSize(new Dimension(180, 28));
SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy-MM-dd");
@@ -98,17 +101,11 @@
lineNum.setText(String.valueOf(data.getLineNodeNum()));
}else{
lineNum.setText("10");
- }
+ }*/
- topJpanel.add(btnImport, new GBC(0, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
- topJpanel.add(label1, new GBC(1, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
- topJpanel.add(beginDate, new GBC(2, 0, 2, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
-
- topJpanel.add(label2, new GBC(0, 1, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
- topJpanel.add(diagramWidth, new GBC(1, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
- topJpanel.add(label3, new GBC(2, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
- topJpanel.add(lineNum, new GBC(3, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
-
+ topJpanel.add(btnInsert, new GBC(0, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ topJpanel.add(btnImport, new GBC(1, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ topJpanel.add(btnSave, new GBC(2, 0, 2, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
// 鍒涘缓瀛愯〃鏍�
List<ColumnDto> columnDto = new ArrayList<>();
@@ -117,16 +114,41 @@
/* List<TableButton> buttonList = new ArrayList<>();
buttonList.add(new TableButton("del", "鍒犻櫎"));*/
+ List<TableButton> buttonList = new ArrayList<>();
+ buttonList.add(new TableButton("del", "鍒犻櫎"));
-
- columnDto.add(new ColumnDto("搴忓彿", "", 50, "autoCreate", false, null,null));
- columnDto.add(new ColumnDto("宸ョ▼涓撲笟", "majorName", 180, null, false, null,null));
- columnDto.add(new ColumnDto("鑺傜偣鍚嶇О", "ProcessName", 160, null, false, null,null));
- columnDto.add(new ColumnDto("瑕佹眰瀹屾垚鏃堕棿", "requiredCompletionTime", 120, null, false, null,null));
+ columnDto.add(new ColumnDto("搴忓彿", "", 50, "autoCreate", true, null,null));
+ //columnDto.add(new ColumnDto("宸ョ▼涓撲笟", "majorName", 180, null, false, null,null));
+ columnDto.add(new ColumnDto("鑺傜偣鍚嶇О", "ProcessName", 160, null, true, null,null));
+ columnDto.add(new ColumnDto("瑕佹眰瀹屾垚鏃堕棿", "requiredCompletionTime", 120, "selectDate", true, null,null));
+ columnDto.add(new ColumnDto("鎿嶄綔", "", 85, "", true, buttonList,null));
JTable subTable = CommonTable.createCommonTable(list, columnDto);
subTable.setRowHeight(25);
subTable.setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS);
+
+ subTable.getModel().addTableModelListener(e -> {
+ // 妫�鏌ヤ簨浠剁被鍨�
+ if (e.getType() == TableModelEvent.UPDATE) {
+ // 鑾峰彇鍙樺寲鐨勮鍜屽垪
+ int row = e.getFirstRow();
+ int column = e.getColumn();
+
+ // 鑾峰彇鏂扮殑鍊�
+ Object newValue = subTable.getModel().getValueAt(row, column);
+ // 杈撳嚭鍙樺寲淇℃伅
+ if (newValue.equals("del")) {
+ DefaultTableModel model = (DefaultTableModel) subTable.getModel();
+ model.removeRow(row);
+ DjJdgzNetworkLevel2List djJdgzNetworkLevel2List = list.get(row);
+ level2ListService.deleteLogic(djJdgzNetworkLevel2List.getId());
+ list.remove(row);
+ } else {
+
+ }
+ System.out.println("鍗曞厓鏍煎彉鍖�: 琛�=" + row + ", 鍒�=" + column + ", 鏂板��=" + newValue);
+ }
+ });
JScrollPane scrollTable = new JScrollPane(subTable);
jLeft.add(topJpanel, BorderLayout.NORTH);
@@ -148,11 +170,11 @@
mxGraph graph = new mxGraph();
DjJdgzNetworkLevel2 djJdgzNetworkLevel2 = level2Service.get(data.getId());
- graph = netWorkDiagramService.getCsDiagram(graph,djJdgzNetworkLevel2.getContent(),null,diagram.getWidth(),diagram.getHeight());
+ graph = netWorkDiagramService.getCsDiagram(graph,djJdgzNetworkLevel2.getContent(),null,diagram.getWidth(),diagram.getHeight(),null);
mxGraphComponent graphComponent = new mxGraphComponent(graph);
graphComponent.setConnectable(false);
graphComponent.setDragEnabled(false);
- graphComponent.zoomTo(2, true);
+ graphComponent.zoomTo(1, true);
diagram.add(graphComponent);
mxGraph finalGraph = graph;
@@ -167,12 +189,40 @@
}
});
+ btnInsert.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ TableModel model = subTable.getModel();
+ DefaultTableModel defaultModel = (DefaultTableModel) model;
+ int columnCount = subTable.getColumnCount();
+ Object[] emptyRow = new Object[columnCount];
+ defaultModel.addRow(emptyRow);
+ list.add(new DjJdgzNetworkLevel2List());
+ }
+ });
- mxGraph finalGraph1 = graph;
+ btnSave.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
+ if (user==null){
+ JOptionPane.showMessageDialog(null, "鐢ㄦ埛澶辨晥璇烽��鍑哄苟閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
+ return;
+ }
+ if (subTable.isEditing()) {
+ subTable.getCellEditor().stopCellEditing();
+ }
+ CommonTable.saveTableList(list,subTable,columnDto);
+ level2ListService.save(list,data.getId(),diagram, finalGraph);
+ JOptionPane.showMessageDialog(null, "淇濆瓨鎴愬姛", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
+
+ }
+ });
+
btnImport.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- importService.FileUpload(data.getId(),columnDto,subTable,diagram,finalGraph1);
+ importService.FileUpload(data.getId(),columnDto,subTable,diagram,finalGraph);
}
});
}
--
Gitblit v1.9.1