修改

jinlin

2025-04-05 92705ac08a97ddc4904795f024723aab69e1abd8

修改

 src/main/java/com/example/client/Login.java

@@ -4,7 +4,7 @@
import com.example.client.utils.GBC;
import com.example.server.user.model.SysUser;
import com.example.server.user.service.UserService;
import com.example.server.utils.CacheUtils;
import com.example.server.utils.UserAndSiteUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -198,10 +198,9 @@
                    } catch (IOException ep) {
                        ep.printStackTrace();
                    }
                    user.setBoatfleet(finalTeam);
                    CacheUtils.put("user", "user", user);
                    CacheUtils.put("site", "site", finalSite);
                    CacheUtils.put("teamGroup", "teamGroup", finalTeamGroup);
                    user.setBoatFleet(finalTeam);
                    UserAndSiteUtils.put("user", "user", user);
                    UserAndSiteUtils.put("site", "site", finalSite);
                    main.Start(role, user.getId());
                    frame.dispose();
                } else {

 src/main/java/com/example/client/service/ConfigManageService.java

@@ -9,7 +9,7 @@
import com.example.server.DataSync.service.DataSyncService;
import com.example.server.teamGroup.service.SysTeamGroupClassService;
import com.example.server.user.model.SysUser;
import com.example.server.utils.CacheUtils;
import com.example.server.utils.UserAndSiteUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -149,8 +149,8 @@
                properties.setProperty("site", comboBox.getSelectedItem().toString());
                properties.setProperty("team", teamName.getText() + "TD");
                properties.setProperty("teamGroup", String.valueOf(selectedIds));
                CacheUtils.remove("site", "site");
                CacheUtils.put("site", "site", comboBox.getSelectedItem().toString());
                UserAndSiteUtils.remove("site", "site");
                UserAndSiteUtils.put("site", "site", comboBox.getSelectedItem().toString());
                properties.store(outputStream, "rxkj");
                outputStream.close();
            } catch (FileNotFoundException ex) {

 src/main/java/com/example/client/service/DataExportManageService.java

@@ -7,7 +7,7 @@
import com.example.server.progressTrack.dao.ExportRecordDao;
import com.example.server.progressTrack.model.ExportRecord;
import com.example.server.user.model.SysUser;
import com.example.server.utils.CacheUtils;
import com.example.server.utils.UserAndSiteUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -78,7 +78,7 @@
        btnExport.addActionListener(new ActionListener() {
            @Override
            public void actionPerformed(ActionEvent e) {
                SysUser user = (SysUser) CacheUtils.get("user","user");
                SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
                if (user==null){
                    JOptionPane.showMessageDialog(null, "用户失效请退出并重新登录", "提示", JOptionPane.WARNING_MESSAGE);
                    return;

 src/main/java/com/example/client/service/DataImportManageService.java

@@ -10,7 +10,7 @@
import com.example.server.progressTrack.model.ExportRecord;
import com.example.server.progressTrack.model.ImportRecord;
import com.example.server.user.model.SysUser;
import com.example.server.utils.CacheUtils;
import com.example.server.utils.UserAndSiteUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -38,7 +38,7 @@
    private JTable table;

    public JPanel createTable(Integer width, Integer height, JFrame jFrame) {
        SysUser user = (SysUser) CacheUtils.get("user","user");
        SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
        if (user==null){
            JOptionPane.showMessageDialog(null, "用户失效请退出并重新登录", "提示", JOptionPane.WARNING_MESSAGE);
            return null;
@@ -64,7 +64,7 @@
        south.setPreferredSize(new Dimension((width - 10) / 2, (height-50)/3*2));


        String site = (String) CacheUtils.get("site", "site");
        String site = (String) UserAndSiteUtils.get("site", "site");
        JLabel label = new JLabel(site + "机器");
        top.add(label);


 src/main/java/com/example/client/service/DismantTrackAddOrUpdate.java

@@ -14,7 +14,7 @@
import com.example.server.progressTrack.service.DjJdgzNetworkLevel3Service;
import com.example.server.teamGroup.service.SysTeamGroupClassService;
import com.example.server.user.model.SysUser;
import com.example.server.utils.CacheUtils;
import com.example.server.utils.UserAndSiteUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -151,7 +151,7 @@
                if (trackTable.isEditing()) {
                    trackTable.getCellEditor().stopCellEditing();
                }
                SysUser user = (SysUser) CacheUtils.get("user", "user");
                SysUser user = (SysUser) UserAndSiteUtils.get("user", "user");
                if (user == null) {
                    JOptionPane.showMessageDialog(null, "当前用户已失效请重新登录", "提示", JOptionPane.WARNING_MESSAGE);
                    return;

 src/main/java/com/example/client/service/DismantTrackService.java

@@ -113,7 +113,7 @@
        top.add(query, new GBC(6, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));

        List<ColumnDto> columnDto = new ArrayList<>();
        list = level3Service.getList(null, 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],null, null);
        if (list == null || list.size() == 0) {
            JOptionPane.showMessageDialog(null, "还未录入三级网络图数据", "提示", JOptionPane.WARNING_MESSAGE);
            return null;
@@ -139,7 +139,7 @@
                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,null, null);

                CommonTable.refreshTable(list, columnDto, subTable);
                subTable.setRowHeight(25);
@@ -178,7 +178,7 @@
                        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, null,null);

                        CommonTable.refreshTable(list, columnDto, subTable);
                        subTable.setRowHeight(25);
@@ -208,7 +208,7 @@
                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,null, null);

                CommonTable.refreshTable(list, columnDto, subTable);
                subTable.setRowHeight(25);
@@ -236,7 +236,7 @@
                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, null,null);

                CommonTable.refreshTable(list, columnDto, subTable);
                subTable.setRowHeight(25);
@@ -264,7 +264,7 @@
                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,null, null);

                CommonTable.refreshTable(list, columnDto, subTable);
                subTable.setRowHeight(25);
@@ -287,7 +287,7 @@
        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, subTable);
                subTable.setRowHeight(25);

 src/main/java/com/example/client/service/HandoverAddOrUpdate.java

@@ -12,7 +12,7 @@
import com.example.server.progressTrack.service.DjJdgzTrackRecordService;
import com.example.server.sysOss.model.SysOss;
import com.example.server.user.model.SysUser;
import com.example.server.utils.CacheUtils;
import com.example.server.utils.UserAndSiteUtils;
import org.apache.commons.lang3.StringUtils;
import org.jdesktop.swingx.JXDatePicker;
import org.springframework.beans.factory.annotation.Autowired;
@@ -177,7 +177,7 @@
        saveButton.addActionListener(new ActionListener() {
            @Override
            public void actionPerformed(ActionEvent e) {
                SysUser user = (SysUser) CacheUtils.get("user","user");
                SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
                if (user==null){
                    JOptionPane.showMessageDialog(null, "用户失效请退出并重新登录", "提示", JOptionPane.WARNING_MESSAGE);
                    return;

 src/main/java/com/example/client/service/ImportDismantTrackService.java

@@ -6,7 +6,7 @@
import com.example.server.progressTrack.model.DjJdgzNetworkLevel3;
import com.example.server.progressTrack.service.*;
import com.example.server.user.model.SysUser;
import com.example.server.utils.CacheUtils;
import com.example.server.utils.UserAndSiteUtils;
import com.example.server.utils.DownLoadTmpFile;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -139,7 +139,7 @@
                        return;
                    }

                    SysUser user = (SysUser) CacheUtils.get("user","user");
                    SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
                    if (user==null){
                        JOptionPane.showMessageDialog(null, "用户失效请退出并重新登录", "提示", JOptionPane.WARNING_MESSAGE);
                        return ;
@@ -250,7 +250,7 @@
                        return flag;
                    }

                    SysUser user = (SysUser) CacheUtils.get("user","user");
                    SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
                    if (user==null){
                        flag = false;
                        JOptionPane.showMessageDialog(null, "用户失效请退出并重新登录", "提示", JOptionPane.WARNING_MESSAGE);

 src/main/java/com/example/client/service/ImportLevel2Service.java

@@ -7,7 +7,7 @@
import com.example.server.progressTrack.model.DjJdgzNetworkLevel2List;
import com.example.server.progressTrack.service.DjJdgzNetworkLevel2ListService;
import com.example.server.user.model.SysUser;
import com.example.server.utils.CacheUtils;
import com.example.server.utils.UserAndSiteUtils;
import com.mxgraph.view.mxGraph;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -133,7 +133,7 @@
                        return;
                    }

                    SysUser user = (SysUser) CacheUtils.get("user","user");
                    SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
                    if (user==null){
                        JOptionPane.showMessageDialog(null, "用户失效请退出并重新登录", "提示", JOptionPane.WARNING_MESSAGE);
                        return;
@@ -245,7 +245,7 @@
                        return flag;
                    }

                    SysUser user = (SysUser) CacheUtils.get("user","user");
                    SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
                    if (user==null){
                        flag = false;
                        JOptionPane.showMessageDialog(null, "用户失效请退出并重新登录", "提示", JOptionPane.WARNING_MESSAGE);

 src/main/java/com/example/client/service/ImportLevel3Service.java

@@ -8,7 +8,7 @@
import com.example.server.progressTrack.service.*;
import com.example.server.teamGroup.service.SysTeamGroupClassService;
import com.example.server.user.model.SysUser;
import com.example.server.utils.CacheUtils;
import com.example.server.utils.UserAndSiteUtils;
import com.example.server.utils.DownLoadTmpFile;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -241,7 +241,7 @@
                        return;
                    }

                    SysUser user = (SysUser) CacheUtils.get("user","user");
                    SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
                    if (user==null){
                        JOptionPane.showMessageDialog(null, "用户失效请退出并重新登录", "提示", JOptionPane.WARNING_MESSAGE);
                        return;
@@ -305,7 +305,7 @@
                                String[] typeList = new String[]{
                                        "","改装", "加装", "换装", "修理","改进性修理"
        };
                                List<DjJdgzNetworkLevel3> list = level3Service.getList(null, deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0],null);
                                List<DjJdgzNetworkLevel3> list = level3Service.getList(null, deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0],0,null);
                                CommonTable.refreshTable(list, columnDto, subTable);
                                level3ManageService.tableModelListener(list, subTable, jFrame);
                                System.out.println("导入成功时间" + new Date());
@@ -360,7 +360,7 @@
                        return flag;
                    }

                    SysUser user = (SysUser) CacheUtils.get("user","user");
                    SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
                    if (user==null){
                        flag = false;
                        JOptionPane.showMessageDialog(null, "用户失效请退出并重新登录", "提示", JOptionPane.WARNING_MESSAGE);

 src/main/java/com/example/client/service/ImportTrackRecordService.java

@@ -8,7 +8,7 @@
import com.example.server.progressTrack.service.*;
import com.example.server.teamGroup.service.SysTeamGroupClassService;
import com.example.server.user.model.SysUser;
import com.example.server.utils.CacheUtils;
import com.example.server.utils.UserAndSiteUtils;
import com.example.server.utils.DownLoadTmpFile;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -269,7 +269,7 @@
                        return;
                    }

                    SysUser user = (SysUser) CacheUtils.get("user","user");
                    SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
                    if (user==null){
                        JOptionPane.showMessageDialog(null, "用户失效请退出并重新登录", "提示", JOptionPane.WARNING_MESSAGE);
                        return;
@@ -333,7 +333,7 @@
                                String[] typeList = new String[]{
                "","改装", "加装", "换装", "修理","改进性修理"
        };
                                List<DjJdgzTrackRecord> list = djJdgzTrackRecordService.getList(level1Id[0], deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], 0, null);
                                List<DjJdgzTrackRecord> list = djJdgzTrackRecordService.getList(level1Id[0], deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], 0,0, null);
                                CommonTable.refreshTable(list, columnDto, subTable);
                                trackRecordManageService.tableModelListener(subTable, jFrame, list);
                                System.out.println("导入成功时间" + new Date());
@@ -388,7 +388,7 @@
                        return flag;
                    }

                    SysUser user = (SysUser) CacheUtils.get("user","user");
                    SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
                    if (user==null){
                        flag = false;
                        JOptionPane.showMessageDialog(null, "用户失效请退出并重新登录", "提示", JOptionPane.WARNING_MESSAGE);

 src/main/java/com/example/client/service/Level1AddOrUpdate.java

@@ -8,7 +8,7 @@
import com.example.server.progressTrack.service.DjJdgzNetworkLevel1ListService;
import com.example.server.progressTrack.service.NetWorkDiagramService;
import com.example.server.user.model.SysUser;
import com.example.server.utils.CacheUtils;
import com.example.server.utils.UserAndSiteUtils;
import com.mxgraph.swing.mxGraphComponent;
import com.mxgraph.view.mxGraph;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
@@ -161,7 +161,7 @@
        btnSave.addActionListener(new ActionListener() {
            @Override
            public void actionPerformed(ActionEvent e) {
                SysUser user = (SysUser) CacheUtils.get("user","user");
                SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
                if (user==null){
                    JOptionPane.showMessageDialog(null, "用户失效请退出并重新登录", "提示", JOptionPane.WARNING_MESSAGE);
                    return;

 src/main/java/com/example/client/service/Level2AddOrUpdate.java

@@ -10,7 +10,7 @@
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.CacheUtils;
import com.example.server.utils.UserAndSiteUtils;
import com.mxgraph.swing.mxGraphComponent;
import com.mxgraph.view.mxGraph;
import org.apache.commons.lang3.StringUtils;
@@ -204,7 +204,7 @@
        btnSave.addActionListener(new ActionListener() {
            @Override
            public void actionPerformed(ActionEvent e) {
                SysUser user = (SysUser) CacheUtils.get("user","user");
                SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
                if (user==null){
                    JOptionPane.showMessageDialog(null, "用户失效请退出并重新登录", "提示", JOptionPane.WARNING_MESSAGE);
                    return;

 src/main/java/com/example/client/service/Level3AddOrUpdate.java

@@ -13,7 +13,7 @@
import com.example.server.progressTrack.service.NetWorkDiagramService;
import com.example.server.teamGroup.service.SysTeamGroupClassService;
import com.example.server.user.model.SysUser;
import com.example.server.utils.CacheUtils;
import com.example.server.utils.UserAndSiteUtils;
import com.mxgraph.swing.mxGraphComponent;
import com.mxgraph.view.mxGraph;
import org.springframework.beans.factory.annotation.Autowired;
@@ -163,7 +163,7 @@
        btnSave.addActionListener(new ActionListener() {
            @Override
            public void actionPerformed(ActionEvent e) {
                SysUser user = (SysUser) CacheUtils.get("user","user");
                SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
                if (user==null){
                    JOptionPane.showMessageDialog(null, "用户失效请退出并重新登录", "提示", JOptionPane.WARNING_MESSAGE);
                    return;

 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);
        });
    }


 src/main/java/com/example/client/service/Level3ViewService.java

@@ -41,7 +41,7 @@

        // åˆ›å»ºå­è¡¨æ ¼
        List<ColumnDto> columnDto = new ArrayList<>();
        List<DjJdgzNetworkLevel3> list = level3Service.getList(null, null, null, null, null,null);
        List<DjJdgzNetworkLevel3> list = level3Service.getList(null, null, null, null, null,null,null);
        //columnDto.add(new ColumnDto("ID", "id", -1, null,false));



 src/main/java/com/example/client/service/MenuService.java

@@ -4,7 +4,7 @@
import com.example.client.Main;
import com.example.server.menu.model.Menu;
import com.example.server.menu.service.SysMenuService;
import com.example.server.utils.CacheUtils;
import com.example.server.utils.UserAndSiteUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -61,7 +61,7 @@
        node.setMenuName("默认根节点");
        DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(node);

        String site = (String) CacheUtils.get("site", "site");
        String site = (String) UserAndSiteUtils.get("site", "site");
        List<Menu> list = menuService.getList(site);

        createSubNode(rootNode, list);

 src/main/java/com/example/client/service/ShipManageService.java

@@ -12,7 +12,7 @@
import com.example.server.progressTrack.service.DjJdgzNetworkLevel1Service;
import com.example.server.progressTrack.service.DjJdgzShipService;
import com.example.server.user.model.SysUser;
import com.example.server.utils.CacheUtils;
import com.example.server.utils.UserAndSiteUtils;
import org.jdesktop.swingx.JXDatePicker;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -101,7 +101,7 @@
        btnSave.addActionListener(new ActionListener() {
            @Override
            public void actionPerformed(ActionEvent e) {
                SysUser user = (SysUser) CacheUtils.get("user","user");
                SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
                if (user==null){
                    JOptionPane.showMessageDialog(null, "用户失效请退出并重新登录", "提示", JOptionPane.WARNING_MESSAGE);
                    return;

 src/main/java/com/example/client/service/SubunitAddOrUpdate.java

@@ -15,7 +15,7 @@
import com.example.server.progressTrack.service.DjJdgzNetworkLevel3Service;
import com.example.server.teamGroup.service.SysTeamGroupClassService;
import com.example.server.user.model.SysUser;
import com.example.server.utils.CacheUtils;
import com.example.server.utils.UserAndSiteUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -91,7 +91,7 @@
            @Override
            public void actionPerformed(ActionEvent e) {
                nowFrame.setEnabled(false);
                SysUser user = (SysUser) CacheUtils.get("user", "user");
                SysUser user = (SysUser) UserAndSiteUtils.get("user", "user");
                if (user == null) {
                    nowFrame.setEnabled(true);
                    JOptionPane.showMessageDialog(null, "当前用户已失效请重新登录", "提示", JOptionPane.WARNING_MESSAGE);
@@ -176,7 +176,7 @@
        frame1.add(btnSave, new GBC(0, 2, 2, 1).setWeight(1, 0));

        btnSave.addActionListener((e) -> {
            SysUser user = (SysUser) CacheUtils.get("user","user");
            SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
            if (user==null){
                JOptionPane.showMessageDialog(null, "用户失效请退出并重新登录", "提示", JOptionPane.WARNING_MESSAGE);
                return;

 src/main/java/com/example/client/service/SubunitService.java

@@ -120,7 +120,7 @@
        jLeft.add(top, BorderLayout.NORTH);

        List<ColumnDto> columnDto = new ArrayList<>();
        list = level3Service.getList(null, 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],null,null);

        if (list == null || list.size() == 0) {
            JOptionPane.showMessageDialog(null, "还未录入三级网络图数据", "提示", JOptionPane.WARNING_MESSAGE);
@@ -147,7 +147,7 @@
                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,null,null);

                CommonTable.refreshTable(list, columnDto, subTable);
                subTable.setRowHeight(25);
@@ -185,7 +185,7 @@
                        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,null,null);

                        CommonTable.refreshTable(list, columnDto, subTable);
                        subTable.setRowHeight(25);
@@ -215,7 +215,7 @@
                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,null,null);

                CommonTable.refreshTable(list, columnDto, subTable);
                subTable.setRowHeight(25);
@@ -243,7 +243,7 @@
                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,null,null);

                CommonTable.refreshTable(list, columnDto, subTable);
                subTable.setRowHeight(25);
@@ -271,7 +271,7 @@
                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,null,null);

                CommonTable.refreshTable(list, columnDto, subTable);
                subTable.setRowHeight(25);
@@ -294,7 +294,7 @@
        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, subTable);
                subTable.setRowHeight(25);

 src/main/java/com/example/client/service/TeamGroupAddOrUpdate.java

@@ -10,7 +10,7 @@
import com.example.server.teamGroup.service.SysTeamGroupClassService;
import com.example.server.user.model.SysUser;
import com.example.server.user.service.UserService;
import com.example.server.utils.CacheUtils;
import com.example.server.utils.UserAndSiteUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -106,7 +106,7 @@
        saveButton.addActionListener(new ActionListener() {
            @Override
            public void actionPerformed(ActionEvent e) {
                SysUser user = (SysUser) CacheUtils.get("user","user");
                SysUser user = (SysUser) UserAndSiteUtils.get("user", "user");
                if (user==null){
                    JOptionPane.showMessageDialog(null, "用户失效请退出并重新登录", "提示", JOptionPane.WARNING_MESSAGE);
                    return;
@@ -120,7 +120,7 @@
                    data.setSort(sortMax + 100);
                } else {
                    data.setPid(dept.getId());
                    sortMax = sysTeamGroupClassService.getSortMax(dept.getId());
                    sortMax = sysTeamGroupClassService.getSortMax(dept.getId()) == null ? 0 : sysTeamGroupClassService.getSortMax(dept.getId());
                    data.setSort(sortMax + 1);
                }

@@ -130,7 +130,8 @@

                sysTeamGroupClassService.save(data);

                List<SysTeamGroupClass> list = sysTeamGroupClassService.getListByTree();;
                List<SysTeamGroupClass> list = sysTeamGroupClassService.getListByTree();
                ;
                CommonTable.refreshTable(list, columnDto, table);
                teamGroupManageService.tableModelListener(table, jFrame, list);
                frame1.dispose();

 src/main/java/com/example/client/service/TrackRecordAddOrUpdate.java

@@ -11,7 +11,7 @@
import com.example.server.progressTrack.service.*;
import com.example.server.sysOss.model.SysOss;
import com.example.server.user.model.SysUser;
import com.example.server.utils.CacheUtils;
import com.example.server.utils.UserAndSiteUtils;
import org.apache.commons.lang3.StringUtils;
import org.jdesktop.swingx.JXDatePicker;
import org.springframework.beans.factory.annotation.Autowired;
@@ -298,7 +298,7 @@
        saveButton.addActionListener(new ActionListener() {
            @Override
            public void actionPerformed(ActionEvent e) {
                SysUser user = (SysUser) CacheUtils.get("user", "user");
                SysUser user = (SysUser) UserAndSiteUtils.get("user", "user");
                if (user == null) {
                    JOptionPane.showMessageDialog(null, "当前用户已失效请重新登录", "提示", JOptionPane.WARNING_MESSAGE);
                    return;
@@ -343,7 +343,7 @@
                data.setRemark(remark.getText());
                Long id = djJdgzTrackRecordService.save(data);
                uploadFile.save(id);
                List<DjJdgzTrackRecord> list = djJdgzTrackRecordService.getList(level1Id, level3.getDeptId(), null, null, level3.getType(), 0, null);
                List<DjJdgzTrackRecord> list = djJdgzTrackRecordService.getList(level1Id, level3.getDeptId(), null, null, level3.getType(), 0,0, null);
                CommonTable.refreshTable(list, columnDto, table);
                trackRecordManageService.tableModelListener(table, jFrame, list);
                frame1.dispose();

 src/main/java/com/example/client/service/TrackRecordManageService.java

@@ -11,7 +11,7 @@
import com.example.server.progressTrack.service.DjJdgzTrackRecordService;
import com.example.server.teamGroup.service.SysTeamGroupClassService;
import com.example.server.user.model.SysUser;
import com.example.server.utils.CacheUtils;
import com.example.server.utils.UserAndSiteUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -81,35 +81,43 @@
        String[] typeList = new String[]{
                "","改装", "加装", "换装", "修理","改进性修理"
        };
        JComboBoxItem[] isealCabin = {
                new JComboBoxItem(0L, "否"),
                new JComboBoxItem(1L, "是"),
        };

        JLabel JLabel0 = new JLabel("工程");
        JComboBox<JComboBoxItem> comboBox = new JComboBox<>(projectList);
        comboBox.setPreferredSize(new Dimension(150, 28));
        comboBox.setPreferredSize(new Dimension(200, 28));

        JLabel JLabel1 = new JLabel("部门");
        JComboBox<JComboBoxItem> comboBox1 = new JComboBox<>(deptList);
        comboBox1.setPreferredSize(new Dimension(150, 28));
        comboBox1.setPreferredSize(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(150, 28));
        comboBox2.setPreferredSize(new Dimension(140, 28));

        JLabel JLabel3 = new JLabel("舱室");
        JComboBox<JComboBoxItem> comboBox3 = new JComboBox<>(cabinList);
        comboBox3.setPreferredSize(new Dimension(150, 28));
        comboBox3.setPreferredSize(new Dimension(140, 28));

        JLabel JLabel4 = new JLabel("类别");
        JComboBox<String> comboBox4 = new JComboBox<>(typeList);
        comboBox4.setPreferredSize(new Dimension(150, 28));
        comboBox4.setPreferredSize(new Dimension(140, 28));

        JLabel JLabel5 = new JLabel("状态");
        JComboBox<JComboBoxItem> comboBox5 = new JComboBox<>(statusList);
        comboBox5.setPreferredSize(new Dimension(150, 28));
        comboBox5.setPreferredSize(new Dimension(140, 28));

        JLabel JLabel78 = new JLabel("是否影响封舱");
        JComboBox<JComboBoxItem> comboBox7 = new JComboBox<>(isealCabin);
        comboBox7.setPreferredSize(new Dimension(140, 28));

        JTextField sb = new JTextField(16);
        sb.setPreferredSize(new Dimension(150, 28));
        sb.setPreferredSize(new Dimension(140, 28));
        JButton query = new JButton("查询");

        JButton btnTj = new JButton("统计报表");
@@ -126,7 +134,9 @@
                String type = comboBox4.getSelectedItem().toString();
                JComboBoxItem status = (JComboBoxItem) comboBox5.getSelectedItem();

                list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()), null);
                JComboBoxItem isealCabinItem = (JComboBoxItem) comboBox7.getSelectedItem();

                list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()),Math.toIntExact(isealCabinItem.getId()), null);

                CommonTable.refreshTable(list, columnDto, table);
                table.setRowHeight(25);
@@ -149,7 +159,9 @@
                String type = comboBox4.getSelectedItem().toString();
                JComboBoxItem status = (JComboBoxItem) comboBox5.getSelectedItem();

                list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()), null);
                JComboBoxItem isealCabinItem = (JComboBoxItem) comboBox7.getSelectedItem();

                list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()),Math.toIntExact(isealCabinItem.getId()), null);

                CommonTable.refreshTable(list, columnDto, table);
                table.setRowHeight(25);
@@ -168,7 +180,9 @@
                String type = comboBox4.getSelectedItem().toString();
                JComboBoxItem status = (JComboBoxItem) comboBox5.getSelectedItem();

                list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()), null);
                JComboBoxItem isealCabinItem = (JComboBoxItem) comboBox7.getSelectedItem();

                list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()),Math.toIntExact(isealCabinItem.getId()), null);

                CommonTable.refreshTable(list, columnDto, table);
                table.setRowHeight(25);
@@ -187,7 +201,9 @@
                String type = comboBox4.getSelectedItem().toString();
                JComboBoxItem status = (JComboBoxItem) comboBox5.getSelectedItem();

                list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()), null);
                JComboBoxItem isealCabinItem = (JComboBoxItem) comboBox7.getSelectedItem();

                list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()),Math.toIntExact(isealCabinItem.getId()), null);

                CommonTable.refreshTable(list, columnDto, table);
                table.setRowHeight(25);
@@ -205,7 +221,9 @@
                String type = comboBox4.getSelectedItem().toString();
                JComboBoxItem status = (JComboBoxItem) comboBox5.getSelectedItem();

                list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()), null);
                JComboBoxItem isealCabinItem = (JComboBoxItem) comboBox7.getSelectedItem();

                list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()),Math.toIntExact(isealCabinItem.getId()), null);

                CommonTable.refreshTable(list, columnDto, table);
                table.setRowHeight(25);
@@ -223,8 +241,28 @@
                JComboBoxItem cabin = (JComboBoxItem) comboBox3.getSelectedItem();
                String type = comboBox4.getSelectedItem().toString();
                JComboBoxItem status = (JComboBoxItem) comboBox5.getSelectedItem();
                JComboBoxItem isealCabinItem = (JComboBoxItem) comboBox7.getSelectedItem();

                list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()), null);
                list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()),Math.toIntExact(isealCabinItem.getId()), null);

                CommonTable.refreshTable(list, columnDto, table);
                table.setRowHeight(25);

                table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
                tableModelListener(table, jFrame, list);
            }
        });
        comboBox7.addItemListener(new ItemListener() {
            public void itemStateChanged(final ItemEvent event) {
                JComboBoxItem project = (JComboBoxItem) comboBox.getSelectedItem();
                JComboBoxItem dept = (JComboBoxItem) comboBox1.getSelectedItem();
                JComboBoxItem team = (JComboBoxItem) comboBox2.getSelectedItem();
                JComboBoxItem cabin = (JComboBoxItem) comboBox3.getSelectedItem();
                String type = comboBox4.getSelectedItem().toString();
                JComboBoxItem status = (JComboBoxItem) comboBox5.getSelectedItem();
                JComboBoxItem isealCabinItem = (JComboBoxItem) comboBox7.getSelectedItem();

                list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()),Math.toIntExact(isealCabinItem.getId()), null);

                CommonTable.refreshTable(list, columnDto, table);
                table.setRowHeight(25);
@@ -237,7 +275,7 @@
            @Override
            public void actionPerformed(ActionEvent e) {
                JComboBoxItem project = (JComboBoxItem) comboBox.getSelectedItem();
                list = djJdgzTrackRecordService.getList(project.getId(), null, null, null, null, 0, sb.getText());
                list = djJdgzTrackRecordService.getList(project.getId(), null, null, null, null, 0, 0,sb.getText());

                CommonTable.refreshTable(list, columnDto, table);
                table.setRowHeight(25);
@@ -256,7 +294,7 @@
            }
        });

        list = djJdgzTrackRecordService.getList(projectList[0].getId(), deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], Math.toIntExact(statusList[0].getId()), null);
        list = djJdgzTrackRecordService.getList(projectList[0].getId(), deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], Math.toIntExact(statusList[0].getId()),  Math.toIntExact(isealCabin[0].getId()),null);
        if (list == null || list.size() == 0) {
            JOptionPane.showMessageDialog(null, "还未录入三级网络图数据", "提示", JOptionPane.WARNING_MESSAGE);
            return null;
@@ -275,6 +313,7 @@
        columnDto.add(new ColumnDto("一级节点", "level1NodeName", 120, null, false, null, null));
        columnDto.add(new ColumnDto("二级节点", "level2NodeName", 120, null, false, null, null));
        columnDto.add(new ColumnDto("设备名称", "level3NetworkName", 120, null, false, null, null));
        columnDto.add(new ColumnDto("是否影响封舱", "isealCabin", 180, "dict", false, null, isealCabin));
        columnDto.add(new ColumnDto("当前节点", "level3NodeName", 150, null, false, null, null));
        columnDto.add(new ColumnDto("计划完成时间", "requiredCompletionTime", 180, null, false, null, null));
        columnDto.add(new ColumnDto("跟踪记录", "", 100, "", true, buttonList, null));
@@ -297,7 +336,6 @@
        String[] items = itemList.toArray(new String[0]);
        columnModel = table.getColumnModel();
        MultiSelectComboBox2 mulcomboBox = new MultiSelectComboBox2(items, columnDto, columnModel);

/*        final Integer[] lastIndex = {-1};
        mulcomboBox.addItemListener(new ItemListener() {
            @Override
@@ -322,27 +360,28 @@
        });*/

        topJpanel.add(JLabel0, new GBC(0, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
        topJpanel.add(comboBox, new GBC(1, 0, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
        topJpanel.add(JLabel1, new GBC(2, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
        topJpanel.add(comboBox1, new GBC(3, 0, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
        topJpanel.add(JLabel2, new GBC(4, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
        topJpanel.add(comboBox2, new GBC(5, 0, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
        topJpanel.add(JLabel3, new GBC(6, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
        topJpanel.add(comboBox3, new GBC(7, 0, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
        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(JLabel5, new GBC(10, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
        topJpanel.add(comboBox5, new GBC(11, 0, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));

        topJpanel.add(btnTj, new GBC(1, 1, 1, 1).setInsets(5));
        topJpanel.add(btnJc, new GBC(2, 1, 2, 1).setInsets(5));
        topJpanel.add(btnImport, new GBC(4, 1, 2, 1).setInsets(5));
        topJpanel.add(btnExport, new GBC(6, 1, 2, 1).setInsets(5));
        topJpanel.add(mulcomboBox, new GBC(8, 1, 2, 1).setInsets(5));
        topJpanel.add(sb, new GBC(10, 1, 2, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
        topJpanel.add(query, new GBC(12, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
        topJpanel.add(comboBox, new GBC(1, 0, 3, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
        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(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(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(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(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(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(btnTj, new GBC(1, 1, 3, 1).setInsets(5));
        topJpanel.add(btnJc, new GBC(4, 1, 3, 1).setInsets(5));
        topJpanel.add(btnImport, new GBC(7, 1, 3, 1).setInsets(5));
        topJpanel.add(btnExport, new GBC(10, 1, 3, 1).setInsets(5));
        topJpanel.add(mulcomboBox, new GBC(13, 1, 3, 1).setInsets(5));
        topJpanel.add(sb, new GBC(16, 1, 3, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
        topJpanel.add(query, new GBC(19, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
        table.addMouseListener(new MouseAdapter() {
            @Override
            public void mouseClicked(MouseEvent e) {
@@ -530,14 +569,14 @@
                int row = table.rowAtPoint(e.getPoint());
                int col = table.columnAtPoint(e.getPoint());
                DjJdgzTrackRecord djJdgzTrackRecord = list.get(row);
                String site = (String) CacheUtils.get("site", "site");
                String site = (String) UserAndSiteUtils.get("site", "site");

                if (djJdgzTrackRecord.getCurrentStatus() == 1 && site.equals("工作组")) {
                    table.setRowSelectionInterval(row, row);
                    popupMenu.show(e.getComponent(), e.getX(), e.getY());
                    menuItem1.addActionListener(ex -> {
                        djJdgzTrackRecordService.retract(djJdgzTrackRecord.getId());
                        List<DjJdgzTrackRecord> list = djJdgzTrackRecordService.getList(djJdgzTrackRecord.getLevel1NetworkId(), null, null, null, null, 0, null);
                        List<DjJdgzTrackRecord> list = djJdgzTrackRecordService.getList(djJdgzTrackRecord.getLevel1NetworkId(), null, null, null, null, 0,0, null);
                        CommonTable.refreshTable(list, columnDto, table);
                        tableModelListener(table, jFrame, list);
                    });

 src/main/java/com/example/client/service/UserAddOrUpdate.java

@@ -14,7 +14,7 @@
import com.example.server.teamGroup.service.SysTeamGroupClassService;
import com.example.server.user.model.SysUser;
import com.example.server.user.service.UserService;
import com.example.server.utils.CacheUtils;
import com.example.server.utils.UserAndSiteUtils;
import org.apache.commons.lang3.StringUtils;
import org.jdesktop.swingx.JXDatePicker;
import org.springframework.beans.factory.annotation.Autowired;
@@ -59,8 +59,8 @@

        JLabel JLabel0 = new JLabel("用户名");
        JTextField userName = new JTextField(16);
        if (StringUtils.isNotBlank(data.getUsername())) {
            userName.setText(data.getUsername());
        if (StringUtils.isNotBlank(data.getUserName())) {
            userName.setText(data.getUserName());
        }

        JLabel JLabel1 = new JLabel("昵称");
@@ -139,7 +139,7 @@
        saveButton.addActionListener(new ActionListener() {
            @Override
            public void actionPerformed(ActionEvent e) {
                SysUser user = (SysUser) CacheUtils.get("user","user");
                SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
                if (user==null){
                    JOptionPane.showMessageDialog(null, "用户失效请退出并重新登录", "提示", JOptionPane.WARNING_MESSAGE);
                    return;
@@ -150,7 +150,7 @@
                data.setDept(String.valueOf(dept.getId()));
                data.setTeamgroup(String.valueOf(team.getId()));
                //data.setBoatfleet(String.valueOf(boat.getId()));
                data.setUsername(userName.getText());
                data.setUserName(userName.getText());
                data.setNickName(nickName.getText());
                data.setPassword(passWord.getText());
                userService.save(data);

 src/main/java/com/example/client/service/UserManageService.java

@@ -75,7 +75,7 @@
        columnDto = new ArrayList<>();
        //columnDto.add(new ColumnDto("ID", "id", -1, null,false));
        columnDto.add(new ColumnDto("序号", "", (width - 10) / 7, "autoCreate", false, null,null));
        columnDto.add(new ColumnDto("用户名", "username", (width - 10) / 7, null, false, null,null));
        columnDto.add(new ColumnDto("用户名", "userName", (width - 10) / 7, null, false, null,null));
        columnDto.add(new ColumnDto("昵称", "nickName", (width - 10) / 7, null, false, null,null));
        columnDto.add(new ColumnDto("密码", "password", (width - 10) / 7, null, false, null,null));
        //columnDto.add(new ColumnDto("所属T队", "boatFleetId", (width - 10) / 8, "dict", true, null,boatList));

 src/main/java/com/example/client/utils/MultiSelectComboBox2.java

@@ -18,7 +18,6 @@
        super(items);
        this.defaultText = "自定义表头"; // è®¾ç½®é»˜è®¤æ–‡æœ¬
        setEditable(true);

        // è‡ªå®šä¹‰æ¸²æŸ“器
        setRenderer(new DefaultListCellRenderer() {
            @Override

 src/main/java/com/example/server/DataSync/service/DataSyncService.java

@@ -11,7 +11,7 @@
import com.example.server.progressTrack.dao.ImportRecordDao;
import com.example.server.progressTrack.model.ExportRecord;
import com.example.server.progressTrack.model.ImportRecord;
import com.example.server.utils.CacheUtils;
import com.example.server.utils.UserAndSiteUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -63,7 +63,7 @@
        String configPath = configPath2;
        String directoryPath = localPath + "life-protection";

        String mySite = (String) CacheUtils.get("site", "site");
        String mySite = (String) UserAndSiteUtils.get("site", "site");

        // å¼¹å‡ºæ–‡ä»¶é€‰æ‹©æ¡†ï¼Œè®©ç”¨æˆ·é€‰æ‹©ä¿å­˜ZIP文件的路径
        String outputZipPath = showSaveFileDialog(mySite + "同步数据包.zip");
@@ -171,9 +171,13 @@
            e.printStackTrace();
        }

        String mySite = (String) CacheUtils.get("site", "site");
        String mySite = (String) UserAndSiteUtils.get("site", "site");
        String otherSite = properties.get("site").toString();
        if ("工作组".equals(mySite)) {
            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_handover");
            syncTable("dj_jdgz_network_level3");
            syncTable("dj_jdgz_network_level3_list");
@@ -205,8 +209,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)) {
@@ -219,6 +223,7 @@
            syncTable("dj_jdgz_network_level3_list");
            syncTable("dj_jdgz_track_record");
            syncTable("dj_sys_oss");
            syncTable("dj_jdgz_ship");
            syncTable("dj_jdgz_dismant_track");
        }
        ImportRecord data =new ImportRecord();

 src/main/java/com/example/server/entity/FieldMetaObjectHandler.java

@@ -14,7 +14,7 @@
import com.example.client.entity.TenantEntity;
import com.example.server.progressTrack.model.TeamEntity;
import com.example.server.user.model.SysUser;
import com.example.server.utils.CacheUtils;
import com.example.server.utils.UserAndSiteUtils;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.stereotype.Component;

@@ -35,7 +35,7 @@
    @Override
    public void insertFill(MetaObject metaObject) {
        Object object = metaObject.getOriginalObject();
        SysUser user = (SysUser) CacheUtils.get("user","user");
        SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
        LocalDateTime currentDateTime = LocalDateTime.now();
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
        // å°†å½“前日期格式化为字符串
@@ -43,8 +43,8 @@

        if (object instanceof TeamEntity) {
            TeamEntity entity = (TeamEntity) object;
            entity.setCreateTeam(user.getBoatfleet());// åˆ›å»ºè€…
            entity.setUpdateTeam(user.getBoatfleet());// åˆ›å»ºè€…
            entity.setCreateTeam(user.getBoatFleet());// åˆ›å»ºè€…
            entity.setUpdateTeam(user.getBoatFleet());// åˆ›å»ºè€…
        }

        if (object instanceof PlatformLogEntity) {
@@ -70,7 +70,7 @@
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
        // å°†å½“前日期格式化为字符串
        String date = currentDateTime.format(formatter);
        SysUser user =(SysUser) CacheUtils.get("user","user");
        SysUser user =(SysUser) UserAndSiteUtils.get("user","user");
        Object object = metaObject.getOriginalObject();
        if (object instanceof PlatformEntity) {
            PlatformEntity entity = (PlatformEntity) object;
@@ -80,7 +80,7 @@

        if (object instanceof TeamEntity) {
            TeamEntity entity = (TeamEntity) object;
            entity.setUpdateTeam(user.getBoatfleet());// åˆ›å»ºè€…
            entity.setUpdateTeam(user.getBoatFleet());// åˆ›å»ºè€…
        }
    }


 src/main/java/com/example/server/progressTrack/dao/DjJdgzNetworkLevel3Dao.java

@@ -21,7 +21,7 @@
@Mapper
public interface DjJdgzNetworkLevel3Dao extends BaseDao<DjJdgzNetworkLevel3> {

    List<DjJdgzNetworkLevel3> getList(Long shipId, Long deptId, Long teamId, Long cabinId, String type,String name);
    List<DjJdgzNetworkLevel3> getList(Long shipId, Long deptId, Long teamId, Long cabinId, String type,Integer isealCabin,String name);
    List<NetworkNodeStatusDto> getNodeStatusData(Long id);

    void deleteLevel3(Long id);

 src/main/java/com/example/server/progressTrack/dao/DjJdgzTrackRecordDao.java

@@ -20,7 +20,7 @@
@Mapper
public interface DjJdgzTrackRecordDao extends BaseDao<DjJdgzTrackRecord> {

    List<DjJdgzTrackRecord> getList(Long level1NetworkId, Long deptId, Long teamId, Long cabinId, String type, Integer status, String name);
    List<DjJdgzTrackRecord> getList(Long level1NetworkId, Long deptId, Long teamId, Long cabinId, String type, Integer status,Integer isealCabin, String name);

    List<DjJdgzTrackRecord> getHistory(Long level3NodeId);


 src/main/java/com/example/server/progressTrack/model/DjJdgzNetworkLevel3.java

@@ -31,6 +31,9 @@
    @ApiModelProperty(value = "网络图名称（设备名称）")
    private String name;

    @ApiModelProperty(value = "是否影响封舱")
    private Integer isealCabin;

    @ApiModelProperty(value = "班组专业ID")
    private Long teamgroupId;


 src/main/java/com/example/server/progressTrack/model/DjJdgzTrackRecord.java

@@ -118,6 +118,10 @@

    @TableField(exist = false)
    @ApiModelProperty(value = "")
    private Integer isealCabin;

    @TableField(exist = false)
    @ApiModelProperty(value = "")
    private Integer trackNum;

    @TableField(exist = false)

 src/main/java/com/example/server/progressTrack/service/DjJdgzDismantTrackService.java

@@ -93,7 +93,7 @@
            sheetName = sheet.getSheetName(); //获取当前sheet名称
            sum = sum + num;

            List<DjJdgzNetworkLevel3> list = djJdgzNetworkLevel3Service.getList(null, null, null, null, null,null);
            List<DjJdgzNetworkLevel3> list = djJdgzNetworkLevel3Service.getList(null, null, null, null, null,null,null);
            JComboBoxItem[] list1 = cabinService.getList();



 src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel3Service.java

@@ -60,8 +60,8 @@
    String[] fillColorArr = {"#e5e5e5", "#3498DB", "#F1C40F", "#E74C3C", "#2ECC71", "#006400"};
    String[] fontColorArr = {"#e5e5e5", "#3498DB", "#F1C40F", "#E74C3C", "#2ECC71", "#006400"};

    public List<DjJdgzNetworkLevel3> getList(Long shipId, Long deptId, Long teamId, Long cabinId, String type, String name) {
        List<DjJdgzNetworkLevel3> list = baseDao.getList(shipId, deptId, teamId, cabinId, type, name);
    public List<DjJdgzNetworkLevel3> getList(Long shipId, Long deptId, Long teamId, Long cabinId, String type,Integer isealCabin, String name) {
        List<DjJdgzNetworkLevel3> list = baseDao.getList(shipId, deptId, teamId, cabinId, type,isealCabin, name);
        return list;
    }

@@ -172,21 +172,27 @@
                Row row = sheet.getRow(j);

                String name = ImportUtil.getCellValue(row, 0, pattern);
                String deptStr = ImportUtil.getCellValue(row, 1, pattern);
                String teamGroupStr = ImportUtil.getCellValue(row, 2, pattern);
                String cabinStr = ImportUtil.getCellValue(row, 3, pattern);
                String typeStr = ImportUtil.getCellValue(row, 4, pattern);
                String time1 = ImportUtil.getCellValue(row, 5, pattern);
                String time2 = ImportUtil.getCellValue(row, 6, pattern);
                String time3 = ImportUtil.getCellValue(row, 7, pattern);
                String time4 = ImportUtil.getCellValue(row, 8, pattern);
                String time5 = ImportUtil.getCellValue(row, 9, pattern);
                String repairUnit = ImportUtil.getCellValue(row, 10, pattern);
                String repairUnitDirector = ImportUtil.getCellValue(row, 11, pattern);
                String repairUnitContact = ImportUtil.getCellValue(row, 12, pattern);
                String generalRepairUnit = ImportUtil.getCellValue(row, 13, pattern);
                String generalRepairUnitDirector = ImportUtil.getCellValue(row, 14, pattern);
                String generalRepairUnitContact = ImportUtil.getCellValue(row, 15, pattern);
                String isealCabinStr = ImportUtil.getCellValue(row, 1, pattern);
                String deptStr = ImportUtil.getCellValue(row, 2, pattern);
                String teamGroupStr = ImportUtil.getCellValue(row, 3, pattern);
                String cabinStr = ImportUtil.getCellValue(row, 4, pattern);
                String typeStr = ImportUtil.getCellValue(row, 5, pattern);
                String time1 = ImportUtil.getCellValue(row, 6, pattern);
                String time2 = ImportUtil.getCellValue(row, 7, pattern);
                String time3 = ImportUtil.getCellValue(row, 8, pattern);
                String time4 = ImportUtil.getCellValue(row, 9, pattern);
                String time5 = ImportUtil.getCellValue(row, 10, pattern);
                String repairUnit = ImportUtil.getCellValue(row, 11, pattern);
                String repairUnitDirector = ImportUtil.getCellValue(row, 12, pattern);
                String repairUnitContact = ImportUtil.getCellValue(row, 13, pattern);
                String generalRepairUnit = ImportUtil.getCellValue(row, 14, pattern);
                String generalRepairUnitDirector = ImportUtil.getCellValue(row, 15, pattern);
                String generalRepairUnitContact = ImportUtil.getCellValue(row, 16, pattern);

                Integer isealCabin = 0;
                if (isealCabinStr.equals("是")){
                    isealCabin = 1;
                }

                Long id = UUIDUtil.generateId();
                if (StringUtils.isEmpty(name)) {
@@ -200,6 +206,7 @@
                    data.setLevel1NetworkId(level1NetworkId);
                    data.setLevel2NetworkId(level2NetworkId);
                    data.setLevel2NodeId(level2NodeId);
                    data.setIsealCabin(isealCabin);
                }

                if (StringUtils.isEmpty(deptStr)) {

 src/main/java/com/example/server/progressTrack/service/DjJdgzTrackRecordService.java

@@ -58,7 +58,7 @@
    private SysTeamGroupClassService sysTeamGroupClassService;


    public List<DjJdgzTrackRecord> getList(Long level1NetworkId, Long deptId, Long teamId, Long cabinId, String type, Integer status, String name) {
    public List<DjJdgzTrackRecord> getList(Long level1NetworkId, Long deptId, Long teamId, Long cabinId, String type, Integer status,Integer isealCabin, String name) {
        Long userId = null;
       /* Map adminRole = sysUserService.adminRole();
        Object isTyRole = adminRole.get("isTyRole");
@@ -66,7 +66,7 @@
        if (isTyRole.equals(true) || isYwzRole.equals(true)) {
            userId =  UserContext.getUser().getId();
        }*/
        List<DjJdgzTrackRecord> list = baseDao.getList(level1NetworkId, deptId, teamId, cabinId, type, status, name);
        List<DjJdgzTrackRecord> list = baseDao.getList(level1NetworkId, deptId, teamId, cabinId, type, status, isealCabin,name);
        /*if (list != null && list.size() > 0) {
            sysOssService.setListOsses(list, "ProjectProgressFileUpload");
        }*/
@@ -480,15 +480,15 @@
                }

                if (StringUtils.isNotBlank(trackedPerson)) {
                    data.setTrackPerson(trackPersonStr);
                    data.setTrackedPerson(trackedPerson);
                }

                if (StringUtils.isNotBlank(trackedPersonContact)) {
                    data.setTrackPersonContact(trackPersonContact);
                    data.setTrackedPersonContact(trackedPersonContact);
                }

                if (StringUtils.isNotBlank(trackedPersonUnit)) {
                    data.setTrackPersonUnit(trackPersonUnit);
                    data.setTrackedPersonUnit(trackedPersonUnit);
                }
                if (StringUtils.isNotBlank(generalRepairUnit)) {
                    data.setGeneralRepairUnit(generalRepairUnit);

 src/main/java/com/example/server/user/model/SysUser.java

@@ -43,7 +43,7 @@
    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "用户名", required = true)
    private String username;
    private String userName;

    @ApiModelProperty(value = "昵称", required = true)
    private String nickName;
@@ -58,7 +58,7 @@
    private String teamgroup;

    @ApiModelProperty(value = "T队")
    private String boatfleet;
    private String boatFleet;

    @TableField(exist = false)
    private Boolean exist;

 src/main/java/com/example/server/utils/UserAndSiteUtils.java

New file
@@ -0,0 +1,31 @@
package com.example.server.utils;

import com.example.server.user.model.SysUser;

public class UserAndSiteUtils {
    private static SysUser sysUser;
    private static String site;
    public static void put(String a,String b,Object value){
        if (a.equals("site")){
            site = value.toString();
        }else{
            sysUser = (SysUser)value;
        }
    }
    public static Object get(String a,String b){
        Object value = new Object();
        if (a.equals("site")){
            value = site;
        }else{
            value = sysUser;
        }
        return value;
    }
    public static void remove(String a,String b){
        if (a.equals("site")){
            site = null;
        }else{
            sysUser = null;
        }
    }
}

 src/main/resources/db/csiczb1.db

Binary files differ

 src/main/resources/mapper/progressTrack/DjJdgzNetworkLevel3Dao.xml

@@ -49,6 +49,9 @@
        <if test="cabinId!=null">
            and a.cabin_id = ${cabinId}
        </if>
        <if test="isealCabin!=null">
            and a.iseal_cabin = ${isealCabin}
        </if>
        <if test="type!=null and type!=''">
            and a.type = #{type}
        </if>

 src/main/resources/mapper/progressTrack/DjJdgzTrackRecordDao.xml

@@ -35,6 +35,7 @@
        c.teamgroup_name,
        c.dept_id,
        c.cabin_id,
        c.iseal_cabin,
        c.type,
        c.`NAME` as level3NetworkName,
        a.PROCESS_NAME AS level3NodeName,
@@ -88,6 +89,9 @@
        <if test="deptId!=null">
            and c.dept_id = ${deptId}
        </if>
        <if test="isealCabin!=null">
            and c.iseal_cabin = ${isealCabin}
        </if>
        <if test="teamId!=null">
            and c.TEAMGROUP_ID = ${teamId}
        </if>

 src/main/resources/templateFile/Èý¼¶ÍøÂçͼµ¼ÈëÄ£°å.xlsx

Binary files differ

 src/main/resources/templateFile/¸ú×ټǼµ¼ÈëÄ£°å.xlsx

Binary files differ