From cb3978f2f4f03143bd6e010106cb2b1d462b1122 Mon Sep 17 00:00:00 2001 From: tangwei Date: Thu, 21 May 2026 21:04:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E6=B0=B4=E6=B8=A9=E7=9B=91=E6=B5=8B=E5=8C=85=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yfd/platform/PlatformApplication.java | 2 +- .../yfd/platform/config/SwaggerConfig.java | 14 ++++++-- .../env/controller/SdWtvtRController.java | 36 ------------------- .../controller/SdWTMonitorController.java | 8 ++--- .../env/{ => wt}/entity/vo/FishSpawnVo.java | 2 +- .../{ => wt}/entity/vo/SdAlongDetailVO.java | 2 +- .../env/{ => wt}/entity/vo/SdAlongVO.java | 2 +- .../entity/vo/SdDzChuiXiangListVO.java | 2 +- .../env/{ => wt}/entity/vo/SdRvwtSVO.java | 2 +- .../{ => wt}/entity/vo/SdWtBaseInfoVO.java | 2 +- .../entity/vo/SdWtMonitorCountVO.java | 2 +- .../env/{ => wt}/entity/vo/SdWtvtYearVo.java | 4 +-- .../env/{ => wt}/entity/vo/SdYearListVO.java | 2 +- .../env/{ => wt}/entity/vo/StcdVo.java | 2 +- .../env/{ => wt}/entity/vo/WtFishVo.java | 2 +- .../env/{ => wt}/entity/vo/WtrvDataVo.java | 2 +- .../env/{ => wt}/entity/vo/WtrvInfo.java | 2 +- .../env/{ => wt}/entity/vo/WtrvVo.java | 3 +- .../{ => wt}/mapper/AlongDetailMapper.java | 6 ++-- .../env/{ => wt}/mapper/AlongListMapper.java | 4 +-- .../mapper/SdDzChuiXiangListMapper.java | 4 +-- .../mapper/SdRvwtSInOutOneMapper.java | 6 ++-- .../{ => wt}/mapper/SdWtMonitorMapper.java | 4 +-- .../{ => wt}/mapper/SdWtrvdrtpSMapper.java | 2 +- .../env/{ => wt}/mapper/SdWtvtRMapper.java | 4 +-- .../{ => wt}/service/AlongDetailService.java | 6 ++-- .../{ => wt}/service/AlongListService.java | 6 ++-- .../service/SdDzChuiXiangListService.java | 4 +-- .../service/SdRvwtSInOutOneService.java | 6 ++-- .../{ => wt}/service/SdWtMonitorService.java | 4 +-- .../env/{ => wt}/service/SdWtvtRService.java | 2 +- .../service/impl/AlongDetailServiceImpl.java | 10 +++--- .../service/impl/AlongListServiceImpl.java | 15 ++++---- .../impl/SdDzChuiXiangListServiceImpl.java | 9 +++-- .../impl/SdRvwtSInOutOneServiceImpl.java | 10 +++--- .../service/impl/SdWtMonitorServiceImpl.java | 16 ++++----- .../service/impl/SdWtvtRServiceImpl.java | 9 +++-- 37 files changed, 91 insertions(+), 127 deletions(-) delete mode 100644 backend/src/main/java/com/yfd/platform/env/controller/SdWtvtRController.java rename backend/src/main/java/com/yfd/platform/env/{ => wt}/controller/SdWTMonitorController.java (98%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/entity/vo/FishSpawnVo.java (86%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/entity/vo/SdAlongDetailVO.java (95%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/entity/vo/SdAlongVO.java (96%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/entity/vo/SdDzChuiXiangListVO.java (91%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/entity/vo/SdRvwtSVO.java (97%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/entity/vo/SdWtBaseInfoVO.java (96%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/entity/vo/SdWtMonitorCountVO.java (94%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/entity/vo/SdWtvtYearVo.java (84%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/entity/vo/SdYearListVO.java (95%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/entity/vo/StcdVo.java (90%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/entity/vo/WtFishVo.java (86%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/entity/vo/WtrvDataVo.java (93%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/entity/vo/WtrvInfo.java (97%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/entity/vo/WtrvVo.java (79%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/mapper/AlongDetailMapper.java (98%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/mapper/AlongListMapper.java (98%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/mapper/SdDzChuiXiangListMapper.java (89%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/mapper/SdRvwtSInOutOneMapper.java (94%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/mapper/SdWtMonitorMapper.java (91%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/mapper/SdWtrvdrtpSMapper.java (97%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/mapper/SdWtvtRMapper.java (89%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/service/AlongDetailService.java (91%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/service/AlongListService.java (84%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/service/SdDzChuiXiangListService.java (88%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/service/SdRvwtSInOutOneService.java (73%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/service/SdWtMonitorService.java (83%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/service/SdWtvtRService.java (91%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/service/impl/AlongDetailServiceImpl.java (98%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/service/impl/AlongListServiceImpl.java (97%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/service/impl/SdDzChuiXiangListServiceImpl.java (86%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/service/impl/SdRvwtSInOutOneServiceImpl.java (98%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/service/impl/SdWtMonitorServiceImpl.java (98%) rename backend/src/main/java/com/yfd/platform/env/{ => wt}/service/impl/SdWtvtRServiceImpl.java (85%) diff --git a/backend/src/main/java/com/yfd/platform/PlatformApplication.java b/backend/src/main/java/com/yfd/platform/PlatformApplication.java index 95442d3..94785cf 100644 --- a/backend/src/main/java/com/yfd/platform/PlatformApplication.java +++ b/backend/src/main/java/com/yfd/platform/PlatformApplication.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @EnableTransactionManagement @ServletComponentScan("com.yfd.platform.config") -@MapperScan(basePackages = {"com.yfd.platform.*.mapper", "com.yfd.platform.common"}) +@MapperScan(basePackages = {"com.yfd.platform.*.mapper","com.yfd.platform.*.*.mapper", "com.yfd.platform.common"}) //@ComponentScan("com.zny.dec") @SpringBootApplication(exclude= {DataSourceAutoConfiguration.class, DataRedisAutoConfiguration.class}) //@SpringBootApplication diff --git a/backend/src/main/java/com/yfd/platform/config/SwaggerConfig.java b/backend/src/main/java/com/yfd/platform/config/SwaggerConfig.java index 42bd358..46cfb27 100644 --- a/backend/src/main/java/com/yfd/platform/config/SwaggerConfig.java +++ b/backend/src/main/java/com/yfd/platform/config/SwaggerConfig.java @@ -54,12 +54,20 @@ public class SwaggerConfig { } @Bean - public GroupedOpenApi groupEnvApi() { + public GroupedOpenApi groupEnvWTApi() { return GroupedOpenApi.builder() - .group("3. 全过程-生态环保数据服务") - .packagesToScan("com.yfd.platform.env.controller") + .group("3.1 全过程-生态环保数据服务-水温监测") + .packagesToScan("com.yfd.platform.env.wt.controller") .build(); } + @Bean + public GroupedOpenApi groupEnvWQApi() { + return GroupedOpenApi.builder() + .group("3.2 全过程-生态环保数据服务-水质监测") + .packagesToScan("com.yfd.platform.env.wq.controller") + .build(); + } + @Bean public GroupedOpenApi groupEngApi() { diff --git a/backend/src/main/java/com/yfd/platform/env/controller/SdWtvtRController.java b/backend/src/main/java/com/yfd/platform/env/controller/SdWtvtRController.java deleted file mode 100644 index 0eae5df..0000000 --- a/backend/src/main/java/com/yfd/platform/env/controller/SdWtvtRController.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.yfd.platform.env.controller; - -import com.yfd.platform.common.DataSourceRequest; -import com.yfd.platform.common.DataSourceResult; -import com.yfd.platform.config.ResponseResult; -import com.yfd.platform.env.service.SdWtvtRService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 垂向水温Controller - * - * @author - * @date 2023/04/18 19:22 - */ -@RestController -@RequestMapping("/sw/wtvt") -@Tag(name = "垂向水温") -@Validated -public class SdWtvtRController { - - @Resource - private SdWtvtRService sdWtvtRService; - - @PostMapping({"/defaultYear/GetKendoListCust"}) - @Operation(summary = "获取垂向水温有数据的年份") - public ResponseResult getWtrvDefaultYear(@RequestBody DataSourceRequest dataSourceRequest) { - return ResponseResult.successData(sdWtvtRService.getWtrvDefaultYear(dataSourceRequest)); - } -} diff --git a/backend/src/main/java/com/yfd/platform/env/controller/SdWTMonitorController.java b/backend/src/main/java/com/yfd/platform/env/wt/controller/SdWTMonitorController.java similarity index 98% rename from backend/src/main/java/com/yfd/platform/env/controller/SdWTMonitorController.java rename to backend/src/main/java/com/yfd/platform/env/wt/controller/SdWTMonitorController.java index c503cc2..e1e9374 100644 --- a/backend/src/main/java/com/yfd/platform/env/controller/SdWTMonitorController.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/controller/SdWTMonitorController.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.controller; +package com.yfd.platform.env.wt.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -8,8 +8,8 @@ import com.yfd.platform.common.DataSourceResult; import com.yfd.platform.common.exception.BizException; import com.yfd.platform.config.ResponseResult; import com.yfd.platform.env.entity.vo.BatchDeleteAo; -import com.yfd.platform.env.entity.vo.WtrvInfo; -import com.yfd.platform.env.service.*; +import com.yfd.platform.env.wt.entity.vo.WtrvInfo; +import com.yfd.platform.env.wt.service.*; import com.yfd.platform.utils.QgcQueryWrapperUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -17,8 +17,6 @@ import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; -import java.util.HashMap; import java.util.Map; @RestController diff --git a/backend/src/main/java/com/yfd/platform/env/entity/vo/FishSpawnVo.java b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/FishSpawnVo.java similarity index 86% rename from backend/src/main/java/com/yfd/platform/env/entity/vo/FishSpawnVo.java rename to backend/src/main/java/com/yfd/platform/env/wt/entity/vo/FishSpawnVo.java index 0cd81a8..4d1c9de 100644 --- a/backend/src/main/java/com/yfd/platform/env/entity/vo/FishSpawnVo.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/FishSpawnVo.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.entity.vo; +package com.yfd.platform.env.wt.entity.vo; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/env/entity/vo/SdAlongDetailVO.java b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdAlongDetailVO.java similarity index 95% rename from backend/src/main/java/com/yfd/platform/env/entity/vo/SdAlongDetailVO.java rename to backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdAlongDetailVO.java index 59ba7f7..6496d19 100644 --- a/backend/src/main/java/com/yfd/platform/env/entity/vo/SdAlongDetailVO.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdAlongDetailVO.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.entity.vo; +package com.yfd.platform.env.wt.entity.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/backend/src/main/java/com/yfd/platform/env/entity/vo/SdAlongVO.java b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdAlongVO.java similarity index 96% rename from backend/src/main/java/com/yfd/platform/env/entity/vo/SdAlongVO.java rename to backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdAlongVO.java index 853478a..d4a6a7c 100644 --- a/backend/src/main/java/com/yfd/platform/env/entity/vo/SdAlongVO.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdAlongVO.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.entity.vo; +package com.yfd.platform.env.wt.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/backend/src/main/java/com/yfd/platform/env/entity/vo/SdDzChuiXiangListVO.java b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdDzChuiXiangListVO.java similarity index 91% rename from backend/src/main/java/com/yfd/platform/env/entity/vo/SdDzChuiXiangListVO.java rename to backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdDzChuiXiangListVO.java index 7caa7bf..90ec997 100644 --- a/backend/src/main/java/com/yfd/platform/env/entity/vo/SdDzChuiXiangListVO.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdDzChuiXiangListVO.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.entity.vo; +package com.yfd.platform.env.wt.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/backend/src/main/java/com/yfd/platform/env/entity/vo/SdRvwtSVO.java b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdRvwtSVO.java similarity index 97% rename from backend/src/main/java/com/yfd/platform/env/entity/vo/SdRvwtSVO.java rename to backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdRvwtSVO.java index 065ccaf..0e79bea 100644 --- a/backend/src/main/java/com/yfd/platform/env/entity/vo/SdRvwtSVO.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdRvwtSVO.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.entity.vo; +package com.yfd.platform.env.wt.entity.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/backend/src/main/java/com/yfd/platform/env/entity/vo/SdWtBaseInfoVO.java b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdWtBaseInfoVO.java similarity index 96% rename from backend/src/main/java/com/yfd/platform/env/entity/vo/SdWtBaseInfoVO.java rename to backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdWtBaseInfoVO.java index d329860..572b232 100644 --- a/backend/src/main/java/com/yfd/platform/env/entity/vo/SdWtBaseInfoVO.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdWtBaseInfoVO.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.entity.vo; +package com.yfd.platform.env.wt.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/env/entity/vo/SdWtMonitorCountVO.java b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdWtMonitorCountVO.java similarity index 94% rename from backend/src/main/java/com/yfd/platform/env/entity/vo/SdWtMonitorCountVO.java rename to backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdWtMonitorCountVO.java index 86e51ce..3e05d90 100644 --- a/backend/src/main/java/com/yfd/platform/env/entity/vo/SdWtMonitorCountVO.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdWtMonitorCountVO.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.entity.vo; +package com.yfd.platform.env.wt.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/env/entity/vo/SdWtvtYearVo.java b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdWtvtYearVo.java similarity index 84% rename from backend/src/main/java/com/yfd/platform/env/entity/vo/SdWtvtYearVo.java rename to backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdWtvtYearVo.java index 8d10ac4..b63b2bd 100644 --- a/backend/src/main/java/com/yfd/platform/env/entity/vo/SdWtvtYearVo.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdWtvtYearVo.java @@ -1,12 +1,10 @@ -package com.yfd.platform.env.entity.vo; +package com.yfd.platform.env.wt.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import lombok.experimental.FieldNameConstants; -import java.math.BigDecimal; - @Getter @Setter @FieldNameConstants diff --git a/backend/src/main/java/com/yfd/platform/env/entity/vo/SdYearListVO.java b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdYearListVO.java similarity index 95% rename from backend/src/main/java/com/yfd/platform/env/entity/vo/SdYearListVO.java rename to backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdYearListVO.java index f123e9f..570db59 100644 --- a/backend/src/main/java/com/yfd/platform/env/entity/vo/SdYearListVO.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdYearListVO.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.entity.vo; +package com.yfd.platform.env.wt.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/backend/src/main/java/com/yfd/platform/env/entity/vo/StcdVo.java b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/StcdVo.java similarity index 90% rename from backend/src/main/java/com/yfd/platform/env/entity/vo/StcdVo.java rename to backend/src/main/java/com/yfd/platform/env/wt/entity/vo/StcdVo.java index a2eea88..bd57806 100644 --- a/backend/src/main/java/com/yfd/platform/env/entity/vo/StcdVo.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/StcdVo.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.entity.vo; +package com.yfd.platform.env.wt.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/backend/src/main/java/com/yfd/platform/env/entity/vo/WtFishVo.java b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WtFishVo.java similarity index 86% rename from backend/src/main/java/com/yfd/platform/env/entity/vo/WtFishVo.java rename to backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WtFishVo.java index e068481..859a4d4 100644 --- a/backend/src/main/java/com/yfd/platform/env/entity/vo/WtFishVo.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WtFishVo.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.entity.vo; +package com.yfd.platform.env.wt.entity.vo; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/env/entity/vo/WtrvDataVo.java b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WtrvDataVo.java similarity index 93% rename from backend/src/main/java/com/yfd/platform/env/entity/vo/WtrvDataVo.java rename to backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WtrvDataVo.java index 17a0196..f788117 100644 --- a/backend/src/main/java/com/yfd/platform/env/entity/vo/WtrvDataVo.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WtrvDataVo.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.entity.vo; +package com.yfd.platform.env.wt.entity.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/backend/src/main/java/com/yfd/platform/env/entity/vo/WtrvInfo.java b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WtrvInfo.java similarity index 97% rename from backend/src/main/java/com/yfd/platform/env/entity/vo/WtrvInfo.java rename to backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WtrvInfo.java index bfd6c11..43dc6c2 100644 --- a/backend/src/main/java/com/yfd/platform/env/entity/vo/WtrvInfo.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WtrvInfo.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.entity.vo; +package com.yfd.platform.env.wt.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/env/entity/vo/WtrvVo.java b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WtrvVo.java similarity index 79% rename from backend/src/main/java/com/yfd/platform/env/entity/vo/WtrvVo.java rename to backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WtrvVo.java index 8e2d88e..1f4a30e 100644 --- a/backend/src/main/java/com/yfd/platform/env/entity/vo/WtrvVo.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WtrvVo.java @@ -1,7 +1,6 @@ -package com.yfd.platform.env.entity.vo; +package com.yfd.platform.env.wt.entity.vo; import lombok.Data; -import lombok.experimental.FieldNameConstants; import java.math.BigDecimal; import java.util.Date; diff --git a/backend/src/main/java/com/yfd/platform/env/mapper/AlongDetailMapper.java b/backend/src/main/java/com/yfd/platform/env/wt/mapper/AlongDetailMapper.java similarity index 98% rename from backend/src/main/java/com/yfd/platform/env/mapper/AlongDetailMapper.java rename to backend/src/main/java/com/yfd/platform/env/wt/mapper/AlongDetailMapper.java index 16a3f3a..486b6d8 100644 --- a/backend/src/main/java/com/yfd/platform/env/mapper/AlongDetailMapper.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/mapper/AlongDetailMapper.java @@ -1,8 +1,8 @@ -package com.yfd.platform.env.mapper; +package com.yfd.platform.env.wt.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yfd.platform.env.entity.vo.SdAlongDetailVO; -import com.yfd.platform.env.entity.vo.WtrvInfo; +import com.yfd.platform.env.wt.entity.vo.SdAlongDetailVO; +import com.yfd.platform.env.wt.entity.vo.WtrvInfo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/backend/src/main/java/com/yfd/platform/env/mapper/AlongListMapper.java b/backend/src/main/java/com/yfd/platform/env/wt/mapper/AlongListMapper.java similarity index 98% rename from backend/src/main/java/com/yfd/platform/env/mapper/AlongListMapper.java rename to backend/src/main/java/com/yfd/platform/env/wt/mapper/AlongListMapper.java index 71ad9f1..b5849c7 100644 --- a/backend/src/main/java/com/yfd/platform/env/mapper/AlongListMapper.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/mapper/AlongListMapper.java @@ -1,9 +1,9 @@ -package com.yfd.platform.env.mapper; +package com.yfd.platform.env.wt.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yfd.platform.env.entity.vo.SdAlongVO; +import com.yfd.platform.env.wt.entity.vo.SdAlongVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/backend/src/main/java/com/yfd/platform/env/mapper/SdDzChuiXiangListMapper.java b/backend/src/main/java/com/yfd/platform/env/wt/mapper/SdDzChuiXiangListMapper.java similarity index 89% rename from backend/src/main/java/com/yfd/platform/env/mapper/SdDzChuiXiangListMapper.java rename to backend/src/main/java/com/yfd/platform/env/wt/mapper/SdDzChuiXiangListMapper.java index af0d535..a9a46a9 100644 --- a/backend/src/main/java/com/yfd/platform/env/mapper/SdDzChuiXiangListMapper.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/mapper/SdDzChuiXiangListMapper.java @@ -1,7 +1,7 @@ -package com.yfd.platform.env.mapper; +package com.yfd.platform.env.wt.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yfd.platform.env.entity.vo.SdDzChuiXiangListVO; +import com.yfd.platform.env.wt.entity.vo.SdDzChuiXiangListVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/backend/src/main/java/com/yfd/platform/env/mapper/SdRvwtSInOutOneMapper.java b/backend/src/main/java/com/yfd/platform/env/wt/mapper/SdRvwtSInOutOneMapper.java similarity index 94% rename from backend/src/main/java/com/yfd/platform/env/mapper/SdRvwtSInOutOneMapper.java rename to backend/src/main/java/com/yfd/platform/env/wt/mapper/SdRvwtSInOutOneMapper.java index fb61d66..c329845 100644 --- a/backend/src/main/java/com/yfd/platform/env/mapper/SdRvwtSInOutOneMapper.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/mapper/SdRvwtSInOutOneMapper.java @@ -1,8 +1,8 @@ -package com.yfd.platform.env.mapper; +package com.yfd.platform.env.wt.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yfd.platform.env.entity.vo.SdRvwtSVO; -import com.yfd.platform.env.entity.vo.StcdVo; +import com.yfd.platform.env.wt.entity.vo.SdRvwtSVO; +import com.yfd.platform.env.wt.entity.vo.StcdVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/backend/src/main/java/com/yfd/platform/env/mapper/SdWtMonitorMapper.java b/backend/src/main/java/com/yfd/platform/env/wt/mapper/SdWtMonitorMapper.java similarity index 91% rename from backend/src/main/java/com/yfd/platform/env/mapper/SdWtMonitorMapper.java rename to backend/src/main/java/com/yfd/platform/env/wt/mapper/SdWtMonitorMapper.java index 258a0f8..b17bdef 100644 --- a/backend/src/main/java/com/yfd/platform/env/mapper/SdWtMonitorMapper.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/mapper/SdWtMonitorMapper.java @@ -1,6 +1,6 @@ -package com.yfd.platform.env.mapper; +package com.yfd.platform.env.wt.mapper; -import com.yfd.platform.env.entity.vo.SdWtMonitorCountVO; +import com.yfd.platform.env.wt.entity.vo.SdWtMonitorCountVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/backend/src/main/java/com/yfd/platform/env/mapper/SdWtrvdrtpSMapper.java b/backend/src/main/java/com/yfd/platform/env/wt/mapper/SdWtrvdrtpSMapper.java similarity index 97% rename from backend/src/main/java/com/yfd/platform/env/mapper/SdWtrvdrtpSMapper.java rename to backend/src/main/java/com/yfd/platform/env/wt/mapper/SdWtrvdrtpSMapper.java index a8b50a5..76ea5e5 100644 --- a/backend/src/main/java/com/yfd/platform/env/mapper/SdWtrvdrtpSMapper.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/mapper/SdWtrvdrtpSMapper.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.mapper; +package com.yfd.platform.env.wt.mapper; import com.yfd.platform.env.entity.vo.DataParam; import org.apache.ibatis.annotations.Delete; diff --git a/backend/src/main/java/com/yfd/platform/env/mapper/SdWtvtRMapper.java b/backend/src/main/java/com/yfd/platform/env/wt/mapper/SdWtvtRMapper.java similarity index 89% rename from backend/src/main/java/com/yfd/platform/env/mapper/SdWtvtRMapper.java rename to backend/src/main/java/com/yfd/platform/env/wt/mapper/SdWtvtRMapper.java index 9aaaad8..4357f57 100644 --- a/backend/src/main/java/com/yfd/platform/env/mapper/SdWtvtRMapper.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/mapper/SdWtvtRMapper.java @@ -1,7 +1,7 @@ -package com.yfd.platform.env.mapper; +package com.yfd.platform.env.wt.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yfd.platform.env.entity.vo.SdWtvtYearVo; +import com.yfd.platform.env.wt.entity.vo.SdWtvtYearVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/backend/src/main/java/com/yfd/platform/env/service/AlongDetailService.java b/backend/src/main/java/com/yfd/platform/env/wt/service/AlongDetailService.java similarity index 91% rename from backend/src/main/java/com/yfd/platform/env/service/AlongDetailService.java rename to backend/src/main/java/com/yfd/platform/env/wt/service/AlongDetailService.java index 586c352..7ff9669 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/AlongDetailService.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/service/AlongDetailService.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.service; +package com.yfd.platform.env.wt.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; @@ -6,8 +6,8 @@ import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.DataSourceResult; import com.yfd.platform.common.GroupResult; import com.yfd.platform.env.entity.vo.BatchDeleteAo; -import com.yfd.platform.env.entity.vo.SdAlongDetailVO; -import com.yfd.platform.env.entity.vo.WtrvInfo; +import com.yfd.platform.env.wt.entity.vo.SdAlongDetailVO; +import com.yfd.platform.env.wt.entity.vo.WtrvInfo; import java.util.Map; diff --git a/backend/src/main/java/com/yfd/platform/env/service/AlongListService.java b/backend/src/main/java/com/yfd/platform/env/wt/service/AlongListService.java similarity index 84% rename from backend/src/main/java/com/yfd/platform/env/service/AlongListService.java rename to backend/src/main/java/com/yfd/platform/env/wt/service/AlongListService.java index db1449f..418fc40 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/AlongListService.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/service/AlongListService.java @@ -1,10 +1,10 @@ -package com.yfd.platform.env.service; +package com.yfd.platform.env.wt.service; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.DataSourceResult; -import com.yfd.platform.env.entity.vo.SdYearListVO; -import com.yfd.platform.env.entity.vo.StcdVo; +import com.yfd.platform.env.wt.entity.vo.SdYearListVO; +import com.yfd.platform.env.wt.entity.vo.StcdVo; import org.springframework.web.bind.annotation.RequestBody; import java.util.Map; diff --git a/backend/src/main/java/com/yfd/platform/env/service/SdDzChuiXiangListService.java b/backend/src/main/java/com/yfd/platform/env/wt/service/SdDzChuiXiangListService.java similarity index 88% rename from backend/src/main/java/com/yfd/platform/env/service/SdDzChuiXiangListService.java rename to backend/src/main/java/com/yfd/platform/env/wt/service/SdDzChuiXiangListService.java index 7da963e..de4bbff 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/SdDzChuiXiangListService.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/service/SdDzChuiXiangListService.java @@ -1,10 +1,8 @@ -package com.yfd.platform.env.service; +package com.yfd.platform.env.wt.service; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.DataSourceResult; -import java.util.Map; - /** * 电站专题垂向水温一级面板Service接口 * diff --git a/backend/src/main/java/com/yfd/platform/env/service/SdRvwtSInOutOneService.java b/backend/src/main/java/com/yfd/platform/env/wt/service/SdRvwtSInOutOneService.java similarity index 73% rename from backend/src/main/java/com/yfd/platform/env/service/SdRvwtSInOutOneService.java rename to backend/src/main/java/com/yfd/platform/env/wt/service/SdRvwtSInOutOneService.java index dad16f7..2bd0991 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/SdRvwtSInOutOneService.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/service/SdRvwtSInOutOneService.java @@ -1,9 +1,9 @@ -package com.yfd.platform.env.service; +package com.yfd.platform.env.wt.service; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.DataSourceResult; -import com.yfd.platform.env.entity.vo.SdRvwtSVO; -import com.yfd.platform.env.entity.vo.StcdVo; +import com.yfd.platform.env.wt.entity.vo.SdRvwtSVO; +import com.yfd.platform.env.wt.entity.vo.StcdVo; public interface SdRvwtSInOutOneService { diff --git a/backend/src/main/java/com/yfd/platform/env/service/SdWtMonitorService.java b/backend/src/main/java/com/yfd/platform/env/wt/service/SdWtMonitorService.java similarity index 83% rename from backend/src/main/java/com/yfd/platform/env/service/SdWtMonitorService.java rename to backend/src/main/java/com/yfd/platform/env/wt/service/SdWtMonitorService.java index 1f4001a..00db86f 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/SdWtMonitorService.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/service/SdWtMonitorService.java @@ -1,8 +1,8 @@ -package com.yfd.platform.env.service; +package com.yfd.platform.env.wt.service; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.DataSourceResult; -import com.yfd.platform.env.entity.vo.WtrvVo; +import com.yfd.platform.env.wt.entity.vo.WtrvVo; public interface SdWtMonitorService { diff --git a/backend/src/main/java/com/yfd/platform/env/service/SdWtvtRService.java b/backend/src/main/java/com/yfd/platform/env/wt/service/SdWtvtRService.java similarity index 91% rename from backend/src/main/java/com/yfd/platform/env/service/SdWtvtRService.java rename to backend/src/main/java/com/yfd/platform/env/wt/service/SdWtvtRService.java index 4ad1f92..9d0e738 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/SdWtvtRService.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/service/SdWtvtRService.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.service; +package com.yfd.platform.env.wt.service; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.DataSourceResult; diff --git a/backend/src/main/java/com/yfd/platform/env/service/impl/AlongDetailServiceImpl.java b/backend/src/main/java/com/yfd/platform/env/wt/service/impl/AlongDetailServiceImpl.java similarity index 98% rename from backend/src/main/java/com/yfd/platform/env/service/impl/AlongDetailServiceImpl.java rename to backend/src/main/java/com/yfd/platform/env/wt/service/impl/AlongDetailServiceImpl.java index 453c754..5b356d3 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/impl/AlongDetailServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/service/impl/AlongDetailServiceImpl.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.service.impl; +package com.yfd.platform.env.wt.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; @@ -9,9 +9,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yfd.platform.common.*; import com.yfd.platform.common.exception.BizException; import com.yfd.platform.env.entity.vo.*; -import com.yfd.platform.env.mapper.AlongDetailMapper; -import com.yfd.platform.env.mapper.SdWtrvdrtpSMapper; -import com.yfd.platform.env.service.AlongDetailService; +import com.yfd.platform.env.wt.mapper.AlongDetailMapper; +import com.yfd.platform.env.wt.mapper.SdWtrvdrtpSMapper; +import com.yfd.platform.env.wt.service.AlongDetailService; +import com.yfd.platform.env.wt.entity.vo.SdAlongDetailVO; +import com.yfd.platform.env.wt.entity.vo.WtrvInfo; import com.yfd.platform.utils.CollectionExtUtils; import com.yfd.platform.utils.QgcQueryWrapperUtil; import com.yfd.platform.utils.SecurityUtils; diff --git a/backend/src/main/java/com/yfd/platform/env/service/impl/AlongListServiceImpl.java b/backend/src/main/java/com/yfd/platform/env/wt/service/impl/AlongListServiceImpl.java similarity index 97% rename from backend/src/main/java/com/yfd/platform/env/service/impl/AlongListServiceImpl.java rename to backend/src/main/java/com/yfd/platform/env/wt/service/impl/AlongListServiceImpl.java index 6256ccb..d3e9b21 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/impl/AlongListServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/service/impl/AlongListServiceImpl.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.service.impl; +package com.yfd.platform.env.wt.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,13 +10,12 @@ import com.yfd.platform.common.DynamicSQLMapper; import com.yfd.platform.common.MicroservicDynamicSQLMapper; import com.yfd.platform.common.PageInfo; import com.yfd.platform.common.exception.BizException; -import com.yfd.platform.env.entity.vo.SdAlongVO; -import com.yfd.platform.env.entity.vo.SdYearListVO; -import com.yfd.platform.env.entity.vo.StcdVo; -import com.yfd.platform.env.mapper.AlongListMapper; -import com.yfd.platform.env.service.AlongListService; +import com.yfd.platform.env.wt.entity.vo.SdAlongVO; +import com.yfd.platform.env.wt.entity.vo.SdYearListVO; +import com.yfd.platform.env.wt.entity.vo.StcdVo; +import com.yfd.platform.env.wt.mapper.AlongListMapper; +import com.yfd.platform.env.wt.service.AlongListService; import com.yfd.platform.utils.QgcQueryWrapperUtil; -import com.yfd.platform.utils.QueryWrapperUtil; import com.yfd.platform.utils.SqlUtil; import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; @@ -72,7 +71,7 @@ public class AlongListServiceImpl extends ServiceImpl= #{tm} AND TM <= #{tm_1} AND WT IS NOT NULL ) t3 " + + "\t(SELECT STCD FROM SD_WTRV_R WHERE TM >= #{dt} AND TM <= #{dt_1} AND WT IS NOT NULL ) t3 " + "\tON t1.STCD = t3.STCD ORDER BY SORT ASC " + "\t) WHERE ROWNUM = 1 "; Map sqlWhereMap = new HashMap<>(); diff --git a/backend/src/main/java/com/yfd/platform/env/service/impl/SdDzChuiXiangListServiceImpl.java b/backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdDzChuiXiangListServiceImpl.java similarity index 86% rename from backend/src/main/java/com/yfd/platform/env/service/impl/SdDzChuiXiangListServiceImpl.java rename to backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdDzChuiXiangListServiceImpl.java index 25d931a..8fc876e 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/impl/SdDzChuiXiangListServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdDzChuiXiangListServiceImpl.java @@ -1,14 +1,13 @@ -package com.yfd.platform.env.service.impl; +package com.yfd.platform.env.wt.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yfd.platform.common.DataSourceLoadOptionsBase; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.DataSourceResult; -import com.yfd.platform.env.entity.vo.SdDzChuiXiangListVO; -import com.yfd.platform.env.mapper.SdDzChuiXiangListMapper; -import com.yfd.platform.env.service.SdDzChuiXiangListService; +import com.yfd.platform.env.wt.entity.vo.SdDzChuiXiangListVO; +import com.yfd.platform.env.wt.mapper.SdDzChuiXiangListMapper; +import com.yfd.platform.env.wt.service.SdDzChuiXiangListService; import com.yfd.platform.utils.QgcQueryWrapperUtil; -import com.yfd.platform.utils.QueryWrapperUtil; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/com/yfd/platform/env/service/impl/SdRvwtSInOutOneServiceImpl.java b/backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdRvwtSInOutOneServiceImpl.java similarity index 98% rename from backend/src/main/java/com/yfd/platform/env/service/impl/SdRvwtSInOutOneServiceImpl.java rename to backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdRvwtSInOutOneServiceImpl.java index 9d1d37e..68c98d6 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/impl/SdRvwtSInOutOneServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdRvwtSInOutOneServiceImpl.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.service.impl; +package com.yfd.platform.env.wt.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; @@ -6,10 +6,10 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yfd.platform.common.*; -import com.yfd.platform.env.entity.vo.SdRvwtSVO; -import com.yfd.platform.env.entity.vo.StcdVo; -import com.yfd.platform.env.mapper.SdRvwtSInOutOneMapper; -import com.yfd.platform.env.service.SdRvwtSInOutOneService; +import com.yfd.platform.env.wt.entity.vo.SdRvwtSVO; +import com.yfd.platform.env.wt.entity.vo.StcdVo; +import com.yfd.platform.env.wt.mapper.SdRvwtSInOutOneMapper; +import com.yfd.platform.env.wt.service.SdRvwtSInOutOneService; import com.yfd.platform.utils.QgcQueryWrapperUtil; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/com/yfd/platform/env/service/impl/SdWtMonitorServiceImpl.java b/backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdWtMonitorServiceImpl.java similarity index 98% rename from backend/src/main/java/com/yfd/platform/env/service/impl/SdWtMonitorServiceImpl.java rename to backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdWtMonitorServiceImpl.java index 5313d49..13d950a 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/impl/SdWtMonitorServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdWtMonitorServiceImpl.java @@ -1,15 +1,15 @@ -package com.yfd.platform.env.service.impl; +package com.yfd.platform.env.wt.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.common.*; -import com.yfd.platform.env.entity.vo.FishSpawnVo; -import com.yfd.platform.env.entity.vo.SdWtMonitorCountVO; -import com.yfd.platform.env.entity.vo.SdWtBaseInfoVO; -import com.yfd.platform.env.entity.vo.WtrvVo; -import com.yfd.platform.env.entity.vo.WtFishVo; -import com.yfd.platform.env.mapper.SdWtMonitorMapper; -import com.yfd.platform.env.service.SdWtMonitorService; +import com.yfd.platform.env.wt.entity.vo.FishSpawnVo; +import com.yfd.platform.env.wt.entity.vo.SdWtMonitorCountVO; +import com.yfd.platform.env.wt.entity.vo.SdWtBaseInfoVO; +import com.yfd.platform.env.wt.entity.vo.WtrvVo; +import com.yfd.platform.env.wt.entity.vo.WtFishVo; +import com.yfd.platform.env.wt.mapper.SdWtMonitorMapper; +import com.yfd.platform.env.wt.service.SdWtMonitorService; import com.yfd.platform.utils.QgcQueryWrapperUtil; import jakarta.annotation.Resource; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/env/service/impl/SdWtvtRServiceImpl.java b/backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdWtvtRServiceImpl.java similarity index 85% rename from backend/src/main/java/com/yfd/platform/env/service/impl/SdWtvtRServiceImpl.java rename to backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdWtvtRServiceImpl.java index 8f8abcd..04b05ad 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/impl/SdWtvtRServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdWtvtRServiceImpl.java @@ -1,14 +1,13 @@ -package com.yfd.platform.env.service.impl; +package com.yfd.platform.env.wt.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yfd.platform.common.DataSourceLoadOptionsBase; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.DataSourceResult; -import com.yfd.platform.env.entity.vo.SdWtvtYearVo; -import com.yfd.platform.env.mapper.SdWtvtRMapper; -import com.yfd.platform.env.service.SdWtvtRService; +import com.yfd.platform.env.wt.entity.vo.SdWtvtYearVo; +import com.yfd.platform.env.wt.mapper.SdWtvtRMapper; +import com.yfd.platform.env.wt.service.SdWtvtRService; import com.yfd.platform.utils.QgcQueryWrapperUtil; -import com.yfd.platform.utils.QueryWrapperUtil; import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service;