jar

jinlin

2025-03-04 23f02e6b45dd7cf0ab2e7827144913ca59575ea4

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

@@ -7,6 +7,7 @@
import com.example.server.major.service.SysMajorService;
import com.example.server.progressTrack.Dto.DiagramMajorDto;
import com.example.server.progressTrack.Dto.DiagramNode2Dto;
import com.example.server.progressTrack.Dto.DiagramNodeDto;
import com.example.server.progressTrack.dao.DjJdgzNetworkLevel2ListDao;
import com.example.server.progressTrack.model.DjJdgzNetworkLevel1;
import com.example.server.progressTrack.model.DjJdgzNetworkLevel1List;
@@ -92,14 +93,10 @@
        baseDao.updateData(djJdgzNetworkLevel2List.getId(), djJdgzNetworkLevel2List.getExpireSituation());
    }

    public void save(Long networkId, JPanel jPanel, mxGraph graph) {
    public void saveDiagram(Long networkId, JPanel jPanel, mxGraph graph) {
        List<DiagramNodeDto> list2 = baseDao.getNodeList(networkId);
        String simpleDiagram = netWorkDiagramService.createSimpleDiagram(list2);
        DjJdgzNetworkLevel2 level2 = djJdgzNetworkLevel2Service.get(networkId);
        DjJdgzNetworkLevel1 level1 = djJdgzNetworkLevel1Service.get(level2.getLevel1NetworkId());

        List<DiagramMajorDto> majorList = baseDao.getMajorList(networkId);
        List<DiagramNode2Dto> node2List = baseDao.getNodeList(networkId);
        String simpleDiagram = netWorkDiagramService.createDiagram(majorList,node2List,level1.getStartDate(),5000,10);

        level2.setContent(simpleDiagram);
        djJdgzNetworkLevel2Service.update(level2);
        netWorkDiagramService.getCsDiagram(graph,simpleDiagram,null,jPanel.getWidth(),jPanel.getHeight());
@@ -146,7 +143,6 @@
            sheetName = sheet.getSheetName(); //获取当前sheet名称
            sum = sum + num;

            Map<String, Long> mapMajors = new HashMap<>();
            for (int j = 1; j < num; j++) {
                DjJdgzNetworkLevel2List data = new DjJdgzNetworkLevel2List();
                data.setNetworkId(projectId);
@@ -155,28 +151,10 @@
                row1 = j + 1;
                String pattern = "yyyy-MM-dd";
                Row row = sheet.getRow(j);
                Map<String, String> mapMajor = sysMajorService.getMapMajor(false, String.valueOf(20000), null, "");


                String majorName = ImportUtil.getCellValue(row, 0, pattern); //工程专业
                String processName = ImportUtil.getCellValue(row, 1, pattern); // 过程名称
                String requiredCompletionTime = ImportUtil.getCellValue(row, 2, pattern); // 要求完成时间


                if (StringUtils.isEmpty(majorName)) {
                    isErr = true;
                    result = "第"+j+"行"+"专业不能为空";
                } else {
                    String majorIdStr = mapMajor.get(majorName);
                    if (majorIdStr == null) {
                        isErr = true;
                        result = "第"+j+"行"+"专业不存在";
                    } else {
                        data.setMajorId(Convert.toLong(majorIdStr));
                    }

                }
                data.setMajorName(majorName);
                String processName = ImportUtil.getCellValue(row, 0, pattern); // 过程名称
                String requiredCompletionTime = ImportUtil.getCellValue(row, 1, pattern); // 要求完成时间

                if (StringUtils.isEmpty(processName)) {
                    isErr = true;
@@ -235,6 +213,18 @@
        return baseDao.getNode(networkId);
    }

    public void save(List<DjJdgzNetworkLevel2List> list, Long networkId, JPanel jPanel, mxGraph finalGraph) {
        for (DjJdgzNetworkLevel2List data : list){
            data.setNetworkId(networkId);
            if (data.getId()!=null){
                this.update(data);
            }else{
                this.insert(data);
            }
        }
        this.saveDiagram(networkId,jPanel,finalGraph);
    }

 /*   public String getDiagram(Long networkId, Date startDate, Integer diagramWidth, Integer lineNodeNum) {
        List<DiagramMajorDto> majorList = baseDao.getMajorList(networkId);
        List<DiagramNode2Dto> node2List = baseDao.getNodeList(networkId);