Merge remote-tracking branch 'origin/jtdev' into jtdev

shenyijian

2024-06-25 7d9a8c4b6c49928393f529fa93bf8f21011607a1

Merge remote-tracking branch 'origin/jtdev' into jtdev

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java

@@ -259,13 +259,14 @@
        List<String> urlss = DownloadZipUtils.getUrls(urls);
        if (urlss.isEmpty()) {
            return null;
        }else {
            // 打印提取的URLs
            for (String url1 : urlss) {
                DownloadZipUtils.downloadFile(url1);
            }
            DownloadZipUtils.downloadZip(request, response,0);
        }
//        }else {
//            // 打印提取的URLs
//            for (String url1 : urlss) {
//                DownloadZipUtils.downloadFile(url1);
//            }
//            DownloadZipUtils.downloadZip(request, response,0);
            return urlss;
        }
    }

}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java

@@ -197,11 +197,12 @@
            return null;
        }else {
            // 打印提取的URLs
            for (String url1 : urlss) {
                //System.out.println(url1+"ssss");
                DownloadZipUtils.downloadFile(url1);
            }
            DownloadZipUtils.downloadZip(request, response,1);
//            for (String url1 : urlss) {
//                //System.out.println(url1+"ssss");
//
//                DownloadZipUtils.downloadFile(url1);
//            }
            //DownloadZipUtils.downloadZip(request, response,1);
            return urlss;
        }
    }