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/ImportLevel2Service.java | 4 +-
src/main/java/com/example/client/service/ImportLevel3Service.java | 4 +-
src/main/java/com/example/client/service/Level3ManageService.java | 1
src/main/java/com/example/client/service/ImportDismantTrackService.java | 5 +-
src/main/resources/templateFile/跟踪记录导入模板.xlsx | 0
src/main/resources/db/csiczb1.db | 0
src/main/java/com/example/client/service/ImportTrackRecordService.java | 4 +-
src/main/resources/mapper/progressTrack/DjJdgzNetworkLevel3Dao.xml | 2
src/main/java/com/example/server/DataSync/service/DataSyncService.java | 8 +++-
src/main/resources/mapper/progressTrack/DjJdgzTrackRecordDao.xml | 2
src/main/resources/templateFile/三级网络图导入模板.xlsx | 0
src/main/java/com/example/client/service/DismantTrackService.java | 13 +++---
src/main/java/com/example/client/service/ImportDataService.java | 4 +-
src/main/java/com/example/client/service/TrackRecordManageService.java | 36 ++++++++++++------
14 files changed, 50 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/example/client/service/DismantTrackService.java b/src/main/java/com/example/client/service/DismantTrackService.java
index 9a1c1c0..916b802 100644
--- a/src/main/java/com/example/client/service/DismantTrackService.java
+++ b/src/main/java/com/example/client/service/DismantTrackService.java
@@ -70,7 +70,7 @@
JLabel JLabel0 = new JLabel("宸ョ▼");
JComboBox comboBox = new JComboBox();
- comboBox.setPreferredSize(new Dimension(112, 28));
+ comboBox.setPreferredSize(new Dimension(110, 28));
for (int i = 0; i < shipList.size(); i++) {
shipMap.put(shipList.get(i).getShipNo(), shipList.get(i).getId());
comboBox.addItem(shipList.get(i).getShipNo());
@@ -79,23 +79,24 @@
JLabel JLabel1 = new JLabel("閮ㄩ棬");
JComboBox<JComboBoxItem> comboBox1 = new JComboBox<>(deptList);
- comboBox1.setPreferredSize(new Dimension(112, 28));
+ comboBox1.setPreferredSize(new Dimension(110, 28));
JComboBoxItem[] teamList1 = sysTeamGroupClassService.getTeamList(deptList[0].getId());
JLabel JLabel2 = new JLabel("涓撲笟");
JComboBox<JComboBoxItem> comboBox2 = new JComboBox<>(teamList1);
- comboBox2.setPreferredSize(new Dimension(112, 28));
+ comboBox2.setPreferredSize(new Dimension(110, 28));
JLabel JLabel3 = new JLabel("鑸卞");
JComboBox<JComboBoxItem> comboBox3 = new JComboBox<>(cabinList);
- comboBox3.setPreferredSize(new Dimension(112, 28));
+ comboBox3.setPreferredSize(new Dimension(110, 28));
JLabel JLabel4 = new JLabel("绫诲埆");
JComboBox<String> comboBox4 = new JComboBox<>(typeList);
- comboBox4.setPreferredSize(new Dimension(112, 28));
+ comboBox4.setPreferredSize(new Dimension(110, 28));
- JTextField sb = new JTextField(10);
+ JTextField sb = new JTextField();
+ sb.setPreferredSize(new Dimension(130, 28));
JButton query = new JButton("鏌ヨ");
top.add(JLabel0, new GBC(0, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
diff --git a/src/main/java/com/example/client/service/ImportDataService.java b/src/main/java/com/example/client/service/ImportDataService.java
index 4d16e35..f17b5cb 100644
--- a/src/main/java/com/example/client/service/ImportDataService.java
+++ b/src/main/java/com/example/client/service/ImportDataService.java
@@ -165,8 +165,8 @@
}
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());
diff --git a/src/main/java/com/example/client/service/ImportDismantTrackService.java b/src/main/java/com/example/client/service/ImportDismantTrackService.java
index 99b0b48..6c78b30 100644
--- a/src/main/java/com/example/client/service/ImportDismantTrackService.java
+++ b/src/main/java/com/example/client/service/ImportDismantTrackService.java
@@ -150,7 +150,6 @@
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());
table.getColumnModel().getColumn(1).setCellEditor(new TableCellEditorButton(null, null));
@@ -259,8 +258,8 @@
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());
diff --git a/src/main/java/com/example/client/service/ImportLevel2Service.java b/src/main/java/com/example/client/service/ImportLevel2Service.java
index 6e568b4..c3af578 100644
--- a/src/main/java/com/example/client/service/ImportLevel2Service.java
+++ b/src/main/java/com/example/client/service/ImportLevel2Service.java
@@ -254,8 +254,8 @@
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());
diff --git a/src/main/java/com/example/client/service/ImportLevel3Service.java b/src/main/java/com/example/client/service/ImportLevel3Service.java
index feb2866..33556db 100644
--- a/src/main/java/com/example/client/service/ImportLevel3Service.java
+++ b/src/main/java/com/example/client/service/ImportLevel3Service.java
@@ -369,8 +369,8 @@
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());
diff --git a/src/main/java/com/example/client/service/ImportTrackRecordService.java b/src/main/java/com/example/client/service/ImportTrackRecordService.java
index 26d589a..bab2ebc 100644
--- a/src/main/java/com/example/client/service/ImportTrackRecordService.java
+++ b/src/main/java/com/example/client/service/ImportTrackRecordService.java
@@ -397,8 +397,8 @@
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());
diff --git a/src/main/java/com/example/client/service/Level3ManageService.java b/src/main/java/com/example/client/service/Level3ManageService.java
index 8a77db6..ae02749 100644
--- a/src/main/java/com/example/client/service/Level3ManageService.java
+++ b/src/main/java/com/example/client/service/Level3ManageService.java
@@ -81,6 +81,7 @@
"","鏀硅", "鍔犺", "鎹㈣", "淇悊","鏀硅繘鎬т慨鐞�"
};
JComboBoxItem[] isealCabin = {
+ new JComboBoxItem(10000L, ""),
new JComboBoxItem(0L, "鍚�"),
new JComboBoxItem(1L, "鏄�"),
};
diff --git a/src/main/java/com/example/client/service/TrackRecordManageService.java b/src/main/java/com/example/client/service/TrackRecordManageService.java
index f38194d..817593e 100644
--- a/src/main/java/com/example/client/service/TrackRecordManageService.java
+++ b/src/main/java/com/example/client/service/TrackRecordManageService.java
@@ -82,42 +82,51 @@
"","鏀硅", "鍔犺", "鎹㈣", "淇悊","鏀硅繘鎬т慨鐞�"
};
JComboBoxItem[] isealCabin = {
+ new JComboBoxItem(10000L, ""),
new JComboBoxItem(0L, "鍚�"),
new JComboBoxItem(1L, "鏄�"),
};
JLabel JLabel0 = new JLabel("宸ョ▼");
JComboBox<JComboBoxItem> comboBox = new JComboBox<>(projectList);
- comboBox.setPreferredSize(new Dimension(200, 28));
+ comboBox.setPreferredSize(new Dimension(210, 28));
JLabel JLabel1 = new JLabel("閮ㄩ棬");
JComboBox<JComboBoxItem> comboBox1 = new JComboBox<>(deptList);
comboBox1.setPreferredSize(new Dimension(140, 28));
+ comboBox1.setMaximumSize(new Dimension(140, 28));
JComboBoxItem[] teamList1 = sysTeamGroupClassService.getTeamList(deptList[0].getId());
JLabel JLabel2 = new JLabel("涓撲笟");
JComboBox<JComboBoxItem> comboBox2 = new JComboBox<>(teamList1);
comboBox2.setPreferredSize(new Dimension(140, 28));
+ comboBox2.setMaximumSize(new Dimension(140, 28));
JLabel JLabel3 = new JLabel("鑸卞");
JComboBox<JComboBoxItem> comboBox3 = new JComboBox<>(cabinList);
- comboBox3.setPreferredSize(new Dimension(140, 28));
+ comboBox3.setPreferredSize(new Dimension(120, 28));
+ comboBox3.setMaximumSize(new Dimension(120, 28));
JLabel JLabel4 = new JLabel("绫诲埆");
JComboBox<String> comboBox4 = new JComboBox<>(typeList);
comboBox4.setPreferredSize(new Dimension(140, 28));
+ comboBox4.setMaximumSize(new Dimension(140, 28));
JLabel JLabel5 = new JLabel("鐘舵��");
JComboBox<JComboBoxItem> comboBox5 = new JComboBox<>(statusList);
- comboBox5.setPreferredSize(new Dimension(140, 28));
+ comboBox5.setPreferredSize(new Dimension(120, 28));
+ comboBox5.setMaximumSize(new Dimension(120, 28));
JLabel JLabel78 = new JLabel("鏄惁褰卞搷灏佽埍");
JComboBox<JComboBoxItem> comboBox7 = new JComboBox<>(isealCabin);
- comboBox7.setPreferredSize(new Dimension(140, 28));
+ comboBox7.setPreferredSize(new Dimension(120, 28));
+ comboBox7.setMaximumSize(new Dimension(120, 28));
JTextField sb = new JTextField(16);
sb.setPreferredSize(new Dimension(140, 28));
+ sb.setMaximumSize(new Dimension(140, 28));
+
JButton query = new JButton("鏌ヨ");
JButton btnTj = new JButton("缁熻鎶ヨ〃");
@@ -360,20 +369,19 @@
});*/
topJpanel.add(JLabel0, new GBC(0, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
- topJpanel.add(comboBox, new GBC(1, 0, 3, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
+ topJpanel.add(comboBox, new GBC(1, 0, 3, 1).setAnchor(GBC.SOUTHWEST).setInsets(5).setWeight(0,0));
topJpanel.add(JLabel1, new GBC(4, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
- topJpanel.add(comboBox1, new GBC(5, 0, 2, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
+ topJpanel.add(comboBox1, new GBC(5, 0, 2, 1).setAnchor(GBC.SOUTHWEST).setInsets(5).setWeight(0,0));
topJpanel.add(JLabel2, new GBC(7, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
- topJpanel.add(comboBox2, new GBC(8, 0, 2, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
+ topJpanel.add(comboBox2, new GBC(8, 0, 2, 1).setAnchor(GBC.SOUTHWEST).setInsets(5).setWeight(0,0));
topJpanel.add(JLabel3, new GBC(10, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
- topJpanel.add(comboBox3, new GBC(11, 0, 2, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
+ topJpanel.add(comboBox3, new GBC(11, 0, 2, 1).setAnchor(GBC.SOUTHWEST).setInsets(5).setWeight(0,0));
topJpanel.add(JLabel4, new GBC(13, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
- topJpanel.add(comboBox4, new GBC(14, 0, 2, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
+ topJpanel.add(comboBox4, new GBC(14, 0, 2, 1).setAnchor(GBC.SOUTHWEST).setInsets(5).setWeight(0,0));
topJpanel.add(JLabel5, new GBC(16, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
- topJpanel.add(comboBox5, new GBC(17, 0, 2, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
+ topJpanel.add(comboBox5, new GBC(17, 0, 2, 1).setAnchor(GBC.SOUTHWEST).setInsets(5).setWeight(0,0));
topJpanel.add(JLabel78, new GBC(19, 0, 3, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
- topJpanel.add(comboBox7, new GBC(22, 0, 2, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
-
+ topJpanel.add(comboBox7, new GBC(22, 0, 2, 1).setAnchor(GBC.SOUTHWEST).setInsets(5).setWeight(0,0));
topJpanel.add(btnTj, new GBC(1, 1, 3, 1).setInsets(5));
topJpanel.add(btnJc, new GBC(4, 1, 3, 1).setInsets(5));
@@ -448,6 +456,10 @@
}
});
+ System.out.println("comboBox width: " + comboBox.getPreferredSize().height);
+ System.out.println("comboBox2 width: " + comboBox2.getPreferredSize().height);
+ System.out.println("topJpanel width: " + topJpanel.getPreferredSize().height);
+
return panel;
}
diff --git a/src/main/java/com/example/server/DataSync/service/DataSyncService.java b/src/main/java/com/example/server/DataSync/service/DataSyncService.java
index 6de5609..029b576 100644
--- a/src/main/java/com/example/server/DataSync/service/DataSyncService.java
+++ b/src/main/java/com/example/server/DataSync/service/DataSyncService.java
@@ -189,6 +189,10 @@
syncTable("dj_jdgz_ship");
} else if (mySite.equals("TD")) {
if (otherSite.equals("TD")) {
+ syncTable("dj_jdgz_network_level1");
+ syncTable("dj_jdgz_network_level1_list");
+ syncTable("dj_jdgz_network_level2");
+ syncTable("dj_jdgz_network_level2_list");
syncTable("dj_jdgz_network_level3");
syncTable("dj_jdgz_network_level3_list");
syncTable("dj_jdgz_track_record");
@@ -209,8 +213,8 @@
syncTable("dj_jdgz_track_record");
syncTable("dj_sys_oss");
syncTable("dj_jdgz_dismant_track");
-/* syncTable("dj_sys_teamgroup_class");
- syncTable("sys_user");*/
+ syncTable("dj_sys_teamgroup_class");
+ syncTable("sys_user");
syncTable("dj_jdgz_ship");
}
} else if ("鍘傚".equals(mySite)) {
diff --git a/src/main/resources/db/csiczb1.db b/src/main/resources/db/csiczb1.db
index b13c2a3..3d540e6 100644
--- a/src/main/resources/db/csiczb1.db
+++ b/src/main/resources/db/csiczb1.db
Binary files differ
diff --git a/src/main/resources/mapper/progressTrack/DjJdgzNetworkLevel3Dao.xml b/src/main/resources/mapper/progressTrack/DjJdgzNetworkLevel3Dao.xml
index 0e5d8df..ee9be25 100644
--- a/src/main/resources/mapper/progressTrack/DjJdgzNetworkLevel3Dao.xml
+++ b/src/main/resources/mapper/progressTrack/DjJdgzNetworkLevel3Dao.xml
@@ -49,7 +49,7 @@
<if test="cabinId!=null">
and a.cabin_id = ${cabinId}
</if>
- <if test="isealCabin!=null">
+ <if test="isealCabin!=10000 and isealCabin!=null">
and a.iseal_cabin = ${isealCabin}
</if>
<if test="type!=null and type!=''">
diff --git a/src/main/resources/mapper/progressTrack/DjJdgzTrackRecordDao.xml b/src/main/resources/mapper/progressTrack/DjJdgzTrackRecordDao.xml
index ed4e022..34d8dcf 100644
--- a/src/main/resources/mapper/progressTrack/DjJdgzTrackRecordDao.xml
+++ b/src/main/resources/mapper/progressTrack/DjJdgzTrackRecordDao.xml
@@ -89,7 +89,7 @@
<if test="deptId!=null">
and c.dept_id = ${deptId}
</if>
- <if test="isealCabin!=null">
+ <if test="isealCabin!=10000">
and c.iseal_cabin = ${isealCabin}
</if>
<if test="teamId!=null">
diff --git "a/src/main/resources/templateFile/\344\270\211\347\272\247\347\275\221\347\273\234\345\233\276\345\257\274\345\205\245\346\250\241\346\235\277.xlsx" "b/src/main/resources/templateFile/\344\270\211\347\272\247\347\275\221\347\273\234\345\233\276\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
index 417287f..cce8df0 100644
--- "a/src/main/resources/templateFile/\344\270\211\347\272\247\347\275\221\347\273\234\345\233\276\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
+++ "b/src/main/resources/templateFile/\344\270\211\347\272\247\347\275\221\347\273\234\345\233\276\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
Binary files differ
diff --git "a/src/main/resources/templateFile/\350\267\237\350\270\252\350\256\260\345\275\225\345\257\274\345\205\245\346\250\241\346\235\277.xlsx" "b/src/main/resources/templateFile/\350\267\237\350\270\252\350\256\260\345\275\225\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
index ddc98ac..03ebad5 100644
--- "a/src/main/resources/templateFile/\350\267\237\350\270\252\350\256\260\345\275\225\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
+++ "b/src/main/resources/templateFile/\350\267\237\350\270\252\350\256\260\345\275\225\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
Binary files differ
--
Gitblit v1.9.1