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/controller/TbDykeInvestigationController.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java
index 034863e..ee591e7 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java
@@ -9,7 +9,9 @@
import cn.gistack.sm.sjztmd.statisticsVO.StatisticsParams;
import cn.gistack.sm.sjztmd.statisticsVO.StatisticsPie;
import cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO;
+import cn.gistack.sm.sjztmd.vo.DyketionVO;
import cn.gistack.sm.sjztmd.vo.TbDykeInvestigationParam;
+import cn.gistack.sm.sjztmd.vo.TbResDykeVO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
@@ -24,6 +26,7 @@
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
+import java.io.IOException;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -105,6 +108,7 @@
// if (tbDykeInvestigation.getGuid() == null) {
tbDykeInvestigation.setCreateTime(new Date());
// }
+
return tbDykeInvestigationService.saveOrUpdateBy(tbDykeInvestigation);
}
@@ -133,6 +137,24 @@
return R.data(list);
}
+ @GetMapping("/downloadZip")
+ @ApiOperation(value = "批量导出白蚁普查的图片视频zip文件")
+ public R downloadZip(Query query,String type) throws IOException {
+
+ List<String> msg = tbDykeInvestigationService.downZip(Condition.getPage(query),type);
+
+ return R.data(msg);
+ }
+
+ @GetMapping("/downloadZipCopy")
+ @ApiOperation(value = "批量导出白蚁普查的图片视频zip文件")
+ public R downloadZipCopy(Query query, String type,TbResDykeVO tbResDykeVO) {
+
+ List<DyketionVO> msg = tbDykeInvestigationService.downloadZipCopy(Condition.getPage(query),type,tbResDykeVO);
+
+ return R.data(msg);
+ }
+
@GetMapping("/statisticsPie")
public R statisticsPie(StatisticsParams statisticsParams){
StatisticsPie statisticsPie = tbDykeInvestigationService.statisticsPie(statisticsParams);
@@ -145,4 +167,6 @@
return R.data(list);
}
+
+
}
--
Gitblit v1.9.3