skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java
@@ -147,9 +147,9 @@ @GetMapping("/downloadZipCopy") @ApiOperation(value = "批量导出白蚁普查的图片视频zip文件") public R downloadZipCopy() { public R downloadZipCopy(Query query,String type) { List<DyketionVO> msg = tbDykeInvestigationService.downloadZipCopy(); List<DyketionVO> msg = tbDykeInvestigationService.downloadZipCopy(Condition.getPage(query),type); return R.data(msg); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java
@@ -149,9 +149,9 @@ @GetMapping("/downloadZipCopy") @ApiOperation(value = "批量导出白蚁普查的图片视频zip文件") public R downloadZipCopy() throws IOException { public R downloadZipCopy(Query query,String type){ List<ResGentionVO> msg = tbResGeneralInvestigationService.downZipCopy(); List<ResGentionVO> msg = tbResGeneralInvestigationService.downZipCopy(Condition.getPage(query),type); return R.data(msg); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java
@@ -10,6 +10,7 @@ import cn.gistack.sm.sjztmd.vo.ManagePersonVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.HashMap; @@ -21,6 +22,8 @@ * * @author Chill */ @Mapper public interface AttResBaseMapper extends BaseMapper<AttResBase> {
@@ -290,10 +290,10 @@ </select> <select id="getIamgeAndVideoUrl" resultType="cn.gistack.sm.sjztmd.vo.ImageAndVideoVO"> select "image_urls" as imagesUrl ,"video_urls" as videosUrl from sjzt_md."tb_dyke_investigation" select "dyke_name" as dykeName, "image_urls" as imagesUrl ,"video_urls" as videosUrl from sjzt_md."tb_dyke_investigation" </select> <select id="getIamgeAndVideoUrlcopy" resultType="cn.gistack.sm.sjztmd.vo.DyketionVO"> select dyke."tb_year" tbYear, dyke."dyke_name" dname,dyke."image_urls" imagesUrl,dyke."video_urls" videoUrls,LPAD(CAST(ROW_NUMBER() OVER (PARTITION BY dyke."dyke_guid" select dyke."tb_year" tbYear,dyke."dyke_guid" code, dyke."dyke_name" dname,dyke."image_urls" imagesUrl,dyke."video_urls" videoUrls,LPAD(CAST(ROW_NUMBER() OVER (PARTITION BY dyke."dyke_guid" ORDER BY dyke."create_time" DESC)AS VARCHAR(3)),3,'0') AS rn, ad."ad_name" adname, skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResDykeMapper.java
@@ -5,10 +5,12 @@ import cn.gistack.sm.sjztmd.vo.TbResDykeVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper public interface TbResDykeMapper extends BaseMapper<TbResDyke> { List<TbResDykeVO> getPage(IPage<TbResDykeVO> page, @Param("vo") TbResDykeVO tbResDykeVO);
@@ -573,7 +573,7 @@ select "res_name","image_urls" as imagesUrl ,"video_urls" as videosUrl from sjzt_md."tb_res_general_investigation" </select> <select id="getIamgeAndVideoUrlcopy" resultType="cn.gistack.sm.sjztmd.vo.ResGentionVO"> select resgi."res_name" resname,resgi."part_place" ppname ,regis."tb_year" years,LPAD(CAST(ROW_NUMBER() OVER (PARTITION BY regis."res_guid" select resgi."res_name" resname,resgi."res_guid" code,resgi."part_place" ppname ,regis."tb_year" years,LPAD(CAST(ROW_NUMBER() OVER (PARTITION BY regis."res_guid" ORDER BY regis."create_time" DESC)AS VARCHAR(3)),3,'0') AS rn,resgi."image_urls" imagesUrls,resgi."video_urls" videoUrls, CASE WHEN town."ad_grad" = '3' THEN skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbDykeInvestigationService.java
@@ -5,10 +5,7 @@ import cn.gistack.sm.sjztmd.statisticsVO.StatisticsBar; import cn.gistack.sm.sjztmd.statisticsVO.StatisticsParams; import cn.gistack.sm.sjztmd.statisticsVO.StatisticsPie; import cn.gistack.sm.sjztmd.vo.DyketionVO; import cn.gistack.sm.sjztmd.vo.ImageAndVideoVO; import cn.gistack.sm.sjztmd.vo.TbDykeInvestigationParam; import cn.gistack.sm.sjztmd.vo.TbResGeneralInvestigationParam; import cn.gistack.sm.sjztmd.vo.*; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.springblade.core.tool.api.R; @@ -55,5 +52,5 @@ List<StatisticsBar> statisticsBar(StatisticsParams statisticsParams); List<DyketionVO> downloadZipCopy(); List<DyketionVO> downloadZipCopy(IPage<TbResDykeVO> page, String type); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbResGeneralInvestigationService.java
@@ -50,5 +50,5 @@ List<String> downZip(IPage<ImageAndVideoVO> page,String type) throws IOException; List<ResGentionVO> downZipCopy(); List<ResGentionVO> downZipCopy(IPage<AttResBaseGeneralInvestigationVO> page,String type); } 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; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java
@@ -1,5 +1,6 @@ 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; @@ -36,6 +37,7 @@ import java.text.DecimalFormat; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; /** * @PROJECT_NAME: skjcmanager @@ -52,9 +54,12 @@ private ITbResGeneralInvestigationStateService tbResGeneralInvestigationStateService; @Autowired private HttpServletRequest request; private AttResBaseMapper attResBaseMapper; @Autowired private HttpServletResponse response; private HttpServletRequest request; // @Autowired // private HttpServletResponse response; @Override @Transactional @@ -206,8 +211,10 @@ } @Override public List<ResGentionVO> downZipCopy() { public List<ResGentionVO> downZipCopy(IPage<AttResBaseGeneralInvestigationVO> page,String type) { //获取已审批的数据 List<ResGentionVO> iamgeAndVideoUrlcopy = baseMapper.getIamgeAndVideoUrlcopy(); for (ResGentionVO resGentionVO : iamgeAndVideoUrlcopy) { List<String> urls = new ArrayList<>(); @@ -218,7 +225,7 @@ if(resGentionVO.getVideoUrls() != null) { urls.add(resGentionVO.getVideoUrls()); } //解析json中url 放入list集合中 List<String> urlss = DownloadZipUtils.getUrls(urls); int counter=1; for (String s : urlss) { @@ -229,6 +236,23 @@ } resGentionVO.setDyketionallVOS(dyketionallVOS); } //分页情况下 if(type.equals("1")){ //获取分页信息 AttResBaseGeneralInvestigationVO attResBaseGeneralInvestigationVO = new AttResBaseGeneralInvestigationVO(); attResBaseGeneralInvestigationVO.setTbYear(2024); List<AttResBaseGeneralInvestigationVO> attResBaseGeneralInvestigationVOS = attResBaseMapper.selectAttResBaseGeneralInvestigation(page, attResBaseGeneralInvestigationVO); 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; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/DyketionVO.java
@@ -12,6 +12,7 @@ private String videosUrl;//视频url private String code;//堤防编码 private String tbYear;//年份 private String dname;//堤防名称 private String rn;//顺序 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/ImageAndVideoVO.java
@@ -7,6 +7,8 @@ public class ImageAndVideoVO { private String dykeName; private String imagesUrl;//图片url private String videosUrl;//视频url skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/ResGentionVO.java
@@ -9,6 +9,7 @@ public class ResGentionVO { private String resname; private String code;//水库编码 private String ppname;//部位名称 private String years; //年份 private String rn;//顺序
