yangys
2025-09-22 12313d5b8a2b6eaa2c7562291cf08f23644ef1d7
解决回传工控网记录无法查看文件的问题
已添加1个文件
已修改2个文件
19 ■■■■ 文件已修改
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/test/java/org/springblade/mdm/program/service/DNCSendBackServiceTest.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java
@@ -75,7 +75,6 @@
    @Operation(summary = "工控网回传记录分页查询", description = "工控网回传记录分页查询,查询回传历史")
    @GetMapping("/dnc-back-page")
    public R<IPage<DncBackFileVO>> page(DncBackFileQueryVO query) {
        return R.data(dncBackFileService.pageQuery(query));
    }
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java
@@ -17,6 +17,7 @@
import org.springblade.mdm.flow.service.FlowBusinessService;
import org.springblade.mdm.program.entity.DncBackFile;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcNodeHis;
import org.springblade.mdm.program.mapper.DncBackFileMapper;
import org.springblade.mdm.program.vo.DncBackFileQueryVO;
import org.springblade.mdm.program.vo.DncBackFileVO;
@@ -49,6 +50,7 @@
@AllArgsConstructor
public class DncBackFileService extends BizServiceImpl<DncBackFileMapper, DncBackFile> {
    private final NcNodeService ncNodeService;
    private final NcNodeHisService nodeHisService;
    private final OssTemplate ossTemplate;
    private final HistoryService historyService;
    private final FlowBusinessService businessService;
@@ -107,9 +109,9 @@
        InputStream inputStream = this.ossTemplate.statFileStream(backFIle.getOssName());
        Path tempZipFile = createTempFile(inputStream);
        List<String> entryNameList = new ArrayList<>();
        NcNode packageNode =  this.ncNodeService.getById(backFIle.getNcNodeId());
        String targetFolder = packageNode.getName()+"-"+packageNode.getProcessEdition()+"/";
        NcNodeHis packageNode =  nodeHisService.getById(backFIle.getNcNodeId());
        //String targetFolder = packageNode.getName()+"-"+packageNode.getProcessEdition()+"/";
        String targetFolder = packageNode.getName()+"/";
        ZipEntry entry;
        try (java.util.zip.ZipFile zipFile = new java.util.zip.ZipFile(tempZipFile.toFile())) {
            Enumeration<? extends ZipEntry> entries = zipFile.entries();
blade-service/blade-mdm/src/test/java/org/springblade/mdm/program/service/DNCSendBackServiceTest.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
package org.springblade.mdm.program.service;
import org.junit.jupiter.api.Test;
public class DNCSendBackServiceTest {
    @Test
    public void testParseZip(){
    }
}