修改

jinlin

2025-04-28 efce7ce3e63712ecc8b4c3039a73b508fc3ea880

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

@@ -75,7 +75,7 @@
        JComboBoxItem[] cabinList = cabinService.getList();
        JComboBoxItem[] deptList = sysTeamGroupClassService.getDeptList();
        String[] typeList = new String[]{
                "","改装", "加装", "换装", "修理","改进性修理"
                "","改换装","修理","改进性修理","不复装设备"
        };
        JComboBoxItem[] isealCabin = {
                new JComboBoxItem(10000L, ""),
@@ -109,6 +109,10 @@
        JComboBox<JComboBoxItem> comboBox5 = new JComboBox<>(isealCabin);
        comboBox5.setPreferredSize(new Dimension(185, 28));

        JLabel JLabel6 = new JLabel("是否联调");
        JComboBox<JComboBoxItem> comboBox6 = new JComboBox<>(isealCabin);
        comboBox6.setPreferredSize(new Dimension(185, 28));

        JTextField sb = new JTextField(16);
        JButton query = new JButton("查询");

@@ -128,12 +132,14 @@

        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));
        topJpanel.add(JLabel6, new GBC(2, 1, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
        topJpanel.add(comboBox6, new GBC(3, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
        topJpanel.add(sb, new GBC(4, 1, 2, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
        topJpanel.add(query, new GBC(6, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
        topJpanel.add(btnInsert, new GBC(7, 1, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
        topJpanel.add(btnImport, new GBC(8, 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], Math.toIntExact(isealCabin[0].getId()), null);
        list = level3Service.getList(shipList.get(0).getId(), deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], Math.toIntExact(isealCabin[0].getId()),Math.toIntExact(isealCabin[0].getId()), null);
        List<TableButton> buttonList = new ArrayList<>();
        buttonList.add(new TableButton("edit", "编辑"));
        buttonList.add(new TableButton("del", "删除"));
@@ -141,16 +147,17 @@

        columnDto = new ArrayList<>();
        //columnDto.add(new ColumnDto("ID", "id", -1, null,false));
        columnDto.add(new ColumnDto("序号", "", 100, "autoCreate", false, null, null));
        columnDto.add(new ColumnDto("序号", "", 80, "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", 100, "dict", false, null, cabinList));
        columnDto.add(new ColumnDto("部门", "deptId", 150, "dict", false, null, deptList));
        columnDto.add(new ColumnDto("专业", "teamgroupId", 150, "dict", false, null, teamList));
        columnDto.add(new ColumnDto("舱室", "cabinId", 80, "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("是否影响封舱", "isealCabin", 160, "dict", false, null, isealCabin));
        columnDto.add(new ColumnDto("是否联调", "islt", 100, "dict", false, null, isealCabin));
        columnDto.add(new ColumnDto("操作", "", 190, "", true, buttonList, null));

        table = CommonTable.createCommonTable(list, columnDto);
@@ -171,9 +178,10 @@
                JComboBoxItem cabin = (JComboBoxItem) comboBox3.getSelectedItem();
                String type = comboBox4.getSelectedItem().toString();
                JComboBoxItem isCabin = (JComboBoxItem) comboBox5.getSelectedItem();
                JComboBoxItem isLt = (JComboBoxItem) comboBox6.getSelectedItem();

                Long shipId = shipMap.get(content);
                list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(isCabin.getId()),null);
                list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(isCabin.getId()),Math.toIntExact(isLt.getId()),null);

                CommonTable.refreshTable(list, columnDto, table);
                table.setRowHeight(25);
@@ -199,9 +207,10 @@
                        JComboBoxItem cabin = (JComboBoxItem) comboBox3.getSelectedItem();
                        JComboBoxItem isCabin = (JComboBoxItem) comboBox5.getSelectedItem();
                        String type = comboBox4.getSelectedItem().toString();
                        JComboBoxItem isLt = (JComboBoxItem) comboBox6.getSelectedItem();

                        Long shipId = shipMap.get(content);
                        list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(isCabin.getId()),null);
                        list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(isCabin.getId()),Math.toIntExact(isLt.getId()),null);
                        CommonTable.refreshTable(list, columnDto, table);
                        table.setRowHeight(25);

@@ -222,8 +231,10 @@
                JComboBoxItem isCabin = (JComboBoxItem) comboBox5.getSelectedItem();
                String type = comboBox4.getSelectedItem().toString();

                JComboBoxItem isLt = (JComboBoxItem) comboBox6.getSelectedItem();

                Long shipId = shipMap.get(content);
                list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(isCabin.getId()),null);
                list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(isCabin.getId()),Math.toIntExact(isLt.getId()),null);

                CommonTable.refreshTable(list, columnDto, table);
                table.setRowHeight(25);
@@ -240,9 +251,10 @@
                JComboBoxItem cabin = (JComboBoxItem) comboBox3.getSelectedItem();
                JComboBoxItem isCabin = (JComboBoxItem) comboBox5.getSelectedItem();
                String type = comboBox4.getSelectedItem().toString();
                JComboBoxItem isLt = (JComboBoxItem) comboBox6.getSelectedItem();

                Long shipId = shipMap.get(content);
                list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(isCabin.getId()),null);
                list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(isCabin.getId()),Math.toIntExact(isLt.getId()),null);

                CommonTable.refreshTable(list, columnDto, table);
                table.setRowHeight(25);
@@ -259,9 +271,10 @@
                JComboBoxItem cabin = (JComboBoxItem) comboBox3.getSelectedItem();
                JComboBoxItem isCabin = (JComboBoxItem) comboBox5.getSelectedItem();
                String type = comboBox4.getSelectedItem().toString();
                JComboBoxItem isLt = (JComboBoxItem) comboBox6.getSelectedItem();

                Long shipId = shipMap.get(content);
                list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(isCabin.getId()),null);
                list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(isCabin.getId()),Math.toIntExact(isLt.getId()),null);

                CommonTable.refreshTable(list, columnDto, table);
                table.setRowHeight(25);
@@ -280,8 +293,31 @@
                JComboBoxItem isCabin = (JComboBoxItem) comboBox5.getSelectedItem();
                String type = comboBox4.getSelectedItem().toString();

                JComboBoxItem isLt = (JComboBoxItem) comboBox6.getSelectedItem();

                Long shipId = shipMap.get(content);
                list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(isCabin.getId()),null);
                list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(isCabin.getId()),Math.toIntExact(isLt.getId()),null);

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

                table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
                tableModelListener(list, table, jFrame);
            }
        });
        comboBox6.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();

                JComboBoxItem isLt = (JComboBoxItem) comboBox6.getSelectedItem();

                Long shipId = shipMap.get(content);
                list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(isCabin.getId()),Math.toIntExact(isLt.getId()),null);

                CommonTable.refreshTable(list, columnDto, table);
                table.setRowHeight(25);
@@ -295,7 +331,7 @@
        query.addActionListener(new ActionListener() {
            @Override
            public void actionPerformed(ActionEvent e) {
                list = level3Service.getList(null, null, null, null, null,null, sb.getText());
                list = level3Service.getList(null, null, null, null, null,null,null, sb.getText());

                CommonTable.refreshTable(list, columnDto, table);
                table.setRowHeight(25);
@@ -346,7 +382,7 @@

    public void insert(JFrame jFrame,DjJdgzNetworkLevel3 data) {
        JFrame frame1 = new JFrame("新增三级网络图");
        frame1.setSize(500, 460);
        frame1.setSize(500, 500);
        frame1.setResizable(true);
        frame1.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
        frame1.setLocationRelativeTo(null);
@@ -366,7 +402,7 @@
        JComboBoxItem[] cabinList = cabinService.getList();
        JComboBoxItem[] teamList = sysTeamGroupClassService.getTeamList(null);
        String[] typeList = new String[]{
                "","改装", "加装", "换装", "修理","改进性修理"
                "","改换装","修理","改进性修理","不复装设备"
        };
        JComboBoxItem[] isealCabin = {
                new JComboBoxItem(0L, "否"),
@@ -450,6 +486,13 @@
            comboBox7.setSelectedItem(BoxIteUtils.GetSelectItemById(isealCabin, Long.valueOf(data.getIsealCabin())));
        }

        JLabel JLabel789 = new JLabel("是否联调");
        JComboBox<JComboBoxItem> comboBox78 = new JComboBox<>(isealCabin);
        comboBox78.setPreferredSize(new Dimension(185, 28));
        if (data.getIslt()!=null){
            comboBox78.setSelectedItem(BoxIteUtils.GetSelectItemById(isealCabin, Long.valueOf(data.getIslt())));
        }

        JLabel JLabel8 = new JLabel("三级网络图名称");
        JTextField level3Name = new JTextField(16);
        if (StringUtils.isNotBlank(data.getName())){
@@ -526,11 +569,14 @@
        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(JLabel789, new GBC(0, 8, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
        frame1.add(comboBox78, new GBC(1, 8, 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, 9, 2, 1).setWeight(1, 0));
        frame1.add(JLabel8, new GBC(0, 9, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
        frame1.add(level3Name, new GBC(1, 9, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));

        frame1.add(btnSave, new GBC(0, 10, 2, 1).setWeight(1, 0));

        btnSave.addActionListener((e) -> {
            JComboBoxItem level1 = (JComboBoxItem) comboBox0.getSelectedItem();
@@ -539,6 +585,7 @@
            JComboBoxItem dept = (JComboBoxItem) comboBox3.getSelectedItem();
            JComboBoxItem team = (JComboBoxItem) comboBox4.getSelectedItem();
            JComboBoxItem isealCabinItem = (JComboBoxItem) comboBox7.getSelectedItem();
            JComboBoxItem iltItem = (JComboBoxItem) comboBox78.getSelectedItem();
            Set<JComboBoxItem> selectedItems = comboBox5.getSelectedItems();
            StringBuilder selectedIds = new StringBuilder();
            for (JComboBoxItem item : selectedItems) {
@@ -551,6 +598,7 @@
            data.setLevel2NodeId(level2Node.getId());
            data.setName(name);
            data.setIsealCabin(Math.toIntExact(isealCabinItem.getId()));
            data.setIslt(Math.toIntExact(iltItem.getId()));
            data.setDeptId(dept.getId());
            data.setTeamgroupId(team.getId());
            data.setTeamgroupName(team.getName());
@@ -562,7 +610,7 @@
                level3Service.insert(data);
            }

            list = level3Service.getList(level1Data.getShipId(), deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], Math.toIntExact(isealCabin[0].getId()), null);
            list = level3Service.getList(level1Data.getShipId(), deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], Math.toIntExact(isealCabin[0].getId()),Math.toIntExact(isealCabin[0].getId()), null);
            CommonTable.refreshTable(list, columnDto, table);
            table.setRowHeight(25);