From 28b8868f1afd1d0bac200fefbc77cdb03646fd56 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 04 Nov 2024 23:24:27 +0800
Subject: [PATCH] 白蚁防治堤防列表危害等级统计
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java | 89 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 75 insertions(+), 14 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 b1ebf04..b99fd1f 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,19 +2,23 @@
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;
import cn.gistack.sm.sjztmd.statisticsVO.StatisticsParams;
import cn.gistack.sm.sjztmd.statisticsVO.StatisticsPie;
import cn.gistack.sm.sjztmd.util.DownloadZipUtils;
-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.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;
@@ -28,7 +32,9 @@
import java.io.IOException;
import java.text.DecimalFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @PROJECT_NAME: skjcmanager
@@ -48,10 +54,13 @@
private IAttAdBaseService attAdBaseService;
@Autowired
- private HttpServletRequest request;
+ private TbResDykeMapper tbResDykeMapper;
@Autowired
- private HttpServletResponse response;
+ private HttpServletRequest request;
+
+// @Autowired
+// private HttpServletResponse response;
@Override
@Transactional
@@ -60,18 +69,18 @@
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("\"dyke_guid\"",entity.getDykeGuid());
queryWrapper.eq("\"tb_year\"",entity.getTbYear());
-// queryWrapper.eq("\"tb_quarter\"",entity.getTbQuarter());
+ queryWrapper.eq("\"tb_quarter\"",entity.getTbQuarter());
TbDykeInvestigationState state = tbDykeInvestigationStateService.getOne(queryWrapper);
if (null == state) {
state = new TbDykeInvestigationState();
state.setDykeGuid(entity.getDykeGuid());
state.setTbQuarter(entity.getTbQuarter());
state.setTbYear(entity.getTbYear());
- state.setCreateTime(entity.getCreateTime());
- state.setCreateUser(entity.getCreateUser());
+ state.setCreateTime(new Date());
+ state.setCreateUser(AuthUtil.getUserAccount());
} else {
- if (state.getCheckState() == 1 || state.getCheckState() == 2) {
- return R.fail(entity.getDykeName() + "本年度已经普查完成，不能在提交了。");
+ if (state.getCheckState() > 1) {
+ return R.fail(entity.getDykeName() + "本年度已经普查完成，不能再提交了。");
}
}
@@ -92,6 +101,7 @@
QueryWrapper qw = new QueryWrapper();
qw.eq("\"dyke_guid\"",entity.getDykeGuid());
qw.eq("\"unit\"",entity.getUnit());
+ qw.eq("\"tb_quarter\"",entity.getTbQuarter());
long count = count(qw);
if (count > 0) {
entity.setDangerLength(0D);
@@ -112,6 +122,7 @@
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("\"dyke_guid\"",entity.getDykeGuid());
queryWrapper.eq("\"tb_year\"",entity.getTbYear());
+ queryWrapper.eq("\"tb_quarter\"",entity.getTbQuarter());
TbDykeInvestigationState state = tbDykeInvestigationStateService.getOne(queryWrapper);
if (null == state) {
//无填报状态记录则新建
@@ -119,12 +130,12 @@
state.setDykeGuid(entity.getDykeGuid());
state.setTbQuarter(entity.getTbQuarter());
state.setTbYear(entity.getTbYear());
- state.setCreateTime(entity.getCreateTime());
- state.setCreateUser(entity.getCreateUser());
+ state.setCreateTime(new Date());
+ state.setCreateUser(AuthUtil.getUserAccount());
} else {
//查看填报状态，只有0填报中才可以一直填报
- if (state.getCheckState() == 1 || state.getCheckState() == 2) {
- return R.fail(entity.getDykeName() + "本年度已经普查完成，不能在提交了。");
+ if (state.getCheckState() > 1) {
+ return R.fail(entity.getDykeName() + "本年度已经普查完成，不能再提交了。");
}
}
@@ -269,4 +280,54 @@
return urlss;
}
+ @Override
+ public List<DyketionVO> downloadZipCopy(IPage<TbResDykeVO> page,String type,TbResDykeVO tbResDykeVO) {
+ //获取已审批的数据
+ List<DyketionVO> iamgeAndVideoUrlcopy = baseMapper.getIamgeAndVideoUrlcopy();
+
+
+ for (DyketionVO dyketionVO : iamgeAndVideoUrlcopy) {
+ List<String> urls = new ArrayList<>();
+ List<DyketionallVO> dyketionallVOS = new ArrayList<>();
+ if(dyketionVO.getImagesUrl() != null){
+ urls.add(dyketionVO.getImagesUrl());
+ }
+ if(dyketionVO.getVideosUrl() != null) {
+ 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.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