修改

jinlin

4 天以前 66f0597bf6a1e79540c6bc51dedf561c22f3bdb5

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

@@ -3,10 +3,7 @@
import com.example.client.dto.ColumnDto;
import com.example.client.dto.JComboBoxItem;
import com.example.client.model.TableButton;
import com.example.client.utils.CommonTable;
import com.example.client.utils.Compute;
import com.example.client.utils.GBC;
import com.example.client.utils.MultiSelectComboBox;
import com.example.client.utils.*;
import com.example.server.cabin.service.CabinService;
import com.example.server.progressTrack.model.DjJdgzNetworkLevel1;
import com.example.server.progressTrack.model.DjJdgzNetworkLevel3;
@@ -19,6 +16,7 @@

import javax.swing.*;
import javax.swing.event.TableModelEvent;
import javax.swing.plaf.basic.BasicComboBoxRenderer;
import javax.swing.table.DefaultTableModel;
import java.awt.*;
import java.awt.event.*;
@@ -78,7 +76,7 @@
        JComboBoxItem[] cabinList = cabinService.getList();
        JComboBoxItem[] deptList = sysTeamGroupClassService.getDeptList();
        String[] typeList = new String[]{
                "","改装", "加装", "换装", "修理","改进性修理"
                "","改换装","修理","改进性修理","不复装设备"
        };
        JComboBoxItem[] isealCabin = {
                new JComboBoxItem(10000L, ""),
@@ -112,6 +110,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("查询");

@@ -131,12 +133,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", "删除"));
@@ -144,16 +148,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);
@@ -174,9 +179,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);
@@ -202,9 +208,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);

@@ -225,8 +232,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);
@@ -243,9 +252,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);
@@ -262,9 +272,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);
@@ -283,8 +294,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);
@@ -298,7 +332,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);
@@ -314,7 +348,8 @@
            @Override
            public void actionPerformed(ActionEvent e) {
                jFrame.setEnabled(false);
                insert(jFrame);
                DjJdgzNetworkLevel3 data = new DjJdgzNetworkLevel3();
                insert(jFrame,data);
            }
        });

@@ -346,9 +381,9 @@
        return panel;
    }

    private void insert(JFrame jFrame) {
    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);
@@ -368,7 +403,7 @@
        JComboBoxItem[] cabinList = cabinService.getList();
        JComboBoxItem[] teamList = sysTeamGroupClassService.getTeamList(null);
        String[] typeList = new String[]{
                "","改装", "加装", "换装", "修理","改进性修理"
                "","改换装","修理","改进性修理","不复装设备"
        };
        JComboBoxItem[] isealCabin = {
                new JComboBoxItem(0L, "否"),
@@ -379,38 +414,105 @@
        JComboBox<JComboBoxItem> comboBox0 = new JComboBox<>(projectList);
        comboBox0.setPreferredSize(new Dimension(185, 28));
        comboBox0.setSelectedIndex(-1);
        if (data.getLevel1NetworkId()!=null){
            comboBox0.setSelectedItem(BoxIteUtils.GetSelectItemById(projectList, data.getLevel1NetworkId()));
        }

        JLabel JLabel2 = new JLabel("二级网络图");
        JComboBox<JComboBoxItem> comboBox1 = new JComboBox<>();
        comboBox1.setPreferredSize(new Dimension(185, 28));
        if (data.getLevel2NetworkId()!=null){
            JComboBoxItem[] level2List = level2Service.getLevel2List(data.getLevel1NetworkId());
            comboBox1.setModel(new DefaultComboBoxModel<>(level2List));
            comboBox1.setSelectedItem(BoxIteUtils.GetSelectItemById(level2List, data.getLevel2NetworkId()));
        }

        JLabel JLabel3 = new JLabel("二级网络图节点");
        JComboBox<JComboBoxItem> comboBox2 = new JComboBox<>();
        comboBox2.setRenderer(new BasicComboBoxRenderer() {
            @Override
            public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
                super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);

                // 设置工具提示
                if (value != null) {
                    setText(value.toString());
                    setToolTipText(value.toString()); // 设置工具提示为完整的选项文本
                }

                return this;
            }
        });
        comboBox2.setPreferredSize(new Dimension(185, 28));
        if (data.getLevel2NodeId()!=null){
            JComboBoxItem[] level2NodeList = level2ListService.getNode(data.getLevel2NetworkId());
            comboBox2.setModel(new DefaultComboBoxModel<>(level2NodeList));
            comboBox2.setSelectedItem(BoxIteUtils.GetSelectItemById(level2NodeList, data.getLevel2NodeId()));
        }

        JLabel JLabel4 = new JLabel("部门");
        JComboBox<JComboBoxItem> comboBox3 = new JComboBox<>(deptList);
        comboBox3.setPreferredSize(new Dimension(185, 28));
        if (data.getDeptId()!=null){
            comboBox3.setSelectedItem(BoxIteUtils.GetSelectItemById(deptList, data.getDeptId()));
        }

        JComboBoxItem[] teamList1 = sysTeamGroupClassService.getTeamList(deptList[0].getId());

        JLabel JLabel5 = new JLabel("专业");
        JComboBox<JComboBoxItem> comboBox4 = new JComboBox<>(teamList1);
        comboBox4.setPreferredSize(new Dimension(185, 28));
        if (data.getTeamgroupId()!=null){
            JComboBoxItem[] teamList3 = sysTeamGroupClassService.getTeamList(data.getDeptId());
            comboBox4.setModel(new DefaultComboBoxModel<>(teamList3));
            comboBox4.setSelectedItem(BoxIteUtils.GetSelectItemById(teamList3, data.getTeamgroupId()));
        }

        JLabel JLabel6 = new JLabel("舱室");
        MultiSelectComboBox comboBox5 = new MultiSelectComboBox(cabinList);
        comboBox5.setPreferredSize(new Dimension(200, 25));
        if (data.getCabinId()!=null){
            Set<Long> selectedIds = new HashSet<>();
            String[] idParts = data.getCabinId().split(",");
            for (String idPart : idParts) {
                selectedIds.add(Long.parseLong(idPart.trim())); // 将字符串转换为 Long 类型并添加到集合中
            }

            // 将 ID 转换为对应的 JComboBoxItem 对象
            Set<JComboBoxItem> selectedItems = new HashSet<>();
            for (JComboBoxItem item : cabinList) {
                if (selectedIds.contains(item.getId())) { // 检查 Long 类型的 ID 是否匹配
                    selectedItems.add(item); // 添加到选中项集合
                }
            }
            comboBox5.setSelectedItems(selectedItems);
        }

        JLabel JLabel7 = new JLabel("类别");
        JComboBox<String> comboBox6 = new JComboBox<>(typeList);
        if (data.getType()!=null){
            comboBox6.setSelectedItem(data.getType());
        }

        JLabel JLabel78 = new JLabel("是否影响封舱");
        JComboBox<JComboBoxItem> comboBox7 = new JComboBox<>(isealCabin);
        comboBox7.setPreferredSize(new Dimension(185, 28));
        if (data.getIsealCabin()!=null){
            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())){
            level3Name.setText(data.getName());
        }

        comboBox0.addItemListener(new ItemListener() {
            @Override
@@ -482,11 +584,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();
@@ -495,26 +600,32 @@
            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) {
                selectedIds.append(item.getId()).append(",");
            }
            String name = level3Name.getText();
            DjJdgzNetworkLevel3 data = new DjJdgzNetworkLevel3();
            DjJdgzNetworkLevel1 level1Data = level1Service.get(level1.getId());
            data.setLevel1NetworkId(level1.getId());
            data.setLevel2NetworkId(level2.getId());
            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());
            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], Math.toIntExact(isealCabin[0].getId()), null);
            if (data.getId()!=null){
                level3Service.update(data);
            }else{
                level3Service.insert(data);
            }

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