From 1793428a18b864e94032ce5102d6e5bb650a2c81 Mon Sep 17 00:00:00 2001
From: yxm <zhp1521624>
Date: Fri, 28 Jun 2024 15:10:21 +0800
Subject: [PATCH] 水库堤防白蚁普查图片视频新增当前页压缩导出v20240628
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java
index e171ce0..592271b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java
@@ -2,6 +2,7 @@
import cn.gistack.sm.sjztmd.entity.*;
import cn.gistack.sm.sjztmd.mapper.TbDykeInvestigationMapper;
+import cn.gistack.sm.sjztmd.mapper.TbResDykeMapper;
import cn.gistack.sm.sjztmd.mapper.TbResGeneralInvestigationMapper;
import cn.gistack.sm.sjztmd.service.*;
import cn.gistack.sm.sjztmd.statisticsVO.StatisticsBar;
@@ -17,6 +18,7 @@
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;
@@ -31,6 +33,7 @@
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @PROJECT_NAME: skjcmanager
@@ -50,10 +53,13 @@
private IAttAdBaseService attAdBaseService;
@Autowired
- private HttpServletRequest request;
+ private TbResDykeMapper tbResDykeMapper;
@Autowired
- private HttpServletResponse response;
+ private HttpServletRequest request;
+
+// @Autowired
+// private HttpServletResponse response;
@Override
@Transactional
@@ -272,8 +278,10 @@
}
@Override
- public List<DyketionVO> downloadZipCopy() {
+ public List<DyketionVO> downloadZipCopy(IPage<TbResDykeVO> page,String type) {
+ //获取已审批的数据
List<DyketionVO> iamgeAndVideoUrlcopy = baseMapper.getIamgeAndVideoUrlcopy();
+
for (DyketionVO dyketionVO : iamgeAndVideoUrlcopy) {
List<String> urls = new ArrayList<>();
@@ -285,16 +293,36 @@
urls.add(dyketionVO.getVideosUrl());
}
+ //解析json中url 放入list集合中
List<String> urlss = DownloadZipUtils.getUrls(urls);
+
int counter=1;
for (String s : urlss) {
DyketionallVO dyketionallVO = new DyketionallVO();
- dyketionallVO.setUrlname(dyketionVO.getDname()+"+"+dyketionVO.getRn()+String.format("%02d", counter)+s.substring(s.length() - 4));
+ dyketionallVO.setUrlname(dyketionVO.getDname()+"+"+dyketionVO.getRn()+String.format("%02d", counter++)+s.substring(s.length() - 4));
dyketionallVO.setUrl(s);
dyketionallVOS.add(dyketionallVO);
}
dyketionVO.setDyketionallVOS(dyketionallVOS);
}
+ //分页情况下
+ if(type.equals("1")){
+ //获取分页信息
+ TbResDykeVO tbResDykeVO = new TbResDykeVO();
+ tbResDykeVO.setTbYear(2024);
+ List<TbResDykeVO> tbResDykeVOIPage = tbResDykeMapper.findTbResDykePcBy(page, tbResDykeVO);
+
+ List<String> dykeCode = new ArrayList<>();
+ for (TbResDykeVO imageAndVideoVO : tbResDykeVOIPage) {
+ dykeCode.add(imageAndVideoVO.getGuid());
+ }
+ List<DyketionVO> iamgeAndVideoUrls = iamgeAndVideoUrlcopy.stream()
+ .filter(dyketionVO -> dykeCode.contains(dyketionVO.getCode()))
+ .collect(Collectors.toList());
+
+ return iamgeAndVideoUrls;
+ }
+
return iamgeAndVideoUrlcopy;
}
--
Gitblit v1.9.3