From de5eb202ae84bd91dea3f673c4b20790c4c03e72 Mon Sep 17 00:00:00 2001 From: yangzhe123 <2824096059@qq.com> Date: Tue, 4 Nov 2025 10:05:15 +0800 Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9=E8=A7=86=E9=A2=91=E7=82=B9?= =?UTF-8?q?=E7=9A=84=E6=89=80=E5=B1=9E=E5=8C=BA=E5=9F=9F=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=202=EF=BC=9A=E5=B0=86=E8=BF=87=E4=BA=94=E5=88=86=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=94=B9=E4=B8=BA=E6=95=B4=E7=82=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=203=EF=BC=9A=E9=9A=90=E6=82=A3=E7=82=B9?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0groupId=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=92=8C=E6=97=A5=E5=B8=B8=E5=85=BB=E6=8A=A4=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=B8=80=E6=A0=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hsz/controller/AttCctvBaseController.java | 3 +- .../MentenceFarmerRecordController.java | 8 ++--- .../project/hsz/mapper/AttCctvBaseMapper.java | 13 +++++++ .../project/hsz/mapper/AttResBaseMapper.java | 5 +-- .../hsz/service/AttCctvBaseService.java | 5 +++ .../hsz/service/ForecastResultsService.java | 36 ++++++------------- 6 files changed, 38 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/gunshi/project/hsz/controller/AttCctvBaseController.java b/src/main/java/com/gunshi/project/hsz/controller/AttCctvBaseController.java index a79e4cc..afa5701 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/AttCctvBaseController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/AttCctvBaseController.java @@ -106,7 +106,8 @@ public class AttCctvBaseController { @Operation(summary = "列表") @PostMapping("/list") public R> list() { - return R.ok(service.lambdaQuery().list()); + List res = service.queryList(); + return R.ok(res); } @Operation(summary = "分页") diff --git a/src/main/java/com/gunshi/project/hsz/controller/MentenceFarmerRecordController.java b/src/main/java/com/gunshi/project/hsz/controller/MentenceFarmerRecordController.java index 5177a64..bd6a959 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/MentenceFarmerRecordController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/MentenceFarmerRecordController.java @@ -50,7 +50,7 @@ public class MentenceFarmerRecordController extends AbstractCommonFileControlle if(result){ fileService.saveFile(dto.getFiles(),getGroupId(),dto.getId().toString()); for (HiddenInfo detail : dto.getDetails()) { - hiddenInfoService.saveFile(detail.getFiles(),detail.getId().toString()); + fileService.saveFile(detail.getFiles(), getGroupId(),detail.getId().toString()); } } return R.ok(result ? dto : null); @@ -64,7 +64,7 @@ public class MentenceFarmerRecordController extends AbstractCommonFileControlle if (flag) { fileService.saveFile(dto.getFiles(), getGroupId(), dto.getId().toString()); for (HiddenInfo detail : dto.getDetails()) { - hiddenInfoService.saveFile(detail.getFiles(),detail.getId().toString()); + fileService.saveFile(detail.getFiles(), getGroupId(),detail.getId().toString()); } } return R.ok(flag ? dto : null); @@ -77,7 +77,7 @@ public class MentenceFarmerRecordController extends AbstractCommonFileControlle if(res != null){ fileService.deleteFile(getGroupId(),id.toString()); for (Long cid : res) { - hiddenInfoService.deleteFile(String.valueOf(cid)); + fileService.deleteFile(getGroupId(),cid.toString()); } } return R.ok(true); @@ -96,7 +96,7 @@ public class MentenceFarmerRecordController extends AbstractCommonFileControlle List details = o.getDetails(); details.forEach(detail -> { - detail.setFiles(hiddenInfoService.getFiles(detail.getId().toString())); + detail.setFiles(fileService.getFiles(getGroupId(),detail.getId().toString())); }); }); } diff --git a/src/main/java/com/gunshi/project/hsz/mapper/AttCctvBaseMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/AttCctvBaseMapper.java index 6bac99c..ffb6d50 100644 --- a/src/main/java/com/gunshi/project/hsz/mapper/AttCctvBaseMapper.java +++ b/src/main/java/com/gunshi/project/hsz/mapper/AttCctvBaseMapper.java @@ -3,6 +3,9 @@ package com.gunshi.project.hsz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.gunshi.project.hsz.model.AttCctvBase; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * 描述: 视频基本信息表 @@ -12,4 +15,14 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface AttCctvBaseMapper extends BaseMapper { + + @Select(""" + select t1.*,t2.name as menuName + from att_cctv_base t1 + left join cctv_b_menu t2 on t1.menu_id = t2.id + order by t2.order_index asc +""") + List queryList(); + + } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/hsz/mapper/AttResBaseMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/AttResBaseMapper.java index ce34bdf..7d634b6 100644 --- a/src/main/java/com/gunshi/project/hsz/mapper/AttResBaseMapper.java +++ b/src/main/java/com/gunshi/project/hsz/mapper/AttResBaseMapper.java @@ -73,7 +73,8 @@ public interface AttResBaseMapper extends BaseMapper { @Select(""" """) diff --git a/src/main/java/com/gunshi/project/hsz/service/AttCctvBaseService.java b/src/main/java/com/gunshi/project/hsz/service/AttCctvBaseService.java index 1b53b27..cb821ce 100644 --- a/src/main/java/com/gunshi/project/hsz/service/AttCctvBaseService.java +++ b/src/main/java/com/gunshi/project/hsz/service/AttCctvBaseService.java @@ -7,6 +7,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; + /** * 描述: 视频基本信息表 * author: xusan @@ -18,6 +20,9 @@ import org.springframework.transaction.annotation.Transactional; public class AttCctvBaseService extends ServiceImpl { + public List queryList() { + return this.baseMapper.queryList(); + } } diff --git a/src/main/java/com/gunshi/project/hsz/service/ForecastResultsService.java b/src/main/java/com/gunshi/project/hsz/service/ForecastResultsService.java index eaccf12..744068f 100644 --- a/src/main/java/com/gunshi/project/hsz/service/ForecastResultsService.java +++ b/src/main/java/com/gunshi/project/hsz/service/ForecastResultsService.java @@ -36,6 +36,8 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.time.Instant; +import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.Calendar; import java.util.Comparator; @@ -169,28 +171,6 @@ public class ForecastResultsService extends ServiceImpl pptnRFutureList = new ArrayList<>(); QueryWrapper qwExisted = new QueryWrapper<>(); Boolean isHaveFuturePPtn = true; - // 檀树岗修改：实测降雨查询表数据，预测降雨使用geom参数。最后按时间算数平均 -// for(StStbprpB b : stbs){ -// String stcd = b.getStcd(); -// // 如果结束时间在当前时间之前，降雨序列从历史降雨表获取 -// if (endTime.compareTo(nowHourTime) <= 0) { -// qwExisted = new QueryWrapper().eq("stcd", stcd).ge("tm", startTime).le("tm", endTime).orderBy(true, true, "tm"); -// } else { -// qwExisted = new QueryWrapper().eq("stcd", stcd).ge("tm", startTime).le("tm", nowHourTime).orderBy(true, true, "tm"); -// try { -// // 获取预报数据 -// pptnRFutureList = getForecastDrpData(nowHourTime, stcd); -// } catch (IllegalArgumentException e) { -// if(stcd.equals(attResBase.getStcd())){ -// isHaveFuturePPtn = false; -// } -// log.error("该时间无预报数据"); -// } -// } -// List pptnRExistedList = stPptnRService.list(qwExisted); -// pptnRAllList.addAll(pptnRExistedList); -// pptnRAllList.addAll(pptnRFutureList); -// } if (endTime.compareTo(nowHourTime) <= 0) { qwExisted = new QueryWrapper().in("stcd", stbs.stream().map(StStbprpB::getStcd).toArray(String[]::new)).ge("tm", startTime).le("tm", endTime).orderBy(true, true, "tm"); } else { @@ -272,6 +252,12 @@ public class ForecastResultsService extends ServiceImpl zvarlBS = stZvarlBService.list(new QueryWrapper().eq("stcd", attResBase.getStcd()).orderBy(true, true, "rz")); // 水位历史数据 List rsvrRRealList = stRsvrRService.list(new QueryWrapper().eq("stcd", attResBase.getStcd()).ge("tm", startTime).le("tm", endTime)); + //TODO 将过五分数据转为整点数据 + rsvrRRealList.stream().forEach(o->{ + // 转换为 Instant 操作后再转回 Date + Instant instant = o.getTm().toInstant().minus(5, ChronoUnit.MINUTES); + o.setTm(Date.from(instant)); + }); List resultList = reorganizeRsvrRData(rsvrRRealList, dt); List periods = splitByDay8To8(startTime, endTime); // v：累计降雨 @@ -515,7 +501,7 @@ public class ForecastResultsService extends ServiceImpl { Date date = entity.getTm(); - return date.getMinutes() ==5 && date.getSeconds() == 0; + return date.getMinutes() ==0 && date.getSeconds() == 0; }).collect(Collectors.toMap( e -> e.getStcd() + "_" + e.getTm(), // 使用属性组合作为键 Function.identity(), @@ -674,7 +660,7 @@ public class ForecastResultsService extends ServiceImpl