From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 102 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java
index 7b3a65d..cb89900 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java
@@ -1,5 +1,7 @@
package cn.gistack.sm.sjztmd.service.impl;
+import cn.gistack.sm.sjztmd.mapper.AttResBaseMapper;
+import cn.gistack.sm.sjztmd.util.DownloadZipUtils;
import cn.gistack.sm.sjztmd.entity.TbResGeneralInvestigation;
import cn.gistack.sm.sjztmd.entity.TbResGeneralInvestigationState;
import cn.gistack.sm.sjztmd.mapper.TbResGeneralInvestigationMapper;
@@ -10,10 +12,17 @@
import cn.gistack.sm.sjztmd.statisticsVO.StatisticsPie;
import cn.gistack.sm.sjztmd.statisticsVO.StatisticsTable;
import cn.gistack.sm.sjztmd.util.CalculateUtils;
-import cn.gistack.sm.sjztmd.vo.TbResGeneralInvestigationParam;
+import cn.gistack.sm.sjztmd.util.DownloadZipUtils;
+import cn.gistack.sm.sjztmd.vo.*;
+import com.alibaba.nacos.shaded.com.google.gson.Gson;
+import com.alibaba.nacos.shaded.com.google.gson.JsonArray;
+import com.alibaba.nacos.shaded.com.google.gson.JsonElement;
+import com.alibaba.nacos.shaded.com.google.gson.JsonObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.val;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
@@ -22,9 +31,13 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @PROJECT_NAME: skjcmanager
@@ -39,6 +52,14 @@
@Autowired
private ITbResGeneralInvestigationStateService tbResGeneralInvestigationStateService;
+
+ @Autowired
+ private AttResBaseMapper attResBaseMapper;
+
+ @Autowired
+ private HttpServletRequest request;
+// @Autowired
+// private HttpServletResponse response;
@Override
@Transactional
@@ -157,4 +178,84 @@
return list;
}
+
+ @Override
+ public List<String> downZip(IPage<ImageAndVideoVO> page,String type) throws IOException {
+ List<String> urls = new ArrayList<>();
+ List<ImageAndVideoVO> iamgeAndVideoUrls;
+ if (type.equals("1")) {
+ iamgeAndVideoUrls = baseMapper.getIamgeAndVideoUrl(page);
+ }else {
+ iamgeAndVideoUrls = baseMapper.getIamgeAndVideoUrl(null);
+ }
+
+
+
+ for (ImageAndVideoVO iamgeAndVideoUrl : iamgeAndVideoUrls) {
+ urls.add(iamgeAndVideoUrl.getImagesUrl());
+ urls.add(iamgeAndVideoUrl.getVideosUrl());
+ }
+ List<String> urlss =DownloadZipUtils.getUrls(urls);
+ if (urlss.isEmpty()) {
+ return null;
+ }else {
+ // 打印提取的URLs
+// for (String url1 : urlss) {
+// //System.out.println(url1+"ssss");
+//
+// DownloadZipUtils.downloadFile(url1);
+// }
+ //DownloadZipUtils.downloadZip(request, response,1);
+ return urlss;
+ }
+ }
+
+ @Override
+ public List<ResGentionVO> downZipCopy(IPage<AttResBaseGeneralInvestigationVO> page,String type,AttResBaseGeneralInvestigationVO attResBase) {
+ //获取已审批的数据
+ List<ResGentionVO> iamgeAndVideoUrlcopy = baseMapper.getIamgeAndVideoUrlcopy();
+
+
+ for (ResGentionVO resGentionVO : iamgeAndVideoUrlcopy) {
+ List<String> urls = new ArrayList<>();
+ List<DyketionallVO> dyketionallVOS = new ArrayList<>();
+ if(resGentionVO.getImagesUrls() != null){
+ urls.add(resGentionVO.getImagesUrls());
+ }
+ if(resGentionVO.getVideoUrls() != null) {
+ urls.add(resGentionVO.getVideoUrls());
+ }
+ //解析json中url 放入list集合中
+ List<String> urlss = DownloadZipUtils.getUrls(urls);
+ int counter=1;
+ for (String s : urlss) {
+ DyketionallVO dyketionallVO = new DyketionallVO();
+ dyketionallVO.setUrlname(resGentionVO.getResname()+"+"+resGentionVO.getPpname()+"+"+resGentionVO.getRn()+String.format("%02d", counter++)+s.substring(s.length() - 4));
+ dyketionallVO.setUrl(s);
+ dyketionallVOS.add(dyketionallVO);
+ }
+ resGentionVO.setDyketionallVOS(dyketionallVOS);
+ }
+ //分页情况下
+ if(type.equals("1")){
+ //获取分页信息
+// AttResBaseGeneralInvestigationVO attResBaseGeneralInvestigationVO = new AttResBaseGeneralInvestigationVO();
+// attResBaseGeneralInvestigationVO.setTbYear(2024);
+ List<AttResBaseGeneralInvestigationVO> attResBaseGeneralInvestigationVOS = attResBaseMapper.selectAttResBaseGeneralInvestigation(page, attResBase);
+
+ List<String> resCode = new ArrayList<>();
+ for (AttResBaseGeneralInvestigationVO imageAndVideoVO : attResBaseGeneralInvestigationVOS) {
+ resCode.add(imageAndVideoVO.getCode());
+ }
+ List<ResGentionVO> iamgeAndVideoUrls = iamgeAndVideoUrlcopy.stream()
+ .filter(resGentionVO -> resCode.contains(resGentionVO.getCode()))
+ .collect(Collectors.toList());
+
+ return iamgeAndVideoUrls;
+ }
+
+ return iamgeAndVideoUrlcopy;
+ }
+
+
}
--
Gitblit v1.9.3