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/TeamGroupManageService.java | 179 +++++++----------------------------------------------------
1 files changed, 22 insertions(+), 157 deletions(-)
diff --git a/src/main/java/com/example/client/service/TeamGroupManageService.java b/src/main/java/com/example/client/service/TeamGroupManageService.java
index 29933c9..194c897 100644
--- a/src/main/java/com/example/client/service/TeamGroupManageService.java
+++ b/src/main/java/com/example/client/service/TeamGroupManageService.java
@@ -4,45 +4,37 @@
import com.example.client.dto.JComboBoxItem;
import com.example.client.model.TableButton;
import com.example.client.utils.CommonTable;
-import com.example.client.utils.GBC;
-import com.example.server.progressTrack.model.DjJdgzNetworkLevel1;
-import com.example.server.progressTrack.model.DjJdgzShip;
-import com.example.server.progressTrack.service.DjJdgzNetworkLevel1Service;
-import com.example.server.progressTrack.service.DjJdgzShipService;
-import org.jdesktop.swingx.JXDatePicker;
+import com.example.server.boatFleet.service.BoatFleetService;
+import com.example.server.teamGroup.model.SysTeamGroupClass;
+import com.example.server.teamGroup.service.SysTeamGroupClassService;
+import com.example.server.user.model.SysUser;
+import com.example.server.user.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.swing.*;
import javax.swing.event.TableModelEvent;
import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableCellEditor;
import java.awt.*;
-import java.awt.event.*;
-import java.text.SimpleDateFormat;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
@Service
public class TeamGroupManageService {
@Autowired
- private DjJdgzNetworkLevel1Service level1Service;
+ private SysTeamGroupClassService sysTeamGroupClassService;
@Autowired
- private DjJdgzShipService djJdgzShipService;
- @Autowired
- private Level1AddOrUpdate addOrUpdate; // 娉ㄥ叆 AddOrupdate 瀹炰緥
+ private TeamGroupAddOrUpdate addOrUpdate;
private JTable table;
- private List<DjJdgzNetworkLevel1> list;
- private Map<String, Long> shipMap = new HashMap<>();
private List<ColumnDto> columnDto;
public JPanel createTable(Integer width, Integer height, JFrame jFrame) {
JPanel panel = new JPanel();
-
+ List<SysTeamGroupClass> list;
JPanel topJpanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
topJpanel.setPreferredSize(new Dimension(width, 37));
topJpanel.setBackground(Color.WHITE);
@@ -52,64 +44,34 @@
panel.add(topJpanel, BorderLayout.NORTH);
panel.add(centerJpanel, BorderLayout.CENTER);
- List<DjJdgzShip> shipList = djJdgzShipService.getList();
- JComboBox comboBox = new JComboBox();
JButton btnInsert = new JButton("鏂板");
- topJpanel.add(comboBox);
topJpanel.add(btnInsert);
- comboBox.setPreferredSize(new Dimension(300, 28));
- list = level1Service.getList(shipList.get(0).getId());
List<TableButton> buttonList = new ArrayList<>();
buttonList.add(new TableButton("edit", "缂栬緫"));
buttonList.add(new TableButton("del", "鍒犻櫎"));
+ list = sysTeamGroupClassService.getListByTree();
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) / 3, "autoCreate", false, null,null));
+ columnDto.add(new ColumnDto("閮ㄩ棬/涓撲笟", "name", (width - 3) / 3, null, false, null,null));
+ columnDto.add(new ColumnDto("鎿嶄綔", "", (width - 10) / 3, "", true, buttonList,null));
table = CommonTable.createCommonTable(list, columnDto);
table.setRowHeight(25);
- table.setAutoCreateRowSorter(true);
table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
- final Boolean[] isFirstLoadData = {true};
- comboBox.addItemListener(new ItemListener() {
- public void itemStateChanged(final ItemEvent event) {
- String content = comboBox.getSelectedItem().toString();
- Long shipId = shipMap.get(content);
- list = level1Service.getList(shipId);
- if (!isFirstLoadData[0]) {
- CommonTable.refreshTable(list, columnDto,table);
- table.setRowHeight(25);
- table.setAutoCreateRowSorter(true);
- table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
-
- tableModelListener(table,jFrame);
- }else{
- isFirstLoadData[0] = false;
- }
- }
- });
-
- 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,list);
btnInsert.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
jFrame.setEnabled(false);
- insert(jFrame);
+ SysTeamGroupClass data = new SysTeamGroupClass();
+ addOrUpdate.openDialog(data,jFrame, columnDto,table);
}
});
@@ -122,103 +84,7 @@
return panel;
}
- private void insert(JFrame jFrame) {
- JFrame frame1 = new JFrame("鏂板涓�绾х綉缁滃浘");
- frame1.setSize(350, 400);
- frame1.setResizable(true);
- frame1.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
- frame1.setLocationRelativeTo(null);
- frame1.setVisible(true);
- frame1.addWindowListener(new WindowAdapter() {
- //娣诲姞绗簩涓晫闈㈢殑鍏抽棴浜嬩欢:
- public void windowClosing(WindowEvent e) {
- //娣诲姞浜嬩欢:
- jFrame.setEnabled(true);//灏嗕富鐣岄潰鍐嶈缃负鍙搷浣滅殑
- }
- });
- GridBagLayout layout = new GridBagLayout();
- frame1.setLayout(layout);
- JComboBoxItem[] shipList = djJdgzShipService.getListByItem();
- JComboBoxItem[] levelList = {
- new JComboBoxItem(1, "涓�绾�"),
- new JComboBoxItem(2, "浜岀骇"),
- new JComboBoxItem(3, "涓夌骇"),
- };
-
- JLabel JLabel1 = new JLabel("鐜勫彿");
- JComboBox<JComboBoxItem> comboBox0 = new JComboBox<>(shipList);
- comboBox0.setPreferredSize(new Dimension(185, 28));
-
- JLabel JLabel2 = new JLabel("淇悊绛夌骇");
- JComboBox<JComboBoxItem> comboBox1 = new JComboBox<>(levelList);
- comboBox1.setPreferredSize(new Dimension(185, 28));
-
-
- JLabel JLabel3 = new JLabel("骞翠唤");
- JSpinner yearPicker = new JSpinner(new SpinnerNumberModel(2024, 1900, 2100, 1)); // 褰撳墠骞翠唤涓�2024锛岃寖鍥翠负1900-2100锛屾闀夸负1
- yearPicker.setPreferredSize(new Dimension(185, 28));
- Font font = new Font("瀹嬩綋", Font.BOLD, 23);
- yearPicker.setFont(font);
- JSpinner.NumberEditor editor1 = new JSpinner.NumberEditor(yearPicker, "#");
- JTextField textField = editor1.getTextField();
- textField.setHorizontalAlignment(JTextField.LEFT); // 鏂囧瓧灞呭彸
- textField.setFont(font); // 璁剧疆瀛椾綋
- yearPicker.setEditor(editor1);
-
-
- JLabel JLabel4 = new JLabel("璧峰鏃堕棿");
- JXDatePicker beginDate = new JXDatePicker();
- beginDate.setPreferredSize(new Dimension(185, 28));
- SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy-MM-dd");
- beginDate.setFormats(sdFormat);
- beginDate.setDate(null);
- beginDate.addActionListener(e -> {
- // 鍋滄鍗曞厓鏍肩紪杈戯紝鍏抽棴寮瑰嚭绐楀彛
- TableCellEditor editor = table.getCellEditor();
- if (editor != null) {
- editor.stopCellEditing();
- }
- });
-
- JButton btnSave = new JButton("淇濆瓨");
-
- 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(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(beginDate, new GBC(1, 3, 1, 1).setAnchor(GBC.NORTHWEST).setInsets(5));
-
- frame1.add(btnSave, new GBC(0, 4, 2, 1).setWeight(1, 0));
-
- btnSave.addActionListener((e) -> {
- JComboBoxItem ship = (JComboBoxItem) comboBox0.getSelectedItem();
- JComboBoxItem level = (JComboBoxItem) comboBox1.getSelectedItem();
- DjJdgzNetworkLevel1 data = new DjJdgzNetworkLevel1();
- data.setShipId(ship.getId());
- data.setMaintainLevel(Math.toIntExact(level.getId()));
- data.setStartDate(sdFormat.format(beginDate.getDate()));
- data.setYear((Integer) yearPicker.getValue());
- data.setAdventDay(7);
- data.setProjectName(ship.getName()+"-"+yearPicker.getValue() + "-" + level.getName());
- level1Service.insert(data);
- list = level1Service.getList(ship.getId());
- CommonTable.refreshTable(list,columnDto,table);
- table.setRowHeight(25);
- table.setAutoCreateRowSorter(true);
- table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
- tableModelListener(table,jFrame);
- frame1.dispose();
- jFrame.setEnabled(true);//灏嗕富鐣岄潰鍐嶈缃负鍙搷浣滅殑
- });
- }
-
- public void tableModelListener(JTable table,JFrame jFrame){
+ public void tableModelListener(JTable table,JFrame jFrame,List<SysTeamGroupClass> list){
table.getModel().addTableModelListener(e -> {
// 妫�鏌ヤ簨浠剁被鍨�
if (e.getType() == TableModelEvent.UPDATE) {
@@ -230,15 +96,15 @@
Object newValue = table.getModel().getValueAt(row, column);
// 杈撳嚭鍙樺寲淇℃伅
if (newValue.equals("edit")){
- DjJdgzNetworkLevel1 data = list.get(row);
- addOrUpdate.openDialog(data,jFrame);
jFrame.setEnabled(false);
+ SysTeamGroupClass data = list.get(row);
+ addOrUpdate.openDialog(data,jFrame, columnDto,table);
}else if(newValue.equals("del")) {
int n = JOptionPane.showConfirmDialog(null, "鏄惁鍒犻櫎?", "鎻愮ず", JOptionPane.YES_NO_OPTION);
if (n == 0) {
DefaultTableModel model = (DefaultTableModel) table.getModel();
- DjJdgzNetworkLevel1 data = list.get(row);
- level1Service.deleteLevel1(data.getId());
+ SysTeamGroupClass data = list.get(row);
+ sysTeamGroupClassService.deleteLogic(data.getId());
list.remove(row);
model.removeRow(row);
}
@@ -247,7 +113,6 @@
}
});
}
-
}
--
Gitblit v1.9.1