From bf5b01b14dc7bfc214e646425a62f5593890d7e3 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期六, 08 十一月 2025 22:05:37 +0800
Subject: [PATCH] 清洗数据库日期错误，并且导入日期通用化处理
---
src/main/java/com/example/client/service/Level1ManageService.java | 84 +++++++++++++++++++++++++++---------------
1 files changed, 54 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/example/client/service/Level1ManageService.java b/src/main/java/com/example/client/service/Level1ManageService.java
index 2116af0..24e8813 100644
--- a/src/main/java/com/example/client/service/Level1ManageService.java
+++ b/src/main/java/com/example/client/service/Level1ManageService.java
@@ -4,6 +4,7 @@
import com.example.client.dto.JComboBoxItem;
import com.example.client.model.TableButton;
import com.example.client.utils.CommonTable;
+import com.example.client.utils.Compute;
import com.example.client.utils.GBC;
import com.example.server.progressTrack.model.DjJdgzNetworkLevel1;
import com.example.server.progressTrack.model.DjJdgzShip;
@@ -33,6 +34,8 @@
@Autowired
private DjJdgzShipService djJdgzShipService;
@Autowired
+ private ShipManageService shipManageService;
+ @Autowired
private Level1AddOrUpdate addOrUpdate; // 娉ㄥ叆 AddOrupdate 瀹炰緥
private JTable table;
@@ -41,13 +44,14 @@
private List<ColumnDto> columnDto;
public JPanel createTable(Integer width, Integer height, JFrame jFrame) {
- JPanel panel = new JPanel();
+ JPanel panel = new JPanel(new BorderLayout());
JPanel topJpanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
- topJpanel.setPreferredSize(new Dimension(width, 37));
+ topJpanel.setPreferredSize(new Dimension(width, 40));
topJpanel.setBackground(Color.WHITE);
JPanel centerJpanel = new JPanel();
- centerJpanel.setPreferredSize(new Dimension(width - 20, height - 100));
+
+ centerJpanel.setPreferredSize(new Dimension(width - 20, Compute.ComputeHeight(40, jFrame)));
centerJpanel.setBackground(Color.WHITE);
panel.add(topJpanel, BorderLayout.NORTH);
panel.add(centerJpanel, BorderLayout.CENTER);
@@ -55,9 +59,11 @@
List<DjJdgzShip> shipList = djJdgzShipService.getList();
JComboBox comboBox = new JComboBox();
JButton btnInsert = new JButton("鏂板");
+ JButton btnShip = new JButton("X鍙风鐞�");
topJpanel.add(comboBox);
topJpanel.add(btnInsert);
+ topJpanel.add(btnShip);
comboBox.setPreferredSize(new Dimension(300, 28));
@@ -68,14 +74,14 @@
columnDto = new ArrayList<>();
//columnDto.add(new ColumnDto("ID", "id", -1, null,false));
- columnDto.add(new ColumnDto("搴忓彿", "", (width - 10) / 4, "autoCreate", false, null,null));
- columnDto.add(new ColumnDto("宸ョ▼", "ProjectName", (width - 10) / 4, null, false, null,null));
- columnDto.add(new ColumnDto("璧峰鏃堕棿", "StartDate", (width - 10) / 4, "selectDate", false, null,null));
- columnDto.add(new ColumnDto("鎿嶄綔", "", (width - 10) / 4, "", true, buttonList,null));
+ columnDto.add(new ColumnDto("搴忓彿", "", (width - 10) / 4, "autoCreate", false, null, null));
+ columnDto.add(new ColumnDto("宸ョ▼", "ProjectName", (width - 10) / 4, null, false, null, null));
+ columnDto.add(new ColumnDto("璧峰鏃堕棿", "StartDate", (width - 10) / 4, "selectDate", false, null, null));
+ columnDto.add(new ColumnDto("鎿嶄綔", "", (width - 10) / 4, "", true, buttonList, null));
table = CommonTable.createCommonTable(list, columnDto);
table.setRowHeight(25);
- table.setAutoCreateRowSorter(true);
+
table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
final Boolean[] isFirstLoadData = {true};
@@ -85,13 +91,13 @@
Long shipId = shipMap.get(content);
list = level1Service.getList(shipId);
if (!isFirstLoadData[0]) {
- CommonTable.refreshTable(list, columnDto,table);
+ CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
- table.setAutoCreateRowSorter(true);
+
table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
- tableModelListener(table,jFrame);
- }else{
+ tableModelListener(table, jFrame);
+ } else {
isFirstLoadData[0] = false;
}
}
@@ -100,10 +106,10 @@
for (int i = 0; i < shipList.size(); i++) {
shipMap.put(shipList.get(i).getShipNo(), shipList.get(i).getId());
comboBox.addItem(shipList.get(i).getShipNo());
- }
+ }
comboBox.setSelectedItem(shipList.get(0).getShipNo());
- tableModelListener(table,jFrame);
+ tableModelListener(table, jFrame);
btnInsert.addActionListener(new ActionListener() {
@Override
@@ -112,12 +118,30 @@
insert(jFrame);
}
});
+ btnShip.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ jFrame.setEnabled(false);
+ shipManageService.createTable(jFrame);
+ }
+ });
JScrollPane scrollPane = new JScrollPane(table, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
scrollPane.setViewportView(table);
scrollPane.getViewport().setBackground(Color.WHITE);
- scrollPane.setPreferredSize(new Dimension(width - 20, height - 100));
+ scrollPane.setPreferredSize(new Dimension(width - 20, Compute.ComputeHeight(40, jFrame)));
centerJpanel.add(scrollPane);
+ jFrame.addComponentListener(new ComponentAdapter() {
+ @Override
+ public void componentResized(ComponentEvent e) {
+ centerJpanel.setPreferredSize(new Dimension(width - 20, Compute.ComputeHeight(40, jFrame)));
+ scrollPane.setPreferredSize(new Dimension(width - 20, Compute.ComputeHeightWithScroll(40, jFrame)));
+ centerJpanel.revalidate();
+ centerJpanel.repaint();
+ scrollPane.revalidate();
+ scrollPane.repaint();
+ }
+ });
return panel;
}
@@ -140,12 +164,12 @@
frame1.setLayout(layout);
JComboBoxItem[] shipList = djJdgzShipService.getListByItem();
JComboBoxItem[] levelList = {
- new JComboBoxItem(1, "涓�绾�"),
- new JComboBoxItem(2, "浜岀骇"),
- new JComboBoxItem(3, "涓夌骇"),
+ new JComboBoxItem(1L, "涓�绾�"),
+ new JComboBoxItem(1L, "浜岀骇"),
+ new JComboBoxItem(1L, "涓夌骇"),
};
- JLabel JLabel1 = new JLabel("鐜勫彿");
+ JLabel JLabel1 = new JLabel("X鍙�");
JComboBox<JComboBoxItem> comboBox0 = new JComboBox<>(shipList);
comboBox0.setPreferredSize(new Dimension(185, 28));
@@ -182,16 +206,16 @@
JButton btnSave = new JButton("淇濆瓨");
- frame1.add(JLabel1, new GBC(0, 0,1,1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ frame1.add(JLabel1, new GBC(0, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
frame1.add(comboBox0, new GBC(1, 0, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
frame1.add(JLabel2, new GBC(0, 1, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
frame1.add(comboBox1, new GBC(1, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
- frame1.add(JLabel3, new GBC(0, 2,1,1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ frame1.add(JLabel3, new GBC(0, 2, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
frame1.add(yearPicker, new GBC(1, 2, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
- frame1.add(JLabel4, new GBC(0, 3,1,1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ frame1.add(JLabel4, new GBC(0, 3, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
frame1.add(beginDate, new GBC(1, 3, 1, 1).setAnchor(GBC.NORTHWEST).setInsets(5));
frame1.add(btnSave, new GBC(0, 4, 2, 1).setWeight(1, 0));
@@ -205,20 +229,20 @@
data.setStartDate(sdFormat.format(beginDate.getDate()));
data.setYear((Integer) yearPicker.getValue());
data.setAdventDay(7);
- data.setProjectName(ship.getName()+"-"+yearPicker.getValue() + "-" + level.getName());
+ data.setProjectName(level.getName() + "淇悊" + ship.getName() + "椤圭洰");
level1Service.insert(data);
list = level1Service.getList(ship.getId());
- CommonTable.refreshTable(list,columnDto,table);
+ CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
- table.setAutoCreateRowSorter(true);
+
table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
- tableModelListener(table,jFrame);
+ tableModelListener(table, jFrame);
frame1.dispose();
jFrame.setEnabled(true);//灏嗕富鐣岄潰鍐嶈缃负鍙搷浣滅殑
});
}
- public void tableModelListener(JTable table,JFrame jFrame){
+ public void tableModelListener(JTable table, JFrame jFrame) {
table.getModel().addTableModelListener(e -> {
// 妫�鏌ヤ簨浠剁被鍨�
if (e.getType() == TableModelEvent.UPDATE) {
@@ -229,11 +253,11 @@
// 鑾峰彇鏂扮殑鍊�
Object newValue = table.getModel().getValueAt(row, column);
// 杈撳嚭鍙樺寲淇℃伅
- if (newValue.equals("edit")){
+ if (newValue.equals("edit")) {
DjJdgzNetworkLevel1 data = list.get(row);
- addOrUpdate.openDialog(data,jFrame);
+ addOrUpdate.openDialog(data, jFrame);
jFrame.setEnabled(false);
- }else if(newValue.equals("del")) {
+ } else if (newValue.equals("del")) {
int n = JOptionPane.showConfirmDialog(null, "鏄惁鍒犻櫎?", "鎻愮ず", JOptionPane.YES_NO_OPTION);
if (n == 0) {
DefaultTableModel model = (DefaultTableModel) table.getModel();
--
Gitblit v1.9.1