From 92705ac08a97ddc4904795f024723aab69e1abd8 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期六, 05 四月 2025 21:47:59 +0800
Subject: [PATCH] 修改
---
src/main/java/com/example/client/service/Level3ManageService.java | 89 ++++++++++++++++++++++++++++++++++----------
1 files changed, 69 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/example/client/service/Level3ManageService.java b/src/main/java/com/example/client/service/Level3ManageService.java
index 4558479..8a77db6 100644
--- a/src/main/java/com/example/client/service/Level3ManageService.java
+++ b/src/main/java/com/example/client/service/Level3ManageService.java
@@ -80,6 +80,10 @@
String[] typeList = new String[]{
"","鏀硅", "鍔犺", "鎹㈣", "淇悊","鏀硅繘鎬т慨鐞�"
};
+ JComboBoxItem[] isealCabin = {
+ new JComboBoxItem(0L, "鍚�"),
+ new JComboBoxItem(1L, "鏄�"),
+ };
JLabel JLabel0 = new JLabel("宸ョ▼");
JComboBox comboBox = new JComboBox();
@@ -103,6 +107,10 @@
JComboBox<String> comboBox4 = new JComboBox<>(typeList);
comboBox4.setPreferredSize(new Dimension(185, 28));
+ JLabel JLabel5 = new JLabel("鏄惁褰卞搷灏佽埍");
+ JComboBox<JComboBoxItem> comboBox5 = new JComboBox<>(isealCabin);
+ comboBox5.setPreferredSize(new Dimension(185, 28));
+
JTextField sb = new JTextField(16);
JButton query = new JButton("鏌ヨ");
@@ -120,12 +128,14 @@
topJpanel.add(JLabel4, new GBC(8, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
topJpanel.add(comboBox4, new GBC(9, 0, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
- topJpanel.add(sb, new GBC(0, 1, 2, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
- topJpanel.add(query, new GBC(2, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
- topJpanel.add(btnInsert, new GBC(3, 1, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
- topJpanel.add(btnImport, new GBC(4, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
+ topJpanel.add(JLabel5, new GBC(0, 1, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ topJpanel.add(comboBox5, new GBC(1, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
+ topJpanel.add(sb, new GBC(2, 1, 2, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ topJpanel.add(query, new GBC(4, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
+ topJpanel.add(btnInsert, new GBC(5, 1, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ topJpanel.add(btnImport, new GBC(6, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
- list = level3Service.getList(shipList.get(0).getId(), deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], null);
+ list = level3Service.getList(shipList.get(0).getId(), deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], Math.toIntExact(isealCabin[0].getId()), null);
List<TableButton> buttonList = new ArrayList<>();
buttonList.add(new TableButton("edit", "缂栬緫"));
buttonList.add(new TableButton("del", "鍒犻櫎"));
@@ -133,15 +143,16 @@
columnDto = new ArrayList<>();
//columnDto.add(new ColumnDto("ID", "id", -1, null,false));
- columnDto.add(new ColumnDto("搴忓彿", "", 176, "autoCreate", false, null, null));
+ columnDto.add(new ColumnDto("搴忓彿", "", 100, "autoCreate", false, null, null));
//columnDto.add(new ColumnDto("宸ョ▼", "ProjectName", 150, null, false, null, null));
columnDto.add(new ColumnDto("閮ㄩ棬", "deptId", 176, "dict", false, null, deptList));
columnDto.add(new ColumnDto("涓撲笟", "teamgroupId", 176, "dict", false, null, teamList));
- columnDto.add(new ColumnDto("鑸卞", "cabinId", 176, "dict", false, null, cabinList));
- columnDto.add(new ColumnDto("绫诲埆", "type", 176, null, false, null, null));
- columnDto.add(new ColumnDto("涓�绾х綉缁滃浘鑺傜偣鍚嶇О", "level1NodeName", 176, null, false, null, null));
+ columnDto.add(new ColumnDto("鑸卞", "cabinId", 100, "dict", false, null, cabinList));
+ columnDto.add(new ColumnDto("绫诲埆", "type", 120, null, false, null, null));
+ columnDto.add(new ColumnDto("涓�绾х綉缁滃浘鑺傜偣鍚嶇О", "level1NodeName", 185, null, false, null, null));
columnDto.add(new ColumnDto("浜岀骇缃戠粶鍥捐妭鐐瑰悕绉�", "level2NodeName", 185, null, false, null, null));
columnDto.add(new ColumnDto("涓夌骇缃戠粶鍥惧悕绉�", "name", 176, null, false, null, null));
+ columnDto.add(new ColumnDto("鏄惁褰卞搷灏佽埍", "isealCabin", 176, "dict", false, null, isealCabin));
columnDto.add(new ColumnDto("鎿嶄綔", "", 190, "", true, buttonList, null));
table = CommonTable.createCommonTable(list, columnDto);
@@ -161,9 +172,10 @@
JComboBoxItem team = (JComboBoxItem) comboBox2.getSelectedItem();
JComboBoxItem cabin = (JComboBoxItem) comboBox3.getSelectedItem();
String type = comboBox4.getSelectedItem().toString();
+ JComboBoxItem isCabin = (JComboBoxItem) comboBox5.getSelectedItem();
Long shipId = shipMap.get(content);
- list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, null);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(isCabin.getId()),null);
CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
@@ -187,10 +199,11 @@
JComboBoxItem dept = (JComboBoxItem) comboBox1.getSelectedItem();
JComboBoxItem team = (JComboBoxItem) comboBox2.getSelectedItem();
JComboBoxItem cabin = (JComboBoxItem) comboBox3.getSelectedItem();
+ JComboBoxItem isCabin = (JComboBoxItem) comboBox5.getSelectedItem();
String type = comboBox4.getSelectedItem().toString();
Long shipId = shipMap.get(content);
- list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, null);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(isCabin.getId()),null);
CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
@@ -208,10 +221,11 @@
JComboBoxItem dept = (JComboBoxItem) comboBox1.getSelectedItem();
JComboBoxItem team = (JComboBoxItem) comboBox2.getSelectedItem();
JComboBoxItem cabin = (JComboBoxItem) comboBox3.getSelectedItem();
+ JComboBoxItem isCabin = (JComboBoxItem) comboBox5.getSelectedItem();
String type = comboBox4.getSelectedItem().toString();
Long shipId = shipMap.get(content);
- list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, null);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(isCabin.getId()),null);
CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
@@ -226,10 +240,11 @@
JComboBoxItem dept = (JComboBoxItem) comboBox1.getSelectedItem();
JComboBoxItem team = (JComboBoxItem) comboBox2.getSelectedItem();
JComboBoxItem cabin = (JComboBoxItem) comboBox3.getSelectedItem();
+ JComboBoxItem isCabin = (JComboBoxItem) comboBox5.getSelectedItem();
String type = comboBox4.getSelectedItem().toString();
Long shipId = shipMap.get(content);
- list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, null);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(isCabin.getId()),null);
CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
@@ -244,10 +259,11 @@
JComboBoxItem dept = (JComboBoxItem) comboBox1.getSelectedItem();
JComboBoxItem team = (JComboBoxItem) comboBox2.getSelectedItem();
JComboBoxItem cabin = (JComboBoxItem) comboBox3.getSelectedItem();
+ JComboBoxItem isCabin = (JComboBoxItem) comboBox5.getSelectedItem();
String type = comboBox4.getSelectedItem().toString();
Long shipId = shipMap.get(content);
- list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, null);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(isCabin.getId()),null);
CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
@@ -257,10 +273,31 @@
}
});
+ comboBox5.addItemListener(new ItemListener() {
+ public void itemStateChanged(final ItemEvent event) {
+ String content = comboBox.getSelectedItem().toString();
+ JComboBoxItem dept = (JComboBoxItem) comboBox1.getSelectedItem();
+ JComboBoxItem team = (JComboBoxItem) comboBox2.getSelectedItem();
+ JComboBoxItem cabin = (JComboBoxItem) comboBox3.getSelectedItem();
+ JComboBoxItem isCabin = (JComboBoxItem) comboBox5.getSelectedItem();
+ String type = comboBox4.getSelectedItem().toString();
+
+ Long shipId = shipMap.get(content);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(isCabin.getId()),null);
+
+ CommonTable.refreshTable(list, columnDto, table);
+ table.setRowHeight(25);
+
+ table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+ tableModelListener(list, table, jFrame);
+ }
+ });
+
+
query.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- list = level3Service.getList(null, null, null, null, null, sb.getText());
+ list = level3Service.getList(null, null, null, null, null,null, sb.getText());
CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
@@ -310,7 +347,7 @@
private void insert(JFrame jFrame) {
JFrame frame1 = new JFrame("鏂板涓夌骇缃戠粶鍥�");
- frame1.setSize(470, 430);
+ frame1.setSize(500, 460);
frame1.setResizable(true);
frame1.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
frame1.setLocationRelativeTo(null);
@@ -331,6 +368,10 @@
JComboBoxItem[] teamList = sysTeamGroupClassService.getTeamList(null);
String[] typeList = new String[]{
"","鏀硅", "鍔犺", "鎹㈣", "淇悊","鏀硅繘鎬т慨鐞�"
+ };
+ JComboBoxItem[] isealCabin = {
+ new JComboBoxItem(0L, "鍚�"),
+ new JComboBoxItem(1L, "鏄�"),
};
JLabel JLabel1 = new JLabel("宸ョ▼");
@@ -363,6 +404,9 @@
JLabel JLabel7 = new JLabel("绫诲埆");
JComboBox<String> comboBox6 = new JComboBox<>(typeList);
+ JLabel JLabel78 = new JLabel("鏄惁褰卞搷灏佽埍");
+ JComboBox<JComboBoxItem> comboBox7 = new JComboBox<>(isealCabin);
+ comboBox7.setPreferredSize(new Dimension(185, 28));
JLabel JLabel8 = new JLabel("涓夌骇缃戠粶鍥惧悕绉�");
JTextField level3Name = new JTextField(16);
@@ -435,11 +479,13 @@
frame1.add(JLabel7, new GBC(0, 6, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
frame1.add(comboBox6, new GBC(1, 6, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
+ frame1.add(JLabel78, new GBC(0, 7, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ frame1.add(comboBox7, new GBC(1, 7, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
- frame1.add(JLabel8, new GBC(0, 7, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
- frame1.add(level3Name, new GBC(1, 7, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
+ frame1.add(JLabel8, new GBC(0, 8, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ frame1.add(level3Name, new GBC(1, 8, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
- frame1.add(btnSave, new GBC(0, 8, 2, 1).setWeight(1, 0));
+ frame1.add(btnSave, new GBC(0, 9, 2, 1).setWeight(1, 0));
btnSave.addActionListener((e) -> {
JComboBoxItem level1 = (JComboBoxItem) comboBox0.getSelectedItem();
@@ -447,6 +493,7 @@
JComboBoxItem level2Node = (JComboBoxItem) comboBox2.getSelectedItem();
JComboBoxItem dept = (JComboBoxItem) comboBox3.getSelectedItem();
JComboBoxItem team = (JComboBoxItem) comboBox4.getSelectedItem();
+ JComboBoxItem isealCabinItem = (JComboBoxItem) comboBox7.getSelectedItem();
Set<JComboBoxItem> selectedItems = comboBox5.getSelectedItems();
StringBuilder selectedIds = new StringBuilder();
for (JComboBoxItem item : selectedItems) {
@@ -459,13 +506,14 @@
data.setLevel2NetworkId(level2.getId());
data.setLevel2NodeId(level2Node.getId());
data.setName(name);
+ data.setIsealCabin(Math.toIntExact(isealCabinItem.getId()));
data.setDeptId(dept.getId());
data.setTeamgroupId(team.getId());
data.setTeamgroupName(team.getName());
data.setCabinId(String.valueOf(selectedIds));
data.setType(comboBox6.getSelectedItem().toString());
level3Service.insert(data);
- list = level3Service.getList(level1Data.getShipId(), deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], null);
+ list = level3Service.getList(level1Data.getShipId(), deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], Math.toIntExact(isealCabin[0].getId()), null);
CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
@@ -473,6 +521,7 @@
tableModelListener(list, table, jFrame);
frame1.dispose();
jFrame.setEnabled(true);//灏嗕富鐣岄潰鍐嶈缃负鍙搷浣滅殑
+ JOptionPane.showMessageDialog(null, "淇濆瓨鎴愬姛", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
});
}
--
Gitblit v1.9.1