diff --git a/backend/src/main/java/com/yfd/platform/env/controller/SdEngInfoBHController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdEngInfoBHController.java similarity index 94% rename from backend/src/main/java/com/yfd/platform/env/controller/SdEngInfoBHController.java rename to backend/src/main/java/com/yfd/platform/qgc_base/controller/SdEngInfoBHController.java index aa0f6255..feb06ac0 100644 --- a/backend/src/main/java/com/yfd/platform/env/controller/SdEngInfoBHController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdEngInfoBHController.java @@ -1,17 +1,16 @@ -package com.yfd.platform.env.controller; +package com.yfd.platform.qgc_base.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.annotation.Log; import com.yfd.platform.config.ResponseResult; -import com.yfd.platform.env.domain.SdEngInfoBH; -import com.yfd.platform.env.domain.SdEngInfoBHRequest; -import com.yfd.platform.env.service.ISdEngInfoBHService; +import com.yfd.platform.qgc_base.domain.SdEngInfoBH; +import com.yfd.platform.qgc_base.domain.SdEngInfoBHRequest; +import com.yfd.platform.qgc_base.service.ISdEngInfoBHService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; -import java.util.List; /** *
diff --git a/backend/src/main/java/com/yfd/platform/env/controller/SdFishDictoryBController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdFishDictoryBController.java similarity index 95% rename from backend/src/main/java/com/yfd/platform/env/controller/SdFishDictoryBController.java rename to backend/src/main/java/com/yfd/platform/qgc_base/controller/SdFishDictoryBController.java index d7c6ee7f..0638da0f 100644 --- a/backend/src/main/java/com/yfd/platform/env/controller/SdFishDictoryBController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdFishDictoryBController.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.controller; +package com.yfd.platform.qgc_base.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -6,15 +6,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.annotation.Log; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.config.ResponseResult; -import com.yfd.platform.env.domain.SdFishDictoryB; -import com.yfd.platform.env.service.ISdFishDictoryBService; +import com.yfd.platform.qgc_base.domain.SdFishDictoryB; +import com.yfd.platform.qgc_base.service.ISdFishDictoryBService; import com.yfd.platform.utils.DataSourceRequestUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.*; -import java.util.Arrays; import java.util.List; /** diff --git a/backend/src/main/java/com/yfd/platform/env/controller/SdFpssBHController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdFpssBHController.java similarity index 95% rename from backend/src/main/java/com/yfd/platform/env/controller/SdFpssBHController.java rename to backend/src/main/java/com/yfd/platform/qgc_base/controller/SdFpssBHController.java index f56fb92a..1f83d18c 100644 --- a/backend/src/main/java/com/yfd/platform/env/controller/SdFpssBHController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdFpssBHController.java @@ -1,17 +1,15 @@ -package com.yfd.platform.env.controller; +package com.yfd.platform.qgc_base.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.annotation.Log; import com.yfd.platform.config.ResponseResult; -import com.yfd.platform.env.domain.SdFpssBH; -import com.yfd.platform.env.service.ISdFpssBHService; +import com.yfd.platform.qgc_base.domain.SdFpssBH; +import com.yfd.platform.qgc_base.service.ISdFpssBHService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** *
* 过鱼设施表 前端控制器 diff --git a/backend/src/main/java/com/yfd/platform/env/controller/SdHbrvDicController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdHbrvDicController.java similarity index 96% rename from backend/src/main/java/com/yfd/platform/env/controller/SdHbrvDicController.java rename to backend/src/main/java/com/yfd/platform/qgc_base/controller/SdHbrvDicController.java index 5faa2c02..e52b8e93 100644 --- a/backend/src/main/java/com/yfd/platform/env/controller/SdHbrvDicController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdHbrvDicController.java @@ -1,10 +1,10 @@ -package com.yfd.platform.env.controller; +package com.yfd.platform.qgc_base.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.annotation.Log; import com.yfd.platform.config.ResponseResult; -import com.yfd.platform.env.domain.SdHbrvDic; -import com.yfd.platform.env.service.ISdHbrvDicService; +import com.yfd.platform.qgc_base.domain.SdHbrvDic; +import com.yfd.platform.qgc_base.service.ISdHbrvDicService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.*; diff --git a/backend/src/main/java/com/yfd/platform/env/controller/SdHycdDicController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdHycdDicController.java similarity index 96% rename from backend/src/main/java/com/yfd/platform/env/controller/SdHycdDicController.java rename to backend/src/main/java/com/yfd/platform/qgc_base/controller/SdHycdDicController.java index cead7e6f..9075f0db 100644 --- a/backend/src/main/java/com/yfd/platform/env/controller/SdHycdDicController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdHycdDicController.java @@ -1,10 +1,10 @@ -package com.yfd.platform.env.controller; +package com.yfd.platform.qgc_base.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.annotation.Log; import com.yfd.platform.config.ResponseResult; -import com.yfd.platform.env.domain.SdHycdDic; -import com.yfd.platform.env.service.ISdHycdDicService; +import com.yfd.platform.qgc_base.domain.SdHycdDic; +import com.yfd.platform.qgc_base.service.ISdHycdDicService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.*; diff --git a/backend/src/main/java/com/yfd/platform/env/controller/SdHydrobaseController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdHydrobaseController.java similarity index 95% rename from backend/src/main/java/com/yfd/platform/env/controller/SdHydrobaseController.java rename to backend/src/main/java/com/yfd/platform/qgc_base/controller/SdHydrobaseController.java index 9ef89dfb..0cf36e7a 100644 --- a/backend/src/main/java/com/yfd/platform/env/controller/SdHydrobaseController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdHydrobaseController.java @@ -1,11 +1,11 @@ -package com.yfd.platform.env.controller; +package com.yfd.platform.qgc_base.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.annotation.Log; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.config.ResponseResult; -import com.yfd.platform.env.domain.SdHydrobase; -import com.yfd.platform.env.service.ISdHydrobaseService; +import com.yfd.platform.qgc_base.domain.SdHydrobase; +import com.yfd.platform.qgc_base.service.ISdHydrobaseService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; diff --git a/backend/src/main/java/com/yfd/platform/env/controller/SdRvcdDicController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdRvcdDicController.java similarity index 96% rename from backend/src/main/java/com/yfd/platform/env/controller/SdRvcdDicController.java rename to backend/src/main/java/com/yfd/platform/qgc_base/controller/SdRvcdDicController.java index c4f08903..9a1c6bdc 100644 --- a/backend/src/main/java/com/yfd/platform/env/controller/SdRvcdDicController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdRvcdDicController.java @@ -1,11 +1,11 @@ -package com.yfd.platform.env.controller; +package com.yfd.platform.qgc_base.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.annotation.Log; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.config.ResponseResult; -import com.yfd.platform.env.domain.SdRvcdDic; -import com.yfd.platform.env.service.ISdRvcdDicService; +import com.yfd.platform.qgc_base.domain.SdRvcdDic; +import com.yfd.platform.qgc_base.service.ISdRvcdDicService; import com.yfd.platform.utils.DataSourceRequestUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/backend/src/main/java/com/yfd/platform/env/controller/TreeStructureController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/TreeStructureController.java similarity index 97% rename from backend/src/main/java/com/yfd/platform/env/controller/TreeStructureController.java rename to backend/src/main/java/com/yfd/platform/qgc_base/controller/TreeStructureController.java index 1b39ca25..0b9d6ce8 100644 --- a/backend/src/main/java/com/yfd/platform/env/controller/TreeStructureController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/TreeStructureController.java @@ -1,7 +1,7 @@ -package com.yfd.platform.env.controller; +package com.yfd.platform.qgc_base.controller; import com.yfd.platform.config.ResponseResult; -import com.yfd.platform.env.service.ITreeStructureService; +import com.yfd.platform.qgc_base.service.ITreeStructureService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; diff --git a/backend/src/main/java/com/yfd/platform/env/domain/SdCountryB.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdCountryB.java similarity index 96% rename from backend/src/main/java/com/yfd/platform/env/domain/SdCountryB.java rename to backend/src/main/java/com/yfd/platform/qgc_base/domain/SdCountryB.java index ff739e46..62d1517c 100644 --- a/backend/src/main/java/com/yfd/platform/env/domain/SdCountryB.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdCountryB.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.domain; +package com.yfd.platform.qgc_base.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/env/domain/SdEngInfoBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEngInfoBH.java similarity index 99% rename from backend/src/main/java/com/yfd/platform/env/domain/SdEngInfoBH.java rename to backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEngInfoBH.java index 4d258c45..f316193c 100644 --- a/backend/src/main/java/com/yfd/platform/env/domain/SdEngInfoBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEngInfoBH.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.domain; +package com.yfd.platform.qgc_base.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/env/domain/SdEngInfoBHRequest.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEngInfoBHRequest.java similarity index 89% rename from backend/src/main/java/com/yfd/platform/env/domain/SdEngInfoBHRequest.java rename to backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEngInfoBHRequest.java index 89cf2343..5227bdb2 100644 --- a/backend/src/main/java/com/yfd/platform/env/domain/SdEngInfoBHRequest.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEngInfoBHRequest.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.domain; +package com.yfd.platform.qgc_base.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/env/domain/SdFishDictoryB.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFishDictoryB.java similarity index 99% rename from backend/src/main/java/com/yfd/platform/env/domain/SdFishDictoryB.java rename to backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFishDictoryB.java index d7b4f686..554ddf1e 100644 --- a/backend/src/main/java/com/yfd/platform/env/domain/SdFishDictoryB.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFishDictoryB.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.domain; +package com.yfd.platform.qgc_base.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/env/domain/SdFpssBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFpssBH.java similarity index 99% rename from backend/src/main/java/com/yfd/platform/env/domain/SdFpssBH.java rename to backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFpssBH.java index 1e0c7335..a20947e9 100644 --- a/backend/src/main/java/com/yfd/platform/env/domain/SdFpssBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFpssBH.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.domain; +package com.yfd.platform.qgc_base.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/backend/src/main/java/com/yfd/platform/env/domain/SdFpssR.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFpssR.java similarity index 98% rename from backend/src/main/java/com/yfd/platform/env/domain/SdFpssR.java rename to backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFpssR.java index a6baecda..7688ff15 100644 --- a/backend/src/main/java/com/yfd/platform/env/domain/SdFpssR.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFpssR.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.domain; +package com.yfd.platform.qgc_base.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/backend/src/main/java/com/yfd/platform/env/domain/SdHbrvDic.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHbrvDic.java similarity index 95% rename from backend/src/main/java/com/yfd/platform/env/domain/SdHbrvDic.java rename to backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHbrvDic.java index 66a99ed9..94b45e33 100644 --- a/backend/src/main/java/com/yfd/platform/env/domain/SdHbrvDic.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHbrvDic.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.domain; +package com.yfd.platform.qgc_base.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/env/domain/SdHycdDic.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHycdDic.java similarity index 96% rename from backend/src/main/java/com/yfd/platform/env/domain/SdHycdDic.java rename to backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHycdDic.java index aadce20f..4d8826ea 100644 --- a/backend/src/main/java/com/yfd/platform/env/domain/SdHycdDic.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHycdDic.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.domain; +package com.yfd.platform.qgc_base.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/env/domain/SdHydrobase.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHydrobase.java similarity index 96% rename from backend/src/main/java/com/yfd/platform/env/domain/SdHydrobase.java rename to backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHydrobase.java index 92378d63..296090ae 100644 --- a/backend/src/main/java/com/yfd/platform/env/domain/SdHydrobase.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHydrobase.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.domain; +package com.yfd.platform.qgc_base.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/env/domain/SdPraddRltnB.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdPraddRltnB.java similarity index 95% rename from backend/src/main/java/com/yfd/platform/env/domain/SdPraddRltnB.java rename to backend/src/main/java/com/yfd/platform/qgc_base/domain/SdPraddRltnB.java index 67d546bd..9bd3732b 100644 --- a/backend/src/main/java/com/yfd/platform/env/domain/SdPraddRltnB.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdPraddRltnB.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.domain; +package com.yfd.platform.qgc_base.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/env/domain/SdPrhbrltnB.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdPrhbrltnB.java similarity index 95% rename from backend/src/main/java/com/yfd/platform/env/domain/SdPrhbrltnB.java rename to backend/src/main/java/com/yfd/platform/qgc_base/domain/SdPrhbrltnB.java index 747a21e7..625e6598 100644 --- a/backend/src/main/java/com/yfd/platform/env/domain/SdPrhbrltnB.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdPrhbrltnB.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.domain; +package com.yfd.platform.qgc_base.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/env/domain/SdPrhyrltnB.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdPrhyrltnB.java similarity index 95% rename from backend/src/main/java/com/yfd/platform/env/domain/SdPrhyrltnB.java rename to backend/src/main/java/com/yfd/platform/qgc_base/domain/SdPrhyrltnB.java index ef22ccf0..e6e410bd 100644 --- a/backend/src/main/java/com/yfd/platform/env/domain/SdPrhyrltnB.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdPrhyrltnB.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.domain; +package com.yfd.platform.qgc_base.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/env/domain/SdRvcdDic.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdRvcdDic.java similarity index 97% rename from backend/src/main/java/com/yfd/platform/env/domain/SdRvcdDic.java rename to backend/src/main/java/com/yfd/platform/qgc_base/domain/SdRvcdDic.java index 9f3a9676..2b92f18d 100644 --- a/backend/src/main/java/com/yfd/platform/env/domain/SdRvcdDic.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdRvcdDic.java @@ -1,11 +1,10 @@ -package com.yfd.platform.env.domain; +package com.yfd.platform.qgc_base.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; -import java.util.Date; import java.util.List; /** diff --git a/backend/src/main/java/com/yfd/platform/env/domain/StationBasinInfo.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/StationBasinInfo.java similarity index 85% rename from backend/src/main/java/com/yfd/platform/env/domain/StationBasinInfo.java rename to backend/src/main/java/com/yfd/platform/qgc_base/domain/StationBasinInfo.java index 2e348b36..ac1f326c 100644 --- a/backend/src/main/java/com/yfd/platform/env/domain/StationBasinInfo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/StationBasinInfo.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.domain; +package com.yfd.platform.qgc_base.domain; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/env/entity/vo/BatchDeleteAo.java b/backend/src/main/java/com/yfd/platform/qgc_base/entity/vo/BatchDeleteAo.java similarity index 90% rename from backend/src/main/java/com/yfd/platform/env/entity/vo/BatchDeleteAo.java rename to backend/src/main/java/com/yfd/platform/qgc_base/entity/vo/BatchDeleteAo.java index f4dfafbd..2fbb7069 100644 --- a/backend/src/main/java/com/yfd/platform/env/entity/vo/BatchDeleteAo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/entity/vo/BatchDeleteAo.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.entity.vo; +package com.yfd.platform.qgc_base.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/DataParam.java b/backend/src/main/java/com/yfd/platform/qgc_base/entity/vo/DataParam.java similarity index 82% rename from backend/src/main/java/com/yfd/platform/env/entity/vo/DataParam.java rename to backend/src/main/java/com/yfd/platform/qgc_base/entity/vo/DataParam.java index 88b5bacc..79e9498e 100644 --- a/backend/src/main/java/com/yfd/platform/env/entity/vo/DataParam.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/entity/vo/DataParam.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.entity.vo; +package com.yfd.platform.qgc_base.entity.vo; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/env/entity/vo/HydrobaseWbsVo.java b/backend/src/main/java/com/yfd/platform/qgc_base/entity/vo/HydrobaseWbsVo.java similarity index 94% rename from backend/src/main/java/com/yfd/platform/env/entity/vo/HydrobaseWbsVo.java rename to backend/src/main/java/com/yfd/platform/qgc_base/entity/vo/HydrobaseWbsVo.java index f08f9206..47c6d19a 100644 --- a/backend/src/main/java/com/yfd/platform/env/entity/vo/HydrobaseWbsVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/entity/vo/HydrobaseWbsVo.java @@ -1,4 +1,4 @@ -package com.yfd.platform.env.entity.vo; +package com.yfd.platform.qgc_base.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/env/mapper/SdCountryBMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdCountryBMapper.java similarity index 66% rename from backend/src/main/java/com/yfd/platform/env/mapper/SdCountryBMapper.java rename to backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdCountryBMapper.java index 4a796ce0..bef73fbe 100644 --- a/backend/src/main/java/com/yfd/platform/env/mapper/SdCountryBMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdCountryBMapper.java @@ -1,7 +1,7 @@ -package com.yfd.platform.env.mapper; +package com.yfd.platform.qgc_base.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yfd.platform.env.domain.SdCountryB; +import com.yfd.platform.qgc_base.domain.SdCountryB; /** *
diff --git a/backend/src/main/java/com/yfd/platform/env/mapper/SdEngInfoBHMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdEngInfoBHMapper.java similarity index 87% rename from backend/src/main/java/com/yfd/platform/env/mapper/SdEngInfoBHMapper.java rename to backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdEngInfoBHMapper.java index 45b9e695..2a4fa27c 100644 --- a/backend/src/main/java/com/yfd/platform/env/mapper/SdEngInfoBHMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdEngInfoBHMapper.java @@ -1,8 +1,8 @@ -package com.yfd.platform.env.mapper; +package com.yfd.platform.qgc_base.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yfd.platform.env.domain.SdEngInfoBH; -import com.yfd.platform.env.domain.StationBasinInfo; +import com.yfd.platform.qgc_base.domain.SdEngInfoBH; +import com.yfd.platform.qgc_base.domain.StationBasinInfo; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/backend/src/main/java/com/yfd/platform/env/mapper/SdFishDictoryBMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdFishDictoryBMapper.java similarity index 65% rename from backend/src/main/java/com/yfd/platform/env/mapper/SdFishDictoryBMapper.java rename to backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdFishDictoryBMapper.java index 14e31ede..d38a17ea 100644 --- a/backend/src/main/java/com/yfd/platform/env/mapper/SdFishDictoryBMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdFishDictoryBMapper.java @@ -1,7 +1,7 @@ -package com.yfd.platform.env.mapper; +package com.yfd.platform.qgc_base.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yfd.platform.env.domain.SdFishDictoryB; +import com.yfd.platform.qgc_base.domain.SdFishDictoryB; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/backend/src/main/java/com/yfd/platform/env/mapper/SdFpssBHMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdFpssBHMapper.java similarity index 91% rename from backend/src/main/java/com/yfd/platform/env/mapper/SdFpssBHMapper.java rename to backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdFpssBHMapper.java index 08c53fa4..86ac6ee7 100644 --- a/backend/src/main/java/com/yfd/platform/env/mapper/SdFpssBHMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdFpssBHMapper.java @@ -1,7 +1,7 @@ -package com.yfd.platform.env.mapper; +package com.yfd.platform.qgc_base.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yfd.platform.env.domain.SdFpssBH; +import com.yfd.platform.qgc_base.domain.SdFpssBH; 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/SdFpssRMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdFpssRMapper.java similarity index 72% rename from backend/src/main/java/com/yfd/platform/env/mapper/SdFpssRMapper.java rename to backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdFpssRMapper.java index 9a32050b..82318c9a 100644 --- a/backend/src/main/java/com/yfd/platform/env/mapper/SdFpssRMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdFpssRMapper.java @@ -1,7 +1,7 @@ -package com.yfd.platform.env.mapper; +package com.yfd.platform.qgc_base.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yfd.platform.env.domain.SdFpssR; +import com.yfd.platform.qgc_base.domain.SdFpssR; import org.apache.ibatis.annotations.Mapper; /** diff --git a/backend/src/main/java/com/yfd/platform/env/mapper/SdHbrvDicMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdHbrvDicMapper.java similarity index 87% rename from backend/src/main/java/com/yfd/platform/env/mapper/SdHbrvDicMapper.java rename to backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdHbrvDicMapper.java index 715e22a4..3dde38df 100644 --- a/backend/src/main/java/com/yfd/platform/env/mapper/SdHbrvDicMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdHbrvDicMapper.java @@ -1,7 +1,7 @@ -package com.yfd.platform.env.mapper; +package com.yfd.platform.qgc_base.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yfd.platform.env.domain.SdHbrvDic; +import com.yfd.platform.qgc_base.domain.SdHbrvDic; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/backend/src/main/java/com/yfd/platform/env/mapper/SdHycdDicMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdHycdDicMapper.java similarity index 83% rename from backend/src/main/java/com/yfd/platform/env/mapper/SdHycdDicMapper.java rename to backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdHycdDicMapper.java index 96e185bc..4475d944 100644 --- a/backend/src/main/java/com/yfd/platform/env/mapper/SdHycdDicMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdHycdDicMapper.java @@ -1,7 +1,7 @@ -package com.yfd.platform.env.mapper; +package com.yfd.platform.qgc_base.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yfd.platform.env.domain.SdHycdDic; +import com.yfd.platform.qgc_base.domain.SdHycdDic; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/backend/src/main/java/com/yfd/platform/env/mapper/SdHydrobaseMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdHydrobaseMapper.java similarity index 83% rename from backend/src/main/java/com/yfd/platform/env/mapper/SdHydrobaseMapper.java rename to backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdHydrobaseMapper.java index fe6efb11..d3046b2e 100644 --- a/backend/src/main/java/com/yfd/platform/env/mapper/SdHydrobaseMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdHydrobaseMapper.java @@ -1,7 +1,7 @@ -package com.yfd.platform.env.mapper; +package com.yfd.platform.qgc_base.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yfd.platform.env.domain.SdHydrobase; +import com.yfd.platform.qgc_base.domain.SdHydrobase; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/backend/src/main/java/com/yfd/platform/env/mapper/SdPrhbrltnBMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdPrhbrltnBMapper.java similarity index 85% rename from backend/src/main/java/com/yfd/platform/env/mapper/SdPrhbrltnBMapper.java rename to backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdPrhbrltnBMapper.java index a1d1a84a..acefefa3 100644 --- a/backend/src/main/java/com/yfd/platform/env/mapper/SdPrhbrltnBMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdPrhbrltnBMapper.java @@ -1,7 +1,7 @@ -package com.yfd.platform.env.mapper; +package com.yfd.platform.qgc_base.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yfd.platform.env.domain.SdPrhbrltnB; +import com.yfd.platform.qgc_base.domain.SdPrhbrltnB; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/backend/src/main/java/com/yfd/platform/env/mapper/SdPrhyrltnBMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdPrhyrltnBMapper.java similarity index 85% rename from backend/src/main/java/com/yfd/platform/env/mapper/SdPrhyrltnBMapper.java rename to backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdPrhyrltnBMapper.java index 398844b0..57b975cb 100644 --- a/backend/src/main/java/com/yfd/platform/env/mapper/SdPrhyrltnBMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdPrhyrltnBMapper.java @@ -1,7 +1,7 @@ -package com.yfd.platform.env.mapper; +package com.yfd.platform.qgc_base.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yfd.platform.env.domain.SdPrhyrltnB; +import com.yfd.platform.qgc_base.domain.SdPrhyrltnB; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/backend/src/main/java/com/yfd/platform/env/mapper/SdRvcdDicMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdRvcdDicMapper.java similarity index 83% rename from backend/src/main/java/com/yfd/platform/env/mapper/SdRvcdDicMapper.java rename to backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdRvcdDicMapper.java index e1abe3b2..00b83828 100644 --- a/backend/src/main/java/com/yfd/platform/env/mapper/SdRvcdDicMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdRvcdDicMapper.java @@ -1,7 +1,7 @@ -package com.yfd.platform.env.mapper; +package com.yfd.platform.qgc_base.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yfd.platform.env.domain.SdRvcdDic; +import com.yfd.platform.qgc_base.domain.SdRvcdDic; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/backend/src/main/java/com/yfd/platform/env/service/ISdCountryBService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdCountryBService.java similarity index 84% rename from backend/src/main/java/com/yfd/platform/env/service/ISdCountryBService.java rename to backend/src/main/java/com/yfd/platform/qgc_base/service/ISdCountryBService.java index 229299f9..89253992 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/ISdCountryBService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdCountryBService.java @@ -1,8 +1,8 @@ -package com.yfd.platform.env.service; +package com.yfd.platform.qgc_base.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.yfd.platform.env.domain.SdCountryB; +import com.yfd.platform.qgc_base.domain.SdCountryB; import java.util.List; diff --git a/backend/src/main/java/com/yfd/platform/env/service/ISdEngInfoBHService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdEngInfoBHService.java similarity index 89% rename from backend/src/main/java/com/yfd/platform/env/service/ISdEngInfoBHService.java rename to backend/src/main/java/com/yfd/platform/qgc_base/service/ISdEngInfoBHService.java index c99d88a8..b12099c9 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/ISdEngInfoBHService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdEngInfoBHService.java @@ -1,9 +1,9 @@ -package com.yfd.platform.env.service; +package com.yfd.platform.qgc_base.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.yfd.platform.env.domain.SdEngInfoBH; -import com.yfd.platform.env.domain.SdEngInfoBHRequest; +import com.yfd.platform.qgc_base.domain.SdEngInfoBH; +import com.yfd.platform.qgc_base.domain.SdEngInfoBHRequest; import java.util.List; import java.util.Set; diff --git a/backend/src/main/java/com/yfd/platform/env/service/ISdFishDictoryBService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdFishDictoryBService.java similarity index 85% rename from backend/src/main/java/com/yfd/platform/env/service/ISdFishDictoryBService.java rename to backend/src/main/java/com/yfd/platform/qgc_base/service/ISdFishDictoryBService.java index 00809826..9352dada 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/ISdFishDictoryBService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdFishDictoryBService.java @@ -1,8 +1,8 @@ -package com.yfd.platform.env.service; +package com.yfd.platform.qgc_base.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.yfd.platform.env.domain.SdFishDictoryB; +import com.yfd.platform.qgc_base.domain.SdFishDictoryB; import java.util.List; diff --git a/backend/src/main/java/com/yfd/platform/env/service/ISdFpssBHService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdFpssBHService.java similarity index 89% rename from backend/src/main/java/com/yfd/platform/env/service/ISdFpssBHService.java rename to backend/src/main/java/com/yfd/platform/qgc_base/service/ISdFpssBHService.java index 7b37c276..42d1fee2 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/ISdFpssBHService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdFpssBHService.java @@ -1,8 +1,8 @@ -package com.yfd.platform.env.service; +package com.yfd.platform.qgc_base.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.yfd.platform.env.domain.SdFpssBH; +import com.yfd.platform.qgc_base.domain.SdFpssBH; import java.util.List; import java.util.Set; diff --git a/backend/src/main/java/com/yfd/platform/env/service/ISdFpssRService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdFpssRService.java similarity index 81% rename from backend/src/main/java/com/yfd/platform/env/service/ISdFpssRService.java rename to backend/src/main/java/com/yfd/platform/qgc_base/service/ISdFpssRService.java index eed22d38..1af560d0 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/ISdFpssRService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdFpssRService.java @@ -1,8 +1,8 @@ -package com.yfd.platform.env.service; +package com.yfd.platform.qgc_base.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.yfd.platform.env.domain.SdFpssR; +import com.yfd.platform.qgc_base.domain.SdFpssR; /** *
diff --git a/backend/src/main/java/com/yfd/platform/env/service/ISdHbrvDicService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdHbrvDicService.java similarity index 93% rename from backend/src/main/java/com/yfd/platform/env/service/ISdHbrvDicService.java rename to backend/src/main/java/com/yfd/platform/qgc_base/service/ISdHbrvDicService.java index 3f3cf23b..ea932c43 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/ISdHbrvDicService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdHbrvDicService.java @@ -1,8 +1,8 @@ -package com.yfd.platform.env.service; +package com.yfd.platform.qgc_base.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.yfd.platform.env.domain.SdHbrvDic; +import com.yfd.platform.qgc_base.domain.SdHbrvDic; import java.util.List; import java.util.Set; diff --git a/backend/src/main/java/com/yfd/platform/env/service/ISdHycdDicService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdHycdDicService.java similarity index 92% rename from backend/src/main/java/com/yfd/platform/env/service/ISdHycdDicService.java rename to backend/src/main/java/com/yfd/platform/qgc_base/service/ISdHycdDicService.java index 7bf15b86..ed680881 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/ISdHycdDicService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdHycdDicService.java @@ -1,8 +1,8 @@ -package com.yfd.platform.env.service; +package com.yfd.platform.qgc_base.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.yfd.platform.env.domain.SdHycdDic; +import com.yfd.platform.qgc_base.domain.SdHycdDic; import java.util.List; diff --git a/backend/src/main/java/com/yfd/platform/env/service/ISdHydrobaseService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdHydrobaseService.java similarity index 89% rename from backend/src/main/java/com/yfd/platform/env/service/ISdHydrobaseService.java rename to backend/src/main/java/com/yfd/platform/qgc_base/service/ISdHydrobaseService.java index 9f16b1ab..2de91b30 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/ISdHydrobaseService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdHydrobaseService.java @@ -1,11 +1,11 @@ -package com.yfd.platform.env.service; +package com.yfd.platform.qgc_base.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.DataSourceResult; import com.baomidou.mybatisplus.extension.service.IService; -import com.yfd.platform.env.domain.SdHydrobase; -import com.yfd.platform.env.entity.vo.HydrobaseWbsVo; +import com.yfd.platform.qgc_base.domain.SdHydrobase; +import com.yfd.platform.qgc_base.entity.vo.HydrobaseWbsVo; import java.util.List; import java.util.Set; diff --git a/backend/src/main/java/com/yfd/platform/env/service/ISdRvcdDicService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdRvcdDicService.java similarity index 91% rename from backend/src/main/java/com/yfd/platform/env/service/ISdRvcdDicService.java rename to backend/src/main/java/com/yfd/platform/qgc_base/service/ISdRvcdDicService.java index ea8da573..38e299f0 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/ISdRvcdDicService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdRvcdDicService.java @@ -1,8 +1,8 @@ -package com.yfd.platform.env.service; +package com.yfd.platform.qgc_base.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.yfd.platform.env.domain.SdRvcdDic; +import com.yfd.platform.qgc_base.domain.SdRvcdDic; import java.util.List; diff --git a/backend/src/main/java/com/yfd/platform/env/service/ITreeStructureService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ITreeStructureService.java similarity index 95% rename from backend/src/main/java/com/yfd/platform/env/service/ITreeStructureService.java rename to backend/src/main/java/com/yfd/platform/qgc_base/service/ITreeStructureService.java index 03342c9e..42f03aab 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/ITreeStructureService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ITreeStructureService.java @@ -1,6 +1,4 @@ -package com.yfd.platform.env.service; - -import com.yfd.platform.env.domain.SdEngInfoBH; +package com.yfd.platform.qgc_base.service; import java.util.List; import java.util.Map; diff --git a/backend/src/main/java/com/yfd/platform/env/service/impl/SdCountryBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdCountryBServiceImpl.java similarity index 83% rename from backend/src/main/java/com/yfd/platform/env/service/impl/SdCountryBServiceImpl.java rename to backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdCountryBServiceImpl.java index 94045aec..9b007704 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/impl/SdCountryBServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdCountryBServiceImpl.java @@ -1,10 +1,10 @@ -package com.yfd.platform.env.service.impl; +package com.yfd.platform.qgc_base.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.yfd.platform.env.domain.SdCountryB; -import com.yfd.platform.env.mapper.SdCountryBMapper; -import com.yfd.platform.env.service.ISdCountryBService; +import com.yfd.platform.qgc_base.domain.SdCountryB; +import com.yfd.platform.qgc_base.mapper.SdCountryBMapper; +import com.yfd.platform.qgc_base.service.ISdCountryBService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/backend/src/main/java/com/yfd/platform/env/service/impl/SdEngInfoBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java similarity index 94% rename from backend/src/main/java/com/yfd/platform/env/service/impl/SdEngInfoBHServiceImpl.java rename to backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java index 99f2ade4..4ec1dfac 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/impl/SdEngInfoBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java @@ -1,14 +1,14 @@ -package com.yfd.platform.env.service.impl; +package com.yfd.platform.qgc_base.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.yfd.platform.data.domain.SysUserDataScope; -import com.yfd.platform.data.mapper.SysUserDataScopeMapper; -import com.yfd.platform.env.domain.SdEngInfoBH; -import com.yfd.platform.env.domain.SdEngInfoBHRequest; -import com.yfd.platform.env.mapper.SdEngInfoBHMapper; -import com.yfd.platform.env.service.ISdEngInfoBHService; +import com.yfd.platform.qgc_data.domain.SysUserDataScope; +import com.yfd.platform.qgc_data.mapper.SysUserDataScopeMapper; +import com.yfd.platform.qgc_base.domain.SdEngInfoBH; +import com.yfd.platform.qgc_base.domain.SdEngInfoBHRequest; +import com.yfd.platform.qgc_base.mapper.SdEngInfoBHMapper; +import com.yfd.platform.qgc_base.service.ISdEngInfoBHService; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/com/yfd/platform/env/service/impl/SdFishDictoryBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFishDictoryBServiceImpl.java similarity index 97% rename from backend/src/main/java/com/yfd/platform/env/service/impl/SdFishDictoryBServiceImpl.java rename to backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFishDictoryBServiceImpl.java index 1519f3f1..5a635c3a 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/impl/SdFishDictoryBServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFishDictoryBServiceImpl.java @@ -1,12 +1,12 @@ -package com.yfd.platform.env.service.impl; +package com.yfd.platform.qgc_base.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.yfd.platform.env.domain.SdFishDictoryB; -import com.yfd.platform.env.mapper.SdFishDictoryBMapper; -import com.yfd.platform.env.service.ISdFishDictoryBService; +import com.yfd.platform.qgc_base.domain.SdFishDictoryB; +import com.yfd.platform.qgc_base.mapper.SdFishDictoryBMapper; +import com.yfd.platform.qgc_base.service.ISdFishDictoryBService; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; diff --git a/backend/src/main/java/com/yfd/platform/env/service/impl/SdFpssBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFpssBHServiceImpl.java similarity index 93% rename from backend/src/main/java/com/yfd/platform/env/service/impl/SdFpssBHServiceImpl.java rename to backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFpssBHServiceImpl.java index d620898f..101135f6 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/impl/SdFpssBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFpssBHServiceImpl.java @@ -1,15 +1,15 @@ -package com.yfd.platform.env.service.impl; +package com.yfd.platform.qgc_base.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.yfd.platform.data.domain.SysUserDataScope; -import com.yfd.platform.data.mapper.SysUserDataScopeMapper; -import com.yfd.platform.env.domain.SdEngInfoBH; -import com.yfd.platform.env.domain.SdFpssBH; -import com.yfd.platform.env.mapper.SdEngInfoBHMapper; -import com.yfd.platform.env.mapper.SdFpssBHMapper; -import com.yfd.platform.env.service.ISdFpssBHService; +import com.yfd.platform.qgc_data.domain.SysUserDataScope; +import com.yfd.platform.qgc_data.mapper.SysUserDataScopeMapper; +import com.yfd.platform.qgc_base.domain.SdEngInfoBH; +import com.yfd.platform.qgc_base.domain.SdFpssBH; +import com.yfd.platform.qgc_base.mapper.SdEngInfoBHMapper; +import com.yfd.platform.qgc_base.mapper.SdFpssBHMapper; +import com.yfd.platform.qgc_base.service.ISdFpssBHService; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/com/yfd/platform/env/service/impl/SdFpssRServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFpssRServiceImpl.java similarity index 89% rename from backend/src/main/java/com/yfd/platform/env/service/impl/SdFpssRServiceImpl.java rename to backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFpssRServiceImpl.java index 5483b26f..597aeb99 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/impl/SdFpssRServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFpssRServiceImpl.java @@ -1,11 +1,11 @@ -package com.yfd.platform.env.service.impl; +package com.yfd.platform.qgc_base.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.yfd.platform.env.domain.SdFpssR; -import com.yfd.platform.env.mapper.SdFpssRMapper; -import com.yfd.platform.env.service.ISdFpssRService; +import com.yfd.platform.qgc_base.domain.SdFpssR; +import com.yfd.platform.qgc_base.mapper.SdFpssRMapper; +import com.yfd.platform.qgc_base.service.ISdFpssRService; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; diff --git a/backend/src/main/java/com/yfd/platform/env/service/impl/SdHbrvDicServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdHbrvDicServiceImpl.java similarity index 93% rename from backend/src/main/java/com/yfd/platform/env/service/impl/SdHbrvDicServiceImpl.java rename to backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdHbrvDicServiceImpl.java index 90ea0e91..dde43f59 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/impl/SdHbrvDicServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdHbrvDicServiceImpl.java @@ -1,16 +1,15 @@ -package com.yfd.platform.env.service.impl; +package com.yfd.platform.qgc_base.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.yfd.platform.data.domain.SysUserDataScope; -import com.yfd.platform.data.mapper.SysUserDataScopeMapper; -import com.yfd.platform.env.domain.SdEngInfoBH; -import com.yfd.platform.env.domain.SdHbrvDic; -import com.yfd.platform.env.domain.SdHydrobase; -import com.yfd.platform.env.mapper.SdEngInfoBHMapper; -import com.yfd.platform.env.mapper.SdHbrvDicMapper; -import com.yfd.platform.env.service.ISdHbrvDicService; +import com.yfd.platform.qgc_data.domain.SysUserDataScope; +import com.yfd.platform.qgc_data.mapper.SysUserDataScopeMapper; +import com.yfd.platform.qgc_base.domain.SdEngInfoBH; +import com.yfd.platform.qgc_base.domain.SdHbrvDic; +import com.yfd.platform.qgc_base.mapper.SdEngInfoBHMapper; +import com.yfd.platform.qgc_base.mapper.SdHbrvDicMapper; +import com.yfd.platform.qgc_base.service.ISdHbrvDicService; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/com/yfd/platform/env/service/impl/SdHycdDicServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdHycdDicServiceImpl.java similarity index 92% rename from backend/src/main/java/com/yfd/platform/env/service/impl/SdHycdDicServiceImpl.java rename to backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdHycdDicServiceImpl.java index a87c2efb..8d2fa828 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/impl/SdHycdDicServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdHycdDicServiceImpl.java @@ -1,10 +1,10 @@ -package com.yfd.platform.env.service.impl; +package com.yfd.platform.qgc_base.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.yfd.platform.env.domain.SdHycdDic; -import com.yfd.platform.env.mapper.SdHycdDicMapper; -import com.yfd.platform.env.service.ISdHycdDicService; +import com.yfd.platform.qgc_base.domain.SdHycdDic; +import com.yfd.platform.qgc_base.mapper.SdHycdDicMapper; +import com.yfd.platform.qgc_base.service.ISdHycdDicService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/backend/src/main/java/com/yfd/platform/env/service/impl/SdHydrobaseServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdHydrobaseServiceImpl.java similarity index 95% rename from backend/src/main/java/com/yfd/platform/env/service/impl/SdHydrobaseServiceImpl.java rename to backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdHydrobaseServiceImpl.java index 1cf1ec78..d73872c9 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/impl/SdHydrobaseServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdHydrobaseServiceImpl.java @@ -1,18 +1,18 @@ -package com.yfd.platform.env.service.impl; +package com.yfd.platform.qgc_base.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.DataSourceResult; -import com.yfd.platform.data.domain.SysUserDataScope; -import com.yfd.platform.data.mapper.SysUserDataScopeMapper; -import com.yfd.platform.env.domain.SdEngInfoBH; -import com.yfd.platform.env.domain.SdHydrobase; -import com.yfd.platform.env.entity.vo.HydrobaseWbsVo; -import com.yfd.platform.env.mapper.SdEngInfoBHMapper; -import com.yfd.platform.env.mapper.SdHydrobaseMapper; -import com.yfd.platform.env.service.ISdHydrobaseService; +import com.yfd.platform.qgc_data.domain.SysUserDataScope; +import com.yfd.platform.qgc_data.mapper.SysUserDataScopeMapper; +import com.yfd.platform.qgc_base.domain.SdEngInfoBH; +import com.yfd.platform.qgc_base.domain.SdHydrobase; +import com.yfd.platform.qgc_base.entity.vo.HydrobaseWbsVo; +import com.yfd.platform.qgc_base.mapper.SdEngInfoBHMapper; +import com.yfd.platform.qgc_base.mapper.SdHydrobaseMapper; +import com.yfd.platform.qgc_base.service.ISdHydrobaseService; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; import java.util.stream.Collectors; diff --git a/backend/src/main/java/com/yfd/platform/env/service/impl/SdRvcdDicServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdRvcdDicServiceImpl.java similarity index 94% rename from backend/src/main/java/com/yfd/platform/env/service/impl/SdRvcdDicServiceImpl.java rename to backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdRvcdDicServiceImpl.java index 85f77a44..1b5bdc36 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/impl/SdRvcdDicServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdRvcdDicServiceImpl.java @@ -1,10 +1,10 @@ -package com.yfd.platform.env.service.impl; +package com.yfd.platform.qgc_base.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.yfd.platform.env.domain.SdRvcdDic; -import com.yfd.platform.env.mapper.SdRvcdDicMapper; -import com.yfd.platform.env.service.ISdRvcdDicService; +import com.yfd.platform.qgc_base.domain.SdRvcdDic; +import com.yfd.platform.qgc_base.mapper.SdRvcdDicMapper; +import com.yfd.platform.qgc_base.service.ISdRvcdDicService; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; diff --git a/backend/src/main/java/com/yfd/platform/env/service/impl/TreeStructureServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/TreeStructureServiceImpl.java similarity index 98% rename from backend/src/main/java/com/yfd/platform/env/service/impl/TreeStructureServiceImpl.java rename to backend/src/main/java/com/yfd/platform/qgc_base/service/impl/TreeStructureServiceImpl.java index 233835d5..0f627d39 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/impl/TreeStructureServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/TreeStructureServiceImpl.java @@ -1,14 +1,12 @@ -package com.yfd.platform.env.service.impl; +package com.yfd.platform.qgc_base.service.impl; -import com.yfd.platform.env.domain.SdEngInfoBH; -import com.yfd.platform.env.domain.SdHydrobase; -import com.yfd.platform.env.domain.SdHbrvDic; -import com.yfd.platform.env.domain.SdHycdDic; -import com.yfd.platform.env.domain.SdPrhbrltnB; -import com.yfd.platform.env.domain.SdPrhyrltnB; -import com.yfd.platform.env.domain.SdRvcdDic; -import com.yfd.platform.env.mapper.*; -import com.yfd.platform.env.service.ITreeStructureService; +import com.yfd.platform.qgc_base.domain.SdEngInfoBH; +import com.yfd.platform.qgc_base.domain.SdHydrobase; +import com.yfd.platform.qgc_base.domain.SdHbrvDic; +import com.yfd.platform.qgc_base.domain.SdHycdDic; +import com.yfd.platform.qgc_base.domain.SdRvcdDic; +import com.yfd.platform.qgc_base.mapper.*; +import com.yfd.platform.qgc_base.service.ITreeStructureService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; diff --git a/backend/src/main/java/com/yfd/platform/data/controller/ApprovalChangeLogController.java b/backend/src/main/java/com/yfd/platform/qgc_data/controller/ApprovalChangeLogController.java similarity index 94% rename from backend/src/main/java/com/yfd/platform/data/controller/ApprovalChangeLogController.java rename to backend/src/main/java/com/yfd/platform/qgc_data/controller/ApprovalChangeLogController.java index 49a2d2fe..01d4e545 100644 --- a/backend/src/main/java/com/yfd/platform/data/controller/ApprovalChangeLogController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/controller/ApprovalChangeLogController.java @@ -1,12 +1,11 @@ -package com.yfd.platform.data.controller; +package com.yfd.platform.qgc_data.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.utils.UserNameFillHelper; import com.yfd.platform.config.ResponseResult; -import com.yfd.platform.data.domain.ApprovalChangeLog; -import com.yfd.platform.data.domain.ApprovalLog; -import com.yfd.platform.data.service.IApprovalChangeLogService; +import com.yfd.platform.qgc_data.domain.ApprovalChangeLog; +import com.yfd.platform.qgc_data.service.IApprovalChangeLogService; import com.yfd.platform.utils.DataSourceRequestUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/backend/src/main/java/com/yfd/platform/data/controller/ApprovalLogController.java b/backend/src/main/java/com/yfd/platform/qgc_data/controller/ApprovalLogController.java similarity index 93% rename from backend/src/main/java/com/yfd/platform/data/controller/ApprovalLogController.java rename to backend/src/main/java/com/yfd/platform/qgc_data/controller/ApprovalLogController.java index b3673615..e92fee25 100644 --- a/backend/src/main/java/com/yfd/platform/data/controller/ApprovalLogController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/controller/ApprovalLogController.java @@ -1,11 +1,10 @@ -package com.yfd.platform.data.controller; +package com.yfd.platform.qgc_data.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.config.ResponseResult; -import com.yfd.platform.data.domain.ApprovalLog; -import com.yfd.platform.data.domain.ApprovalMain; -import com.yfd.platform.data.service.IApprovalLogService; +import com.yfd.platform.qgc_data.domain.ApprovalLog; +import com.yfd.platform.qgc_data.service.IApprovalLogService; import com.yfd.platform.utils.DataSourceRequestUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/backend/src/main/java/com/yfd/platform/data/controller/ApprovalMainController.java b/backend/src/main/java/com/yfd/platform/qgc_data/controller/ApprovalMainController.java similarity index 95% rename from backend/src/main/java/com/yfd/platform/data/controller/ApprovalMainController.java rename to backend/src/main/java/com/yfd/platform/qgc_data/controller/ApprovalMainController.java index c0db9867..2da41270 100644 --- a/backend/src/main/java/com/yfd/platform/data/controller/ApprovalMainController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/controller/ApprovalMainController.java @@ -1,11 +1,11 @@ -package com.yfd.platform.data.controller; +package com.yfd.platform.qgc_data.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.config.ResponseResult; -import com.yfd.platform.data.domain.ApprovalMain; -import com.yfd.platform.data.service.IApprovalMainService; -import com.yfd.platform.data.service.IFishDraftDataService; +import com.yfd.platform.qgc_data.domain.ApprovalMain; +import com.yfd.platform.qgc_data.service.IApprovalMainService; +import com.yfd.platform.qgc_data.service.IFishDraftDataService; import com.yfd.platform.utils.DataSourceRequestUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/backend/src/main/java/com/yfd/platform/data/controller/FishDraftDataController.java b/backend/src/main/java/com/yfd/platform/qgc_data/controller/FishDraftDataController.java similarity index 98% rename from backend/src/main/java/com/yfd/platform/data/controller/FishDraftDataController.java rename to backend/src/main/java/com/yfd/platform/qgc_data/controller/FishDraftDataController.java index 5a84a7c3..6c3b3ce6 100644 --- a/backend/src/main/java/com/yfd/platform/data/controller/FishDraftDataController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/controller/FishDraftDataController.java @@ -1,4 +1,4 @@ -package com.yfd.platform.data.controller; +package com.yfd.platform.qgc_data.controller; import java.io.File; import java.io.FileInputStream; @@ -17,23 +17,21 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fasterxml.jackson.databind.ObjectMapper; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.config.ResponseResult; -import com.yfd.platform.data.domain.*; -import com.yfd.platform.data.domain.vo.FishDraftDataVO; -import com.yfd.platform.data.domain.vo.FishStatisticsVO; -import com.yfd.platform.data.service.AttachmentUploadService; -import com.yfd.platform.data.service.IFishDraftDataService; -import com.yfd.platform.data.service.IFishImportService; -import com.yfd.platform.data.service.IFishStatisticsService; -import com.yfd.platform.data.service.IImportTaskService; -import com.yfd.platform.data.utils.ZipFileUtil; -import com.yfd.platform.utils.KendoUtil; +import com.yfd.platform.qgc_data.domain.*; +import com.yfd.platform.qgc_data.domain.vo.FishDraftDataVO; +import com.yfd.platform.qgc_data.domain.vo.FishStatisticsVO; +import com.yfd.platform.qgc_data.service.AttachmentUploadService; +import com.yfd.platform.qgc_data.service.IFishDraftDataService; +import com.yfd.platform.qgc_data.service.IFishImportService; +import com.yfd.platform.qgc_data.service.IFishStatisticsService; +import com.yfd.platform.qgc_data.service.IImportTaskService; +import com.yfd.platform.qgc_data.utils.ZipFileUtil; import com.yfd.platform.utils.MultipartStreamParser; import com.yfd.platform.utils.SecurityUtils; import io.swagger.v3.oas.annotations.Operation; @@ -49,7 +47,6 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; -import java.io.IOException; import java.util.*; /** @@ -937,7 +934,7 @@ public class FishDraftDataController { @Operation(summary = "清理临时文件") public ResponseResult cleanupTemp(@RequestParam String tempDir) { try { - com.yfd.platform.data.utils.ZipFileUtil.cleanupTempDir(tempDir); + com.yfd.platform.qgc_data.utils.ZipFileUtil.cleanupTempDir(tempDir); return ResponseResult.success("清理成功"); } catch (Exception e) { return ResponseResult.error("清理失败: " + e.getMessage()); diff --git a/backend/src/main/java/com/yfd/platform/data/controller/ImportTaskController.java b/backend/src/main/java/com/yfd/platform/qgc_data/controller/ImportTaskController.java similarity index 97% rename from backend/src/main/java/com/yfd/platform/data/controller/ImportTaskController.java rename to backend/src/main/java/com/yfd/platform/qgc_data/controller/ImportTaskController.java index 3682d35c..2fb05ce1 100644 --- a/backend/src/main/java/com/yfd/platform/data/controller/ImportTaskController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/controller/ImportTaskController.java @@ -1,12 +1,12 @@ -package com.yfd.platform.data.controller; +package com.yfd.platform.qgc_data.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.common.DataSourceLoadOptionsBase; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.config.ResponseResult; -import com.yfd.platform.data.domain.ImportTask; -import com.yfd.platform.data.domain.ImportTaskRequest; -import com.yfd.platform.data.service.IImportTaskService; +import com.yfd.platform.qgc_data.domain.ImportTask; +import com.yfd.platform.qgc_data.domain.ImportTaskRequest; +import com.yfd.platform.qgc_data.service.IImportTaskService; import com.yfd.platform.utils.KendoUtil; import com.yfd.platform.utils.QgcQueryWrapperUtil; import io.swagger.v3.oas.annotations.Operation; diff --git a/backend/src/main/java/com/yfd/platform/data/controller/SysUserDataScopeController.java b/backend/src/main/java/com/yfd/platform/qgc_data/controller/SysUserDataScopeController.java similarity index 94% rename from backend/src/main/java/com/yfd/platform/data/controller/SysUserDataScopeController.java rename to backend/src/main/java/com/yfd/platform/qgc_data/controller/SysUserDataScopeController.java index 6858f423..4abf6143 100644 --- a/backend/src/main/java/com/yfd/platform/data/controller/SysUserDataScopeController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/controller/SysUserDataScopeController.java @@ -1,12 +1,12 @@ -package com.yfd.platform.data.controller; +package com.yfd.platform.qgc_data.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.annotation.Log; import com.yfd.platform.config.ResponseResult; -import com.yfd.platform.data.domain.SysUserDataScope; -import com.yfd.platform.data.domain.bo.EditUserDataScopeBo; -import com.yfd.platform.data.domain.vo.SysUserDataScopeVO; -import com.yfd.platform.data.service.ISysUserDataScopeService; +import com.yfd.platform.qgc_data.domain.SysUserDataScope; +import com.yfd.platform.qgc_data.domain.bo.EditUserDataScopeBo; +import com.yfd.platform.qgc_data.domain.vo.SysUserDataScopeVO; +import com.yfd.platform.qgc_data.service.ISysUserDataScopeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.*; diff --git a/backend/src/main/java/com/yfd/platform/data/domain/ApprovalChangeLog.java b/backend/src/main/java/com/yfd/platform/qgc_data/domain/ApprovalChangeLog.java similarity index 97% rename from backend/src/main/java/com/yfd/platform/data/domain/ApprovalChangeLog.java rename to backend/src/main/java/com/yfd/platform/qgc_data/domain/ApprovalChangeLog.java index 24673fdf..77b9cf70 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/ApprovalChangeLog.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/domain/ApprovalChangeLog.java @@ -1,4 +1,4 @@ -package com.yfd.platform.data.domain; +package com.yfd.platform.qgc_data.domain; import com.baomidou.mybatisplus.annotation.*; import com.yfd.platform.annotation.UserIdField; diff --git a/backend/src/main/java/com/yfd/platform/data/domain/ApprovalLog.java b/backend/src/main/java/com/yfd/platform/qgc_data/domain/ApprovalLog.java similarity index 96% rename from backend/src/main/java/com/yfd/platform/data/domain/ApprovalLog.java rename to backend/src/main/java/com/yfd/platform/qgc_data/domain/ApprovalLog.java index 84f46628..e4726478 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/ApprovalLog.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/domain/ApprovalLog.java @@ -1,4 +1,4 @@ -package com.yfd.platform.data.domain; +package com.yfd.platform.qgc_data.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/data/domain/ApprovalMain.java b/backend/src/main/java/com/yfd/platform/qgc_data/domain/ApprovalMain.java similarity index 97% rename from backend/src/main/java/com/yfd/platform/data/domain/ApprovalMain.java rename to backend/src/main/java/com/yfd/platform/qgc_data/domain/ApprovalMain.java index 1e0a3c1d..495747fe 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/ApprovalMain.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/domain/ApprovalMain.java @@ -1,4 +1,4 @@ -package com.yfd.platform.data.domain; +package com.yfd.platform.qgc_data.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/data/domain/BatchApproveRequest.java b/backend/src/main/java/com/yfd/platform/qgc_data/domain/BatchApproveRequest.java similarity index 91% rename from backend/src/main/java/com/yfd/platform/data/domain/BatchApproveRequest.java rename to backend/src/main/java/com/yfd/platform/qgc_data/domain/BatchApproveRequest.java index 66226b5a..64ada50f 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/BatchApproveRequest.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/domain/BatchApproveRequest.java @@ -1,4 +1,4 @@ -package com.yfd.platform.data.domain; +package com.yfd.platform.qgc_data.domain; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/data/domain/BatchRejectRequest.java b/backend/src/main/java/com/yfd/platform/qgc_data/domain/BatchRejectRequest.java similarity index 92% rename from backend/src/main/java/com/yfd/platform/data/domain/BatchRejectRequest.java rename to backend/src/main/java/com/yfd/platform/qgc_data/domain/BatchRejectRequest.java index fd1deb94..1be41d6c 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/BatchRejectRequest.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/domain/BatchRejectRequest.java @@ -1,4 +1,4 @@ -package com.yfd.platform.data.domain; +package com.yfd.platform.qgc_data.domain; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/data/domain/BatchSaveDraftRequest.java b/backend/src/main/java/com/yfd/platform/qgc_data/domain/BatchSaveDraftRequest.java similarity index 88% rename from backend/src/main/java/com/yfd/platform/data/domain/BatchSaveDraftRequest.java rename to backend/src/main/java/com/yfd/platform/qgc_data/domain/BatchSaveDraftRequest.java index 93bb8b6c..3ff21c0e 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/BatchSaveDraftRequest.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/domain/BatchSaveDraftRequest.java @@ -1,4 +1,4 @@ -package com.yfd.platform.data.domain; +package com.yfd.platform.qgc_data.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/data/domain/FishDraftData.java b/backend/src/main/java/com/yfd/platform/qgc_data/domain/FishDraftData.java similarity index 99% rename from backend/src/main/java/com/yfd/platform/data/domain/FishDraftData.java rename to backend/src/main/java/com/yfd/platform/qgc_data/domain/FishDraftData.java index da33082d..f3f02325 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/FishDraftData.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/domain/FishDraftData.java @@ -1,4 +1,4 @@ -package com.yfd.platform.data.domain; +package com.yfd.platform.qgc_data.domain; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/backend/src/main/java/com/yfd/platform/data/domain/FishImportRequest.java b/backend/src/main/java/com/yfd/platform/qgc_data/domain/FishImportRequest.java similarity index 89% rename from backend/src/main/java/com/yfd/platform/data/domain/FishImportRequest.java rename to backend/src/main/java/com/yfd/platform/qgc_data/domain/FishImportRequest.java index 894aea46..d78f07d2 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/FishImportRequest.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/domain/FishImportRequest.java @@ -1,4 +1,4 @@ -package com.yfd.platform.data.domain; +package com.yfd.platform.qgc_data.domain; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/data/domain/FishImportResult.java b/backend/src/main/java/com/yfd/platform/qgc_data/domain/FishImportResult.java similarity index 98% rename from backend/src/main/java/com/yfd/platform/data/domain/FishImportResult.java rename to backend/src/main/java/com/yfd/platform/qgc_data/domain/FishImportResult.java index 64641db8..c92aa246 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/FishImportResult.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/domain/FishImportResult.java @@ -1,4 +1,4 @@ -package com.yfd.platform.data.domain; +package com.yfd.platform.qgc_data.domain; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/data/domain/FishImportRowRequest.java b/backend/src/main/java/com/yfd/platform/qgc_data/domain/FishImportRowRequest.java similarity index 74% rename from backend/src/main/java/com/yfd/platform/data/domain/FishImportRowRequest.java rename to backend/src/main/java/com/yfd/platform/qgc_data/domain/FishImportRowRequest.java index 3dedff7e..1801a10f 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/FishImportRowRequest.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/domain/FishImportRowRequest.java @@ -1,4 +1,4 @@ -package com.yfd.platform.data.domain; +package com.yfd.platform.qgc_data.domain; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/data/domain/ImportTask.java b/backend/src/main/java/com/yfd/platform/qgc_data/domain/ImportTask.java similarity index 98% rename from backend/src/main/java/com/yfd/platform/data/domain/ImportTask.java rename to backend/src/main/java/com/yfd/platform/qgc_data/domain/ImportTask.java index a1325568..1b1d3e2a 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/ImportTask.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/domain/ImportTask.java @@ -1,4 +1,4 @@ -package com.yfd.platform.data.domain; +package com.yfd.platform.qgc_data.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/data/domain/ImportTaskRequest.java b/backend/src/main/java/com/yfd/platform/qgc_data/domain/ImportTaskRequest.java similarity index 67% rename from backend/src/main/java/com/yfd/platform/data/domain/ImportTaskRequest.java rename to backend/src/main/java/com/yfd/platform/qgc_data/domain/ImportTaskRequest.java index 0a2050e0..55080935 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/ImportTaskRequest.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/domain/ImportTaskRequest.java @@ -1,4 +1,4 @@ -package com.yfd.platform.data.domain; +package com.yfd.platform.qgc_data.domain; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/data/domain/ImportTaskRow.java b/backend/src/main/java/com/yfd/platform/qgc_data/domain/ImportTaskRow.java similarity index 97% rename from backend/src/main/java/com/yfd/platform/data/domain/ImportTaskRow.java rename to backend/src/main/java/com/yfd/platform/qgc_data/domain/ImportTaskRow.java index a43098a2..71527dc8 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/ImportTaskRow.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/domain/ImportTaskRow.java @@ -1,4 +1,4 @@ -package com.yfd.platform.data.domain; +package com.yfd.platform.qgc_data.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/data/domain/SysUserDataScope.java b/backend/src/main/java/com/yfd/platform/qgc_data/domain/SysUserDataScope.java similarity index 97% rename from backend/src/main/java/com/yfd/platform/data/domain/SysUserDataScope.java rename to backend/src/main/java/com/yfd/platform/qgc_data/domain/SysUserDataScope.java index beca8a94..e10f5c91 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/SysUserDataScope.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/domain/SysUserDataScope.java @@ -1,4 +1,4 @@ -package com.yfd.platform.data.domain; +package com.yfd.platform.qgc_data.domain; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; @@ -6,7 +6,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; -import java.sql.Timestamp; import java.util.Date; /** diff --git a/backend/src/main/java/com/yfd/platform/data/domain/bo/EditUserDataScopeBo.java b/backend/src/main/java/com/yfd/platform/qgc_data/domain/bo/EditUserDataScopeBo.java similarity index 60% rename from backend/src/main/java/com/yfd/platform/data/domain/bo/EditUserDataScopeBo.java rename to backend/src/main/java/com/yfd/platform/qgc_data/domain/bo/EditUserDataScopeBo.java index db27b4fa..cb1f04f3 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/bo/EditUserDataScopeBo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/domain/bo/EditUserDataScopeBo.java @@ -1,6 +1,6 @@ -package com.yfd.platform.data.domain.bo; +package com.yfd.platform.qgc_data.domain.bo; -import com.yfd.platform.data.domain.SysUserDataScope; +import com.yfd.platform.qgc_data.domain.SysUserDataScope; import lombok.Data; import java.util.List; diff --git a/backend/src/main/java/com/yfd/platform/data/domain/vo/FishDraftDataVO.java b/backend/src/main/java/com/yfd/platform/qgc_data/domain/vo/FishDraftDataVO.java similarity index 97% rename from backend/src/main/java/com/yfd/platform/data/domain/vo/FishDraftDataVO.java rename to backend/src/main/java/com/yfd/platform/qgc_data/domain/vo/FishDraftDataVO.java index 35fa6218..8f58d3ee 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/vo/FishDraftDataVO.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/domain/vo/FishDraftDataVO.java @@ -1,6 +1,5 @@ -package com.yfd.platform.data.domain.vo; +package com.yfd.platform.qgc_data.domain.vo; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.io.Serializable; diff --git a/backend/src/main/java/com/yfd/platform/data/domain/vo/FishStatisticsVO.java b/backend/src/main/java/com/yfd/platform/qgc_data/domain/vo/FishStatisticsVO.java similarity index 92% rename from backend/src/main/java/com/yfd/platform/data/domain/vo/FishStatisticsVO.java rename to backend/src/main/java/com/yfd/platform/qgc_data/domain/vo/FishStatisticsVO.java index 369cbf9b..0bab5d16 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/vo/FishStatisticsVO.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/domain/vo/FishStatisticsVO.java @@ -1,4 +1,4 @@ -package com.yfd.platform.data.domain.vo; +package com.yfd.platform.qgc_data.domain.vo; import lombok.Data; diff --git a/backend/src/main/java/com/yfd/platform/data/domain/vo/SysUserDataScopeVO.java b/backend/src/main/java/com/yfd/platform/qgc_data/domain/vo/SysUserDataScopeVO.java similarity index 98% rename from backend/src/main/java/com/yfd/platform/data/domain/vo/SysUserDataScopeVO.java rename to backend/src/main/java/com/yfd/platform/qgc_data/domain/vo/SysUserDataScopeVO.java index 7d792e83..89b560f7 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/vo/SysUserDataScopeVO.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/domain/vo/SysUserDataScopeVO.java @@ -1,4 +1,4 @@ -package com.yfd.platform.data.domain.vo; +package com.yfd.platform.qgc_data.domain.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/data/mapper/ApprovalChangeLogMapper.java b/backend/src/main/java/com/yfd/platform/qgc_data/mapper/ApprovalChangeLogMapper.java similarity index 92% rename from backend/src/main/java/com/yfd/platform/data/mapper/ApprovalChangeLogMapper.java rename to backend/src/main/java/com/yfd/platform/qgc_data/mapper/ApprovalChangeLogMapper.java index 4019a25f..7e3be480 100644 --- a/backend/src/main/java/com/yfd/platform/data/mapper/ApprovalChangeLogMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/mapper/ApprovalChangeLogMapper.java @@ -1,7 +1,7 @@ -package com.yfd.platform.data.mapper; +package com.yfd.platform.qgc_data.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yfd.platform.data.domain.ApprovalChangeLog; +import com.yfd.platform.qgc_data.domain.ApprovalChangeLog; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/backend/src/main/java/com/yfd/platform/data/mapper/ApprovalLogMapper.java b/backend/src/main/java/com/yfd/platform/qgc_data/mapper/ApprovalLogMapper.java similarity index 91% rename from backend/src/main/java/com/yfd/platform/data/mapper/ApprovalLogMapper.java rename to backend/src/main/java/com/yfd/platform/qgc_data/mapper/ApprovalLogMapper.java index b522e066..dd6924ad 100644 --- a/backend/src/main/java/com/yfd/platform/data/mapper/ApprovalLogMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/mapper/ApprovalLogMapper.java @@ -1,7 +1,7 @@ -package com.yfd.platform.data.mapper; +package com.yfd.platform.qgc_data.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yfd.platform.data.domain.ApprovalLog; +import com.yfd.platform.qgc_data.domain.ApprovalLog; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/backend/src/main/java/com/yfd/platform/data/mapper/ApprovalMainMapper.java b/backend/src/main/java/com/yfd/platform/qgc_data/mapper/ApprovalMainMapper.java similarity index 92% rename from backend/src/main/java/com/yfd/platform/data/mapper/ApprovalMainMapper.java rename to backend/src/main/java/com/yfd/platform/qgc_data/mapper/ApprovalMainMapper.java index 77fe3bda..097f7184 100644 --- a/backend/src/main/java/com/yfd/platform/data/mapper/ApprovalMainMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/mapper/ApprovalMainMapper.java @@ -1,7 +1,7 @@ -package com.yfd.platform.data.mapper; +package com.yfd.platform.qgc_data.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yfd.platform.data.domain.ApprovalMain; +import com.yfd.platform.qgc_data.domain.ApprovalMain; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/backend/src/main/java/com/yfd/platform/data/mapper/FishDraftDataMapper.java b/backend/src/main/java/com/yfd/platform/qgc_data/mapper/FishDraftDataMapper.java similarity index 95% rename from backend/src/main/java/com/yfd/platform/data/mapper/FishDraftDataMapper.java rename to backend/src/main/java/com/yfd/platform/qgc_data/mapper/FishDraftDataMapper.java index 6ebcbec4..baa8d260 100644 --- a/backend/src/main/java/com/yfd/platform/data/mapper/FishDraftDataMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/mapper/FishDraftDataMapper.java @@ -1,9 +1,9 @@ -package com.yfd.platform.data.mapper; +package com.yfd.platform.qgc_data.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.yfd.platform.data.domain.FishDraftData; -import com.yfd.platform.data.domain.vo.FishDraftDataVO; +import com.yfd.platform.qgc_data.domain.FishDraftData; +import com.yfd.platform.qgc_data.domain.vo.FishDraftDataVO; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/backend/src/main/java/com/yfd/platform/data/mapper/FishStatisticsMapper.java b/backend/src/main/java/com/yfd/platform/qgc_data/mapper/FishStatisticsMapper.java similarity index 84% rename from backend/src/main/java/com/yfd/platform/data/mapper/FishStatisticsMapper.java rename to backend/src/main/java/com/yfd/platform/qgc_data/mapper/FishStatisticsMapper.java index 47a44ece..f0df6603 100644 --- a/backend/src/main/java/com/yfd/platform/data/mapper/FishStatisticsMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/mapper/FishStatisticsMapper.java @@ -1,6 +1,6 @@ -package com.yfd.platform.data.mapper; +package com.yfd.platform.qgc_data.mapper; -import com.yfd.platform.data.domain.vo.FishStatisticsVO; +import com.yfd.platform.qgc_data.domain.vo.FishStatisticsVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/backend/src/main/java/com/yfd/platform/data/mapper/ImportTaskMapper.java b/backend/src/main/java/com/yfd/platform/qgc_data/mapper/ImportTaskMapper.java similarity index 96% rename from backend/src/main/java/com/yfd/platform/data/mapper/ImportTaskMapper.java rename to backend/src/main/java/com/yfd/platform/qgc_data/mapper/ImportTaskMapper.java index a7d4edd0..d811e589 100644 --- a/backend/src/main/java/com/yfd/platform/data/mapper/ImportTaskMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/mapper/ImportTaskMapper.java @@ -1,7 +1,7 @@ -package com.yfd.platform.data.mapper; +package com.yfd.platform.qgc_data.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yfd.platform.data.domain.ImportTask; +import com.yfd.platform.qgc_data.domain.ImportTask; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/backend/src/main/java/com/yfd/platform/data/mapper/ImportTaskRowMapper.java b/backend/src/main/java/com/yfd/platform/qgc_data/mapper/ImportTaskRowMapper.java similarity index 83% rename from backend/src/main/java/com/yfd/platform/data/mapper/ImportTaskRowMapper.java rename to backend/src/main/java/com/yfd/platform/qgc_data/mapper/ImportTaskRowMapper.java index a1e56dbd..1b3b565d 100644 --- a/backend/src/main/java/com/yfd/platform/data/mapper/ImportTaskRowMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/mapper/ImportTaskRowMapper.java @@ -1,7 +1,7 @@ -package com.yfd.platform.data.mapper; +package com.yfd.platform.qgc_data.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yfd.platform.data.domain.ImportTaskRow; +import com.yfd.platform.qgc_data.domain.ImportTaskRow; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/backend/src/main/java/com/yfd/platform/data/mapper/SysUserDataScopeMapper.java b/backend/src/main/java/com/yfd/platform/qgc_data/mapper/SysUserDataScopeMapper.java similarity index 94% rename from backend/src/main/java/com/yfd/platform/data/mapper/SysUserDataScopeMapper.java rename to backend/src/main/java/com/yfd/platform/qgc_data/mapper/SysUserDataScopeMapper.java index e1e10f17..0f947e05 100644 --- a/backend/src/main/java/com/yfd/platform/data/mapper/SysUserDataScopeMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/mapper/SysUserDataScopeMapper.java @@ -1,12 +1,11 @@ -package com.yfd.platform.data.mapper; +package com.yfd.platform.qgc_data.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.yfd.platform.data.domain.SysUserDataScope; +import com.yfd.platform.qgc_data.domain.SysUserDataScope; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** *
diff --git a/backend/src/main/java/com/yfd/platform/data/service/AttachmentUploadService.java b/backend/src/main/java/com/yfd/platform/qgc_data/service/AttachmentUploadService.java similarity index 98% rename from backend/src/main/java/com/yfd/platform/data/service/AttachmentUploadService.java rename to backend/src/main/java/com/yfd/platform/qgc_data/service/AttachmentUploadService.java index 2531588b..5f12b0d4 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/AttachmentUploadService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/service/AttachmentUploadService.java @@ -1,4 +1,4 @@ -package com.yfd.platform.data.service; +package com.yfd.platform.qgc_data.service; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; @@ -6,9 +6,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; import java.io.File; import java.io.IOException; import java.net.URI; @@ -16,8 +13,6 @@ import java.net.http.HttpClient; import java.net.http.HttpRequest; import java.net.http.HttpResponse; import java.nio.file.Files; -import java.security.SecureRandom; -import java.security.cert.X509Certificate; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/backend/src/main/java/com/yfd/platform/data/service/IApprovalChangeLogService.java b/backend/src/main/java/com/yfd/platform/qgc_data/service/IApprovalChangeLogService.java similarity index 89% rename from backend/src/main/java/com/yfd/platform/data/service/IApprovalChangeLogService.java rename to backend/src/main/java/com/yfd/platform/qgc_data/service/IApprovalChangeLogService.java index 92d7e2c6..9791db41 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/IApprovalChangeLogService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/service/IApprovalChangeLogService.java @@ -1,7 +1,7 @@ -package com.yfd.platform.data.service; +package com.yfd.platform.qgc_data.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.yfd.platform.data.domain.ApprovalChangeLog; +import com.yfd.platform.qgc_data.domain.ApprovalChangeLog; import java.util.List; diff --git a/backend/src/main/java/com/yfd/platform/data/service/IApprovalLogService.java b/backend/src/main/java/com/yfd/platform/qgc_data/service/IApprovalLogService.java similarity index 89% rename from backend/src/main/java/com/yfd/platform/data/service/IApprovalLogService.java rename to backend/src/main/java/com/yfd/platform/qgc_data/service/IApprovalLogService.java index 575273ea..4ab5d419 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/IApprovalLogService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/service/IApprovalLogService.java @@ -1,7 +1,7 @@ -package com.yfd.platform.data.service; +package com.yfd.platform.qgc_data.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.yfd.platform.data.domain.ApprovalLog; +import com.yfd.platform.qgc_data.domain.ApprovalLog; import java.util.List; diff --git a/backend/src/main/java/com/yfd/platform/data/service/IApprovalMainService.java b/backend/src/main/java/com/yfd/platform/qgc_data/service/IApprovalMainService.java similarity index 88% rename from backend/src/main/java/com/yfd/platform/data/service/IApprovalMainService.java rename to backend/src/main/java/com/yfd/platform/qgc_data/service/IApprovalMainService.java index 2c186516..06fb2045 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/IApprovalMainService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/service/IApprovalMainService.java @@ -1,9 +1,8 @@ -package com.yfd.platform.data.service; +package com.yfd.platform.qgc_data.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.yfd.platform.data.domain.ApprovalMain; -import org.springframework.web.bind.annotation.RequestParam; +import com.yfd.platform.qgc_data.domain.ApprovalMain; import java.util.List; diff --git a/backend/src/main/java/com/yfd/platform/data/service/IFishDraftDataService.java b/backend/src/main/java/com/yfd/platform/qgc_data/service/IFishDraftDataService.java similarity index 93% rename from backend/src/main/java/com/yfd/platform/data/service/IFishDraftDataService.java rename to backend/src/main/java/com/yfd/platform/qgc_data/service/IFishDraftDataService.java index 25041724..742d6c88 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/IFishDraftDataService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/service/IFishDraftDataService.java @@ -1,10 +1,10 @@ -package com.yfd.platform.data.service; +package com.yfd.platform.qgc_data.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.yfd.platform.common.DataSourceRequest; -import com.yfd.platform.data.domain.FishDraftData; -import com.yfd.platform.data.domain.vo.FishDraftDataVO; +import com.yfd.platform.qgc_data.domain.FishDraftData; +import com.yfd.platform.qgc_data.domain.vo.FishDraftDataVO; import java.util.List; diff --git a/backend/src/main/java/com/yfd/platform/data/service/IFishImportService.java b/backend/src/main/java/com/yfd/platform/qgc_data/service/IFishImportService.java similarity index 86% rename from backend/src/main/java/com/yfd/platform/data/service/IFishImportService.java rename to backend/src/main/java/com/yfd/platform/qgc_data/service/IFishImportService.java index 4862f013..1aafd8a1 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/IFishImportService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/service/IFishImportService.java @@ -1,15 +1,14 @@ -package com.yfd.platform.data.service; +package com.yfd.platform.qgc_data.service; -import com.yfd.platform.data.domain.FishDraftData; -import com.yfd.platform.data.domain.FishImportRequest; -import com.yfd.platform.data.domain.FishImportResult; -import com.yfd.platform.data.utils.ZipFileUtil; +import com.yfd.platform.qgc_data.domain.FishDraftData; +import com.yfd.platform.qgc_data.domain.FishImportRequest; +import com.yfd.platform.qgc_data.domain.FishImportResult; +import com.yfd.platform.qgc_data.utils.ZipFileUtil; import org.springframework.web.multipart.MultipartFile; import java.io.File; import java.io.InputStream; import java.util.List; -import java.util.Map; /** *
diff --git a/backend/src/main/java/com/yfd/platform/data/service/IFishStatisticsService.java b/backend/src/main/java/com/yfd/platform/qgc_data/service/IFishStatisticsService.java similarity index 69% rename from backend/src/main/java/com/yfd/platform/data/service/IFishStatisticsService.java rename to backend/src/main/java/com/yfd/platform/qgc_data/service/IFishStatisticsService.java index 514d485e..4a08e371 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/IFishStatisticsService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/service/IFishStatisticsService.java @@ -1,8 +1,8 @@ -package com.yfd.platform.data.service; +package com.yfd.platform.qgc_data.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.common.DataSourceRequest; -import com.yfd.platform.data.domain.vo.FishStatisticsVO; +import com.yfd.platform.qgc_data.domain.vo.FishStatisticsVO; public interface IFishStatisticsService { diff --git a/backend/src/main/java/com/yfd/platform/data/service/IFishZipImportService.java b/backend/src/main/java/com/yfd/platform/qgc_data/service/IFishZipImportService.java similarity index 90% rename from backend/src/main/java/com/yfd/platform/data/service/IFishZipImportService.java rename to backend/src/main/java/com/yfd/platform/qgc_data/service/IFishZipImportService.java index a8534399..0f48a740 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/IFishZipImportService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/service/IFishZipImportService.java @@ -1,6 +1,6 @@ -package com.yfd.platform.data.service; +package com.yfd.platform.qgc_data.service; -import com.yfd.platform.data.domain.FishImportResult; +import com.yfd.platform.qgc_data.domain.FishImportResult; import java.io.InputStream; diff --git a/backend/src/main/java/com/yfd/platform/data/service/IImportTaskService.java b/backend/src/main/java/com/yfd/platform/qgc_data/service/IImportTaskService.java similarity index 92% rename from backend/src/main/java/com/yfd/platform/data/service/IImportTaskService.java rename to backend/src/main/java/com/yfd/platform/qgc_data/service/IImportTaskService.java index d0ca0b73..dd880fc7 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/IImportTaskService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/service/IImportTaskService.java @@ -1,10 +1,10 @@ -package com.yfd.platform.data.service; +package com.yfd.platform.qgc_data.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.yfd.platform.data.domain.FishImportResult; -import com.yfd.platform.data.domain.ImportTask; -import com.yfd.platform.data.domain.ImportTaskRow; +import com.yfd.platform.qgc_data.domain.FishImportResult; +import com.yfd.platform.qgc_data.domain.ImportTask; +import com.yfd.platform.qgc_data.domain.ImportTaskRow; import java.util.List; diff --git a/backend/src/main/java/com/yfd/platform/data/service/ISysUserDataScopeService.java b/backend/src/main/java/com/yfd/platform/qgc_data/service/ISysUserDataScopeService.java similarity index 89% rename from backend/src/main/java/com/yfd/platform/data/service/ISysUserDataScopeService.java rename to backend/src/main/java/com/yfd/platform/qgc_data/service/ISysUserDataScopeService.java index a4f75d35..9763c025 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/ISysUserDataScopeService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/service/ISysUserDataScopeService.java @@ -1,10 +1,10 @@ -package com.yfd.platform.data.service; +package com.yfd.platform.qgc_data.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.yfd.platform.data.domain.SysUserDataScope; -import com.yfd.platform.data.domain.bo.EditUserDataScopeBo; -import com.yfd.platform.data.domain.vo.SysUserDataScopeVO; +import com.yfd.platform.qgc_data.domain.SysUserDataScope; +import com.yfd.platform.qgc_data.domain.bo.EditUserDataScopeBo; +import com.yfd.platform.qgc_data.domain.vo.SysUserDataScopeVO; import java.util.List; diff --git a/backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalChangeLogServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/ApprovalChangeLogServiceImpl.java similarity index 90% rename from backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalChangeLogServiceImpl.java rename to backend/src/main/java/com/yfd/platform/qgc_data/service/impl/ApprovalChangeLogServiceImpl.java index 0e4782a8..895cb7a1 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalChangeLogServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/ApprovalChangeLogServiceImpl.java @@ -1,11 +1,9 @@ -package com.yfd.platform.data.service.impl; +package com.yfd.platform.qgc_data.service.impl; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.yfd.platform.data.domain.ApprovalChangeLog; -import com.yfd.platform.data.mapper.ApprovalChangeLogMapper; -import com.yfd.platform.data.service.IApprovalChangeLogService; -import com.yfd.platform.system.domain.SysUser; +import com.yfd.platform.qgc_data.domain.ApprovalChangeLog; +import com.yfd.platform.qgc_data.mapper.ApprovalChangeLogMapper; +import com.yfd.platform.qgc_data.service.IApprovalChangeLogService; import com.yfd.platform.system.mapper.SysUserMapper; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalLogServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/ApprovalLogServiceImpl.java similarity index 93% rename from backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalLogServiceImpl.java rename to backend/src/main/java/com/yfd/platform/qgc_data/service/impl/ApprovalLogServiceImpl.java index cb491738..b3a577be 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalLogServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/ApprovalLogServiceImpl.java @@ -1,10 +1,10 @@ -package com.yfd.platform.data.service.impl; +package com.yfd.platform.qgc_data.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.yfd.platform.data.domain.ApprovalLog; -import com.yfd.platform.data.mapper.ApprovalLogMapper; -import com.yfd.platform.data.service.IApprovalLogService; +import com.yfd.platform.qgc_data.domain.ApprovalLog; +import com.yfd.platform.qgc_data.mapper.ApprovalLogMapper; +import com.yfd.platform.qgc_data.service.IApprovalLogService; import com.yfd.platform.system.domain.SysUser; import com.yfd.platform.system.mapper.SysUserMapper; import jakarta.annotation.Resource; diff --git a/backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalMainServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/ApprovalMainServiceImpl.java similarity index 91% rename from backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalMainServiceImpl.java rename to backend/src/main/java/com/yfd/platform/qgc_data/service/impl/ApprovalMainServiceImpl.java index 27923ee2..caca4a50 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalMainServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/ApprovalMainServiceImpl.java @@ -1,15 +1,13 @@ -package com.yfd.platform.data.service.impl; +package com.yfd.platform.qgc_data.service.impl; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.yfd.platform.data.domain.ApprovalMain; -import com.yfd.platform.data.domain.SysUserDataScope; -import com.yfd.platform.data.mapper.ApprovalMainMapper; -import com.yfd.platform.data.mapper.SysUserDataScopeMapper; -import com.yfd.platform.data.service.IApprovalLogService; -import com.yfd.platform.data.service.IApprovalMainService; +import com.yfd.platform.qgc_data.domain.ApprovalMain; +import com.yfd.platform.qgc_data.mapper.ApprovalMainMapper; +import com.yfd.platform.qgc_data.mapper.SysUserDataScopeMapper; +import com.yfd.platform.qgc_data.service.IApprovalLogService; +import com.yfd.platform.qgc_data.service.IApprovalMainService; import com.yfd.platform.system.domain.SysUser; import com.yfd.platform.system.mapper.SysUserMapper; import jakarta.annotation.Resource; @@ -18,7 +16,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; import java.util.*; -import java.util.stream.Collectors; /** *
diff --git a/backend/src/main/java/com/yfd/platform/data/service/impl/FishDraftDataServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/FishDraftDataServiceImpl.java similarity index 96% rename from backend/src/main/java/com/yfd/platform/data/service/impl/FishDraftDataServiceImpl.java rename to backend/src/main/java/com/yfd/platform/qgc_data/service/impl/FishDraftDataServiceImpl.java index 4fd0c39e..2d723be6 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/impl/FishDraftDataServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/FishDraftDataServiceImpl.java @@ -1,4 +1,4 @@ -package com.yfd.platform.data.service.impl; +package com.yfd.platform.qgc_data.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -7,23 +7,23 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yfd.platform.common.DataSourceLoadOptionsBase; import com.yfd.platform.common.DataSourceRequest; -import com.yfd.platform.data.domain.ApprovalMain; -import com.yfd.platform.data.domain.FishDraftData; -import com.yfd.platform.data.domain.SysUserDataScope; -import com.yfd.platform.data.domain.vo.FishDraftDataVO; -import com.yfd.platform.data.mapper.FishDraftDataMapper; -import com.yfd.platform.data.mapper.SysUserDataScopeMapper; -import com.yfd.platform.data.service.IApprovalChangeLogService; -import com.yfd.platform.data.service.IApprovalLogService; -import com.yfd.platform.data.service.IApprovalMainService; -import com.yfd.platform.data.service.IFishDraftDataService; -import com.yfd.platform.env.domain.SdEngInfoBH; -import com.yfd.platform.env.domain.SdFpssR; -import com.yfd.platform.env.domain.SdHbrvDic; -import com.yfd.platform.env.mapper.SdEngInfoBHMapper; -import com.yfd.platform.env.mapper.SdFpssRMapper; -import com.yfd.platform.env.mapper.SdHbrvDicMapper; -import com.yfd.platform.env.service.ISdFpssRService; +import com.yfd.platform.qgc_data.domain.ApprovalMain; +import com.yfd.platform.qgc_data.domain.FishDraftData; +import com.yfd.platform.qgc_data.domain.SysUserDataScope; +import com.yfd.platform.qgc_data.domain.vo.FishDraftDataVO; +import com.yfd.platform.qgc_data.mapper.FishDraftDataMapper; +import com.yfd.platform.qgc_data.mapper.SysUserDataScopeMapper; +import com.yfd.platform.qgc_data.service.IApprovalChangeLogService; +import com.yfd.platform.qgc_data.service.IApprovalLogService; +import com.yfd.platform.qgc_data.service.IApprovalMainService; +import com.yfd.platform.qgc_data.service.IFishDraftDataService; +import com.yfd.platform.qgc_base.domain.SdEngInfoBH; +import com.yfd.platform.qgc_base.domain.SdFpssR; +import com.yfd.platform.qgc_base.domain.SdHbrvDic; +import com.yfd.platform.qgc_base.mapper.SdEngInfoBHMapper; +import com.yfd.platform.qgc_base.mapper.SdFpssRMapper; +import com.yfd.platform.qgc_base.mapper.SdHbrvDicMapper; +import com.yfd.platform.qgc_base.service.ISdFpssRService; import com.yfd.platform.system.domain.SysUser; import com.yfd.platform.system.mapper.SysUserMapper; import com.yfd.platform.utils.KendoUtil; @@ -32,11 +32,8 @@ import com.yfd.platform.utils.SecurityUtils; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.executor.BatchResult; -import org.springframework.security.core.GrantedAuthority; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.StringUtils; import java.util.*; diff --git a/backend/src/main/java/com/yfd/platform/data/service/impl/FishImportServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/FishImportServiceImpl.java similarity index 99% rename from backend/src/main/java/com/yfd/platform/data/service/impl/FishImportServiceImpl.java rename to backend/src/main/java/com/yfd/platform/qgc_data/service/impl/FishImportServiceImpl.java index 5d49a60f..6df1f3fd 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/impl/FishImportServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/FishImportServiceImpl.java @@ -1,23 +1,22 @@ -package com.yfd.platform.data.service.impl; +package com.yfd.platform.qgc_data.service.impl; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.fasterxml.jackson.databind.exc.InvalidFormatException; -import com.yfd.platform.data.domain.FishDraftData; -import com.yfd.platform.data.domain.FishImportRequest; -import com.yfd.platform.data.domain.FishImportResult; -import com.yfd.platform.data.domain.SysUserDataScope; -import com.yfd.platform.data.mapper.SysUserDataScopeMapper; -import com.yfd.platform.data.service.AttachmentUploadService; -import com.yfd.platform.data.service.IFishDraftDataService; -import com.yfd.platform.data.service.IFishImportService; -import com.yfd.platform.data.utils.ZipFileUtil; -import com.yfd.platform.env.domain.*; -import com.yfd.platform.env.mapper.*; +import com.yfd.platform.qgc_data.domain.FishDraftData; +import com.yfd.platform.qgc_data.domain.FishImportRequest; +import com.yfd.platform.qgc_data.domain.FishImportResult; +import com.yfd.platform.qgc_data.domain.SysUserDataScope; +import com.yfd.platform.qgc_data.mapper.SysUserDataScopeMapper; +import com.yfd.platform.qgc_data.service.AttachmentUploadService; +import com.yfd.platform.qgc_data.service.IFishDraftDataService; +import com.yfd.platform.qgc_data.service.IFishImportService; +import com.yfd.platform.qgc_data.utils.ZipFileUtil; +import com.yfd.platform.qgc_base.domain.*; +import com.yfd.platform.qgc_base.mapper.*; import com.yfd.platform.system.service.ISysDictionaryItemsService; import com.yfd.platform.system.service.ISysDictionaryService; -import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.poi.EncryptedDocumentException; @@ -34,7 +33,6 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.math.BigDecimal; -import java.text.ParseException; import java.text.ParsePosition; import java.text.SimpleDateFormat; import java.util.*; diff --git a/backend/src/main/java/com/yfd/platform/data/service/impl/FishStatisticsServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/FishStatisticsServiceImpl.java similarity index 89% rename from backend/src/main/java/com/yfd/platform/data/service/impl/FishStatisticsServiceImpl.java rename to backend/src/main/java/com/yfd/platform/qgc_data/service/impl/FishStatisticsServiceImpl.java index 8e975ed9..87749f86 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/impl/FishStatisticsServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/FishStatisticsServiceImpl.java @@ -1,13 +1,12 @@ -package com.yfd.platform.data.service.impl; +package com.yfd.platform.qgc_data.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.common.DataSourceLoadOptionsBase; import com.yfd.platform.common.DataSourceRequest; -import com.yfd.platform.data.domain.vo.FishStatisticsVO; -import com.yfd.platform.data.mapper.FishStatisticsMapper; -import com.yfd.platform.data.service.IFishStatisticsService; -import com.yfd.platform.utils.KendoUtil; +import com.yfd.platform.qgc_data.domain.vo.FishStatisticsVO; +import com.yfd.platform.qgc_data.mapper.FishStatisticsMapper; +import com.yfd.platform.qgc_data.service.IFishStatisticsService; import com.yfd.platform.utils.QgcQueryWrapperUtil; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/yfd/platform/data/service/impl/ImportTaskServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/ImportTaskServiceImpl.java similarity index 97% rename from backend/src/main/java/com/yfd/platform/data/service/impl/ImportTaskServiceImpl.java rename to backend/src/main/java/com/yfd/platform/qgc_data/service/impl/ImportTaskServiceImpl.java index 7b6e8e91..db0b1550 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/impl/ImportTaskServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/ImportTaskServiceImpl.java @@ -1,4 +1,4 @@ -package com.yfd.platform.data.service.impl; +package com.yfd.platform.qgc_data.service.impl; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; @@ -8,24 +8,22 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.yfd.platform.data.domain.FishDraftData; -import com.yfd.platform.data.domain.FishImportResult; -import com.yfd.platform.data.domain.ImportTask; -import com.yfd.platform.data.domain.ImportTaskRow; -import com.yfd.platform.data.mapper.ImportTaskMapper; -import com.yfd.platform.data.mapper.ImportTaskRowMapper; -import com.yfd.platform.data.service.AttachmentUploadService; -import com.yfd.platform.data.service.IImportTaskService; +import com.yfd.platform.qgc_data.domain.FishDraftData; +import com.yfd.platform.qgc_data.domain.FishImportResult; +import com.yfd.platform.qgc_data.domain.ImportTask; +import com.yfd.platform.qgc_data.domain.ImportTaskRow; +import com.yfd.platform.qgc_data.mapper.ImportTaskMapper; +import com.yfd.platform.qgc_data.mapper.ImportTaskRowMapper; +import com.yfd.platform.qgc_data.service.AttachmentUploadService; +import com.yfd.platform.qgc_data.service.IImportTaskService; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; import java.util.*; import java.util.concurrent.CompletableFuture; -import java.util.stream.Collectors; /** *
diff --git a/backend/src/main/java/com/yfd/platform/data/service/impl/SysUserDataScopeServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/SysUserDataScopeServiceImpl.java
similarity index 93%
rename from backend/src/main/java/com/yfd/platform/data/service/impl/SysUserDataScopeServiceImpl.java
rename to backend/src/main/java/com/yfd/platform/qgc_data/service/impl/SysUserDataScopeServiceImpl.java
index a1e86244..1f106acb 100644
--- a/backend/src/main/java/com/yfd/platform/data/service/impl/SysUserDataScopeServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/SysUserDataScopeServiceImpl.java
@@ -1,25 +1,25 @@
-package com.yfd.platform.data.service.impl;
+package com.yfd.platform.qgc_data.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yfd.platform.data.domain.SysUserDataScope;
-import com.yfd.platform.data.domain.bo.EditUserDataScopeBo;
-import com.yfd.platform.data.domain.vo.SysUserDataScopeVO;
-import com.yfd.platform.data.mapper.SysUserDataScopeMapper;
-import com.yfd.platform.data.service.ISysUserDataScopeService;
-import com.yfd.platform.env.domain.SdEngInfoBH;
-import com.yfd.platform.env.domain.SdHbrvDic;
-import com.yfd.platform.env.domain.SdHycdDic;
-import com.yfd.platform.env.domain.SdHydrobase;
-import com.yfd.platform.env.domain.SdRvcdDic;
-import com.yfd.platform.env.mapper.SdEngInfoBHMapper;
-import com.yfd.platform.env.mapper.SdHbrvDicMapper;
-import com.yfd.platform.env.mapper.SdHycdDicMapper;
-import com.yfd.platform.env.mapper.SdHydrobaseMapper;
-import com.yfd.platform.env.mapper.SdRvcdDicMapper;
+import com.yfd.platform.qgc_data.domain.SysUserDataScope;
+import com.yfd.platform.qgc_data.domain.bo.EditUserDataScopeBo;
+import com.yfd.platform.qgc_data.domain.vo.SysUserDataScopeVO;
+import com.yfd.platform.qgc_data.mapper.SysUserDataScopeMapper;
+import com.yfd.platform.qgc_data.service.ISysUserDataScopeService;
+import com.yfd.platform.qgc_base.domain.SdEngInfoBH;
+import com.yfd.platform.qgc_base.domain.SdHbrvDic;
+import com.yfd.platform.qgc_base.domain.SdHycdDic;
+import com.yfd.platform.qgc_base.domain.SdHydrobase;
+import com.yfd.platform.qgc_base.domain.SdRvcdDic;
+import com.yfd.platform.qgc_base.mapper.SdEngInfoBHMapper;
+import com.yfd.platform.qgc_base.mapper.SdHbrvDicMapper;
+import com.yfd.platform.qgc_base.mapper.SdHycdDicMapper;
+import com.yfd.platform.qgc_base.mapper.SdHydrobaseMapper;
+import com.yfd.platform.qgc_base.mapper.SdRvcdDicMapper;
import com.yfd.platform.system.domain.SysUser;
import com.yfd.platform.system.mapper.SysUserMapper;
import jakarta.annotation.Resource;
diff --git a/backend/src/main/java/com/yfd/platform/data/utils/ZipFileUtil.java b/backend/src/main/java/com/yfd/platform/qgc_data/utils/ZipFileUtil.java
similarity index 99%
rename from backend/src/main/java/com/yfd/platform/data/utils/ZipFileUtil.java
rename to backend/src/main/java/com/yfd/platform/qgc_data/utils/ZipFileUtil.java
index d183bca2..bcfd2ef3 100644
--- a/backend/src/main/java/com/yfd/platform/data/utils/ZipFileUtil.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_data/utils/ZipFileUtil.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.data.utils;
+package com.yfd.platform.qgc_data.utils;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.StrUtil;
diff --git a/backend/src/main/java/com/yfd/platform/eng/controller/AlarmPointController.java b/backend/src/main/java/com/yfd/platform/qgc_eng/controller/AlarmPointController.java
similarity index 92%
rename from backend/src/main/java/com/yfd/platform/eng/controller/AlarmPointController.java
rename to backend/src/main/java/com/yfd/platform/qgc_eng/controller/AlarmPointController.java
index 76ace5c0..02fcd23a 100644
--- a/backend/src/main/java/com/yfd/platform/eng/controller/AlarmPointController.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/controller/AlarmPointController.java
@@ -1,11 +1,11 @@
-package com.yfd.platform.eng.controller;
+package com.yfd.platform.qgc_eng.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.common.DataSourceResult;
import com.yfd.platform.config.ResponseResult;
-import com.yfd.platform.eng.entity.vo.AlarmStcdCountVo;
-import com.yfd.platform.eng.service.AlarmPointService;
+import com.yfd.platform.qgc_eng.entity.vo.AlarmStcdCountVo;
+import com.yfd.platform.qgc_eng.service.AlarmPointService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.PostMapping;
diff --git a/backend/src/main/java/com/yfd/platform/eng/controller/EngEqController.java b/backend/src/main/java/com/yfd/platform/qgc_eng/controller/EngEqController.java
similarity index 98%
rename from backend/src/main/java/com/yfd/platform/eng/controller/EngEqController.java
rename to backend/src/main/java/com/yfd/platform/qgc_eng/controller/EngEqController.java
index 7dda1323..c05b2e6e 100644
--- a/backend/src/main/java/com/yfd/platform/eng/controller/EngEqController.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/controller/EngEqController.java
@@ -1,11 +1,11 @@
-package com.yfd.platform.eng.controller;
+package com.yfd.platform.qgc_eng.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.common.DataSourceResult;
import com.yfd.platform.common.GroupResult;
import com.yfd.platform.config.ResponseResult;
-import com.yfd.platform.eng.service.EngEqService;
+import com.yfd.platform.qgc_eng.service.EngEqService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.PostMapping;
diff --git a/backend/src/main/java/com/yfd/platform/eng/controller/EngEqDataController.java b/backend/src/main/java/com/yfd/platform/qgc_eng/controller/EngEqDataController.java
similarity index 98%
rename from backend/src/main/java/com/yfd/platform/eng/controller/EngEqDataController.java
rename to backend/src/main/java/com/yfd/platform/qgc_eng/controller/EngEqDataController.java
index 6b0f1a90..60a072f5 100644
--- a/backend/src/main/java/com/yfd/platform/eng/controller/EngEqDataController.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/controller/EngEqDataController.java
@@ -1,10 +1,10 @@
-package com.yfd.platform.eng.controller;
+package com.yfd.platform.qgc_eng.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.common.DataSourceResult;
import com.yfd.platform.config.ResponseResult;
-import com.yfd.platform.eng.service.EngEqDataService;
+import com.yfd.platform.qgc_eng.service.EngEqDataService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
diff --git a/backend/src/main/java/com/yfd/platform/eng/controller/EngEqIntervalController.java b/backend/src/main/java/com/yfd/platform/qgc_eng/controller/EngEqIntervalController.java
similarity index 95%
rename from backend/src/main/java/com/yfd/platform/eng/controller/EngEqIntervalController.java
rename to backend/src/main/java/com/yfd/platform/qgc_eng/controller/EngEqIntervalController.java
index c70a96d7..57871c1d 100644
--- a/backend/src/main/java/com/yfd/platform/eng/controller/EngEqIntervalController.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/controller/EngEqIntervalController.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.eng.controller;
+package com.yfd.platform.qgc_eng.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yfd.platform.annotation.Log;
@@ -6,12 +6,11 @@ import com.yfd.platform.common.DataSourceLoadOptionsBase;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.common.DataSourceResult;
import com.yfd.platform.config.ResponseResult;
-import com.yfd.platform.eng.domain.MsEngEq;
-import com.yfd.platform.eng.service.EngEqIntervalService;
-import com.yfd.platform.eng.service.EngEqService;
+import com.yfd.platform.qgc_eng.domain.MsEngEq;
+import com.yfd.platform.qgc_eng.service.EngEqIntervalService;
+import com.yfd.platform.qgc_eng.service.EngEqService;
import com.yfd.platform.utils.KendoUtil;
import com.yfd.platform.utils.QgcQueryWrapperUtil;
-import com.yfd.platform.utils.QueryWrapperUtil;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
diff --git a/backend/src/main/java/com/yfd/platform/eng/controller/EngEqStatController.java b/backend/src/main/java/com/yfd/platform/qgc_eng/controller/EngEqStatController.java
similarity index 95%
rename from backend/src/main/java/com/yfd/platform/eng/controller/EngEqStatController.java
rename to backend/src/main/java/com/yfd/platform/qgc_eng/controller/EngEqStatController.java
index d88865bd..9460967c 100644
--- a/backend/src/main/java/com/yfd/platform/eng/controller/EngEqStatController.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/controller/EngEqStatController.java
@@ -1,11 +1,11 @@
-package com.yfd.platform.eng.controller;
+package com.yfd.platform.qgc_eng.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.common.DataSourceResult;
import com.yfd.platform.common.GroupResult;
import com.yfd.platform.config.ResponseResult;
-import com.yfd.platform.eng.service.EngEqService;
+import com.yfd.platform.qgc_eng.service.EngEqService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
diff --git a/backend/src/main/java/com/yfd/platform/eng/controller/EngSpecialController.java b/backend/src/main/java/com/yfd/platform/qgc_eng/controller/EngSpecialController.java
similarity index 91%
rename from backend/src/main/java/com/yfd/platform/eng/controller/EngSpecialController.java
rename to backend/src/main/java/com/yfd/platform/qgc_eng/controller/EngSpecialController.java
index 194bea98..04aac605 100644
--- a/backend/src/main/java/com/yfd/platform/eng/controller/EngSpecialController.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/controller/EngSpecialController.java
@@ -1,11 +1,11 @@
-package com.yfd.platform.eng.controller;
+package com.yfd.platform.qgc_eng.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.common.DataSourceResult;
import com.yfd.platform.config.ResponseResult;
-import com.yfd.platform.eng.entity.EqSpecial;
-import com.yfd.platform.eng.service.EngSpecialService;
+import com.yfd.platform.qgc_eng.entity.EqSpecial;
+import com.yfd.platform.qgc_eng.service.EngSpecialService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
diff --git a/backend/src/main/java/com/yfd/platform/eng/domain/MsEngEq.java b/backend/src/main/java/com/yfd/platform/qgc_eng/domain/MsEngEq.java
similarity index 95%
rename from backend/src/main/java/com/yfd/platform/eng/domain/MsEngEq.java
rename to backend/src/main/java/com/yfd/platform/qgc_eng/domain/MsEngEq.java
index 28c4018f..6078be33 100644
--- a/backend/src/main/java/com/yfd/platform/eng/domain/MsEngEq.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/domain/MsEngEq.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.eng.domain;
+package com.yfd.platform.qgc_eng.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/eng/entity/EqSpecial.java b/backend/src/main/java/com/yfd/platform/qgc_eng/entity/EqSpecial.java
similarity index 94%
rename from backend/src/main/java/com/yfd/platform/eng/entity/EqSpecial.java
rename to backend/src/main/java/com/yfd/platform/qgc_eng/entity/EqSpecial.java
index f8a116da..d7d1ba24 100644
--- a/backend/src/main/java/com/yfd/platform/eng/entity/EqSpecial.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/entity/EqSpecial.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.eng.entity;
+package com.yfd.platform.qgc_eng.entity;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/eng/entity/vo/AlarmStcdCountVo.java b/backend/src/main/java/com/yfd/platform/qgc_eng/entity/vo/AlarmStcdCountVo.java
similarity index 92%
rename from backend/src/main/java/com/yfd/platform/eng/entity/vo/AlarmStcdCountVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_eng/entity/vo/AlarmStcdCountVo.java
index d06eebea..01635f24 100644
--- a/backend/src/main/java/com/yfd/platform/eng/entity/vo/AlarmStcdCountVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/entity/vo/AlarmStcdCountVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.eng.entity.vo;
+package com.yfd.platform.qgc_eng.entity.vo;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/eng/entity/vo/EngEqDataVo.java b/backend/src/main/java/com/yfd/platform/qgc_eng/entity/vo/EngEqDataVo.java
similarity index 93%
rename from backend/src/main/java/com/yfd/platform/eng/entity/vo/EngEqDataVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_eng/entity/vo/EngEqDataVo.java
index eea49d20..2dc3c7bd 100644
--- a/backend/src/main/java/com/yfd/platform/eng/entity/vo/EngEqDataVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/entity/vo/EngEqDataVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.eng.entity.vo;
+package com.yfd.platform.qgc_eng.entity.vo;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/eng/entity/vo/EngEqDayDataVo.java b/backend/src/main/java/com/yfd/platform/qgc_eng/entity/vo/EngEqDayDataVo.java
similarity index 94%
rename from backend/src/main/java/com/yfd/platform/eng/entity/vo/EngEqDayDataVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_eng/entity/vo/EngEqDayDataVo.java
index adf9671d..f349dcab 100644
--- a/backend/src/main/java/com/yfd/platform/eng/entity/vo/EngEqDayDataVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/entity/vo/EngEqDayDataVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.eng.entity.vo;
+package com.yfd.platform.qgc_eng.entity.vo;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/eng/entity/vo/EngEqDrtpDataVo.java b/backend/src/main/java/com/yfd/platform/qgc_eng/entity/vo/EngEqDrtpDataVo.java
similarity index 94%
rename from backend/src/main/java/com/yfd/platform/eng/entity/vo/EngEqDrtpDataVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_eng/entity/vo/EngEqDrtpDataVo.java
index 4c108a1e..64880657 100644
--- a/backend/src/main/java/com/yfd/platform/eng/entity/vo/EngEqDrtpDataVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/entity/vo/EngEqDrtpDataVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.eng.entity.vo;
+package com.yfd.platform.qgc_eng.entity.vo;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/eng/mapper/EngEqMapper.java b/backend/src/main/java/com/yfd/platform/qgc_eng/mapper/EngEqMapper.java
similarity index 83%
rename from backend/src/main/java/com/yfd/platform/eng/mapper/EngEqMapper.java
rename to backend/src/main/java/com/yfd/platform/qgc_eng/mapper/EngEqMapper.java
index 8c660c2a..e981c49b 100644
--- a/backend/src/main/java/com/yfd/platform/eng/mapper/EngEqMapper.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/mapper/EngEqMapper.java
@@ -1,7 +1,7 @@
-package com.yfd.platform.eng.mapper;
+package com.yfd.platform.qgc_eng.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yfd.platform.eng.domain.MsEngEq;
+import com.yfd.platform.qgc_eng.domain.MsEngEq;
import org.apache.ibatis.annotations.Select;
import java.util.Map;
diff --git a/backend/src/main/java/com/yfd/platform/eng/service/AlarmPointService.java b/backend/src/main/java/com/yfd/platform/qgc_eng/service/AlarmPointService.java
similarity index 90%
rename from backend/src/main/java/com/yfd/platform/eng/service/AlarmPointService.java
rename to backend/src/main/java/com/yfd/platform/qgc_eng/service/AlarmPointService.java
index babe6ebc..b2506a18 100644
--- a/backend/src/main/java/com/yfd/platform/eng/service/AlarmPointService.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/service/AlarmPointService.java
@@ -1,9 +1,9 @@
-package com.yfd.platform.eng.service;
+package com.yfd.platform.qgc_eng.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.common.DataSourceResult;
-import com.yfd.platform.eng.entity.vo.AlarmStcdCountVo;
+import com.yfd.platform.qgc_eng.entity.vo.AlarmStcdCountVo;
import java.util.Map;
diff --git a/backend/src/main/java/com/yfd/platform/eng/service/EngEqDataService.java b/backend/src/main/java/com/yfd/platform/qgc_eng/service/EngEqDataService.java
similarity index 98%
rename from backend/src/main/java/com/yfd/platform/eng/service/EngEqDataService.java
rename to backend/src/main/java/com/yfd/platform/qgc_eng/service/EngEqDataService.java
index 2fe57493..4b9218ba 100644
--- a/backend/src/main/java/com/yfd/platform/eng/service/EngEqDataService.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/service/EngEqDataService.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.eng.service;
+package com.yfd.platform.qgc_eng.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yfd.platform.common.DataSourceRequest;
diff --git a/backend/src/main/java/com/yfd/platform/eng/service/EngEqIntervalService.java b/backend/src/main/java/com/yfd/platform/qgc_eng/service/EngEqIntervalService.java
similarity index 95%
rename from backend/src/main/java/com/yfd/platform/eng/service/EngEqIntervalService.java
rename to backend/src/main/java/com/yfd/platform/qgc_eng/service/EngEqIntervalService.java
index a4b224ed..2c4512e3 100644
--- a/backend/src/main/java/com/yfd/platform/eng/service/EngEqIntervalService.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/service/EngEqIntervalService.java
@@ -1,10 +1,10 @@
-package com.yfd.platform.eng.service;
+package com.yfd.platform.qgc_eng.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.common.DataSourceResult;
import com.yfd.platform.common.GroupResult;
-import com.yfd.platform.eng.domain.MsEngEq;
+import com.yfd.platform.qgc_eng.domain.MsEngEq;
import java.util.Map;
diff --git a/backend/src/main/java/com/yfd/platform/eng/service/EngEqService.java b/backend/src/main/java/com/yfd/platform/qgc_eng/service/EngEqService.java
similarity index 96%
rename from backend/src/main/java/com/yfd/platform/eng/service/EngEqService.java
rename to backend/src/main/java/com/yfd/platform/qgc_eng/service/EngEqService.java
index 288aa9ee..79888918 100644
--- a/backend/src/main/java/com/yfd/platform/eng/service/EngEqService.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/service/EngEqService.java
@@ -1,11 +1,11 @@
-package com.yfd.platform.eng.service;
+package com.yfd.platform.qgc_eng.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.common.DataSourceResult;
import com.yfd.platform.common.GroupResult;
-import com.yfd.platform.eng.domain.MsEngEq;
+import com.yfd.platform.qgc_eng.domain.MsEngEq;
import java.util.Map;
diff --git a/backend/src/main/java/com/yfd/platform/eng/service/EngSpecialService.java b/backend/src/main/java/com/yfd/platform/qgc_eng/service/EngSpecialService.java
similarity index 90%
rename from backend/src/main/java/com/yfd/platform/eng/service/EngSpecialService.java
rename to backend/src/main/java/com/yfd/platform/qgc_eng/service/EngSpecialService.java
index 0c3a884a..24b6d66c 100644
--- a/backend/src/main/java/com/yfd/platform/eng/service/EngSpecialService.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/service/EngSpecialService.java
@@ -1,9 +1,9 @@
-package com.yfd.platform.eng.service;
+package com.yfd.platform.qgc_eng.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.common.DataSourceResult;
-import com.yfd.platform.eng.entity.EqSpecial;
+import com.yfd.platform.qgc_eng.entity.EqSpecial;
import java.util.Map;
diff --git a/backend/src/main/java/com/yfd/platform/eng/service/impl/AlarmPointServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_eng/service/impl/AlarmPointServiceImpl.java
similarity index 92%
rename from backend/src/main/java/com/yfd/platform/eng/service/impl/AlarmPointServiceImpl.java
rename to backend/src/main/java/com/yfd/platform/qgc_eng/service/impl/AlarmPointServiceImpl.java
index 225a0a57..20b8cde1 100644
--- a/backend/src/main/java/com/yfd/platform/eng/service/impl/AlarmPointServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/service/impl/AlarmPointServiceImpl.java
@@ -1,10 +1,10 @@
-package com.yfd.platform.eng.service.impl;
+package com.yfd.platform.qgc_eng.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.common.DataSourceResult;
-import com.yfd.platform.eng.entity.vo.AlarmStcdCountVo;
-import com.yfd.platform.eng.service.AlarmPointService;
+import com.yfd.platform.qgc_eng.entity.vo.AlarmStcdCountVo;
+import com.yfd.platform.qgc_eng.service.AlarmPointService;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
diff --git a/backend/src/main/java/com/yfd/platform/eng/service/impl/EngEqDataServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_eng/service/impl/EngEqDataServiceImpl.java
similarity index 95%
rename from backend/src/main/java/com/yfd/platform/eng/service/impl/EngEqDataServiceImpl.java
rename to backend/src/main/java/com/yfd/platform/qgc_eng/service/impl/EngEqDataServiceImpl.java
index 2fc6bc42..dccc72c7 100644
--- a/backend/src/main/java/com/yfd/platform/eng/service/impl/EngEqDataServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/service/impl/EngEqDataServiceImpl.java
@@ -1,9 +1,9 @@
-package com.yfd.platform.eng.service.impl;
+package com.yfd.platform.qgc_eng.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.common.DataSourceResult;
-import com.yfd.platform.eng.service.EngEqDataService;
+import com.yfd.platform.qgc_eng.service.EngEqDataService;
import org.springframework.stereotype.Service;
diff --git a/backend/src/main/java/com/yfd/platform/eng/service/impl/EngEqIntervalServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_eng/service/impl/EngEqIntervalServiceImpl.java
similarity index 99%
rename from backend/src/main/java/com/yfd/platform/eng/service/impl/EngEqIntervalServiceImpl.java
rename to backend/src/main/java/com/yfd/platform/qgc_eng/service/impl/EngEqIntervalServiceImpl.java
index d851bc61..f8168546 100644
--- a/backend/src/main/java/com/yfd/platform/eng/service/impl/EngEqIntervalServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/service/impl/EngEqIntervalServiceImpl.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.eng.service.impl;
+package com.yfd.platform.qgc_eng.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yfd.platform.common.*;
import com.yfd.platform.common.enums.QecIntervalEnum;
import com.yfd.platform.common.enums.ShowEnum;
-import com.yfd.platform.eng.domain.MsEngEq;
-import com.yfd.platform.eng.service.EngEqIntervalService;
+import com.yfd.platform.qgc_eng.domain.MsEngEq;
+import com.yfd.platform.qgc_eng.service.EngEqIntervalService;
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/eng/service/impl/EngEqServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_eng/service/impl/EngEqServiceImpl.java
similarity index 97%
rename from backend/src/main/java/com/yfd/platform/eng/service/impl/EngEqServiceImpl.java
rename to backend/src/main/java/com/yfd/platform/qgc_eng/service/impl/EngEqServiceImpl.java
index 516de82e..0efe4056 100644
--- a/backend/src/main/java/com/yfd/platform/eng/service/impl/EngEqServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/service/impl/EngEqServiceImpl.java
@@ -1,13 +1,13 @@
-package com.yfd.platform.eng.service.impl;
+package com.yfd.platform.qgc_eng.service.impl;
import cn.hutool.core.util.ObjectUtil;
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.eng.domain.MsEngEq;
-import com.yfd.platform.eng.mapper.EngEqMapper;
-import com.yfd.platform.eng.service.EngEqService;
+import com.yfd.platform.qgc_eng.domain.MsEngEq;
+import com.yfd.platform.qgc_eng.mapper.EngEqMapper;
+import com.yfd.platform.qgc_eng.service.EngEqService;
import com.yfd.platform.utils.KendoUtil;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
diff --git a/backend/src/main/java/com/yfd/platform/eng/service/impl/EngSpecialServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_eng/service/impl/EngSpecialServiceImpl.java
similarity index 92%
rename from backend/src/main/java/com/yfd/platform/eng/service/impl/EngSpecialServiceImpl.java
rename to backend/src/main/java/com/yfd/platform/qgc_eng/service/impl/EngSpecialServiceImpl.java
index 0854231c..4ccb9e8f 100644
--- a/backend/src/main/java/com/yfd/platform/eng/service/impl/EngSpecialServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/service/impl/EngSpecialServiceImpl.java
@@ -1,10 +1,10 @@
-package com.yfd.platform.eng.service.impl;
+package com.yfd.platform.qgc_eng.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.common.DataSourceResult;
-import com.yfd.platform.eng.entity.EqSpecial;
-import com.yfd.platform.eng.service.EngSpecialService;
+import com.yfd.platform.qgc_eng.entity.EqSpecial;
+import com.yfd.platform.qgc_eng.service.EngSpecialService;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
diff --git a/backend/src/main/java/com/yfd/platform/env/fh/controller/FhHabitatController.java b/backend/src/main/java/com/yfd/platform/qgc_env/fh/controller/FhHabitatController.java
similarity index 95%
rename from backend/src/main/java/com/yfd/platform/env/fh/controller/FhHabitatController.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/fh/controller/FhHabitatController.java
index 2365c12c..8a5ee63d 100644
--- a/backend/src/main/java/com/yfd/platform/env/fh/controller/FhHabitatController.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fh/controller/FhHabitatController.java
@@ -1,9 +1,9 @@
-package com.yfd.platform.env.fh.controller;
+package com.yfd.platform.qgc_env.fh.controller;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.config.ResponseResult;
-import com.yfd.platform.env.fh.entity.ao.FhDefaultAo;
-import com.yfd.platform.env.fh.service.FhHabitatService;
+import com.yfd.platform.qgc_env.fh.entity.ao.FhDefaultAo;
+import com.yfd.platform.qgc_env.fh.service.FhHabitatService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
diff --git a/backend/src/main/java/com/yfd/platform/env/fh/entity/ao/FhDefaultAo.java b/backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/ao/FhDefaultAo.java
similarity index 89%
rename from backend/src/main/java/com/yfd/platform/env/fh/entity/ao/FhDefaultAo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/ao/FhDefaultAo.java
index ab6309a2..50c238b3 100644
--- a/backend/src/main/java/com/yfd/platform/env/fh/entity/ao/FhDefaultAo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/ao/FhDefaultAo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.fh.entity.ao;
+package com.yfd.platform.qgc_env.fh.entity.ao;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/env/fh/entity/vo/FhBaseInfoVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/FhBaseInfoVo.java
similarity index 98%
rename from backend/src/main/java/com/yfd/platform/env/fh/entity/vo/FhBaseInfoVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/FhBaseInfoVo.java
index 5bd36a4c..93105dc0 100644
--- a/backend/src/main/java/com/yfd/platform/env/fh/entity/vo/FhBaseInfoVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/FhBaseInfoVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.fh.entity.vo;
+package com.yfd.platform.qgc_env.fh.entity.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/env/fh/entity/vo/FhDefaultVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/FhDefaultVo.java
similarity index 96%
rename from backend/src/main/java/com/yfd/platform/env/fh/entity/vo/FhDefaultVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/FhDefaultVo.java
index 1aec0c8c..2ff9be9e 100644
--- a/backend/src/main/java/com/yfd/platform/env/fh/entity/vo/FhDefaultVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/FhDefaultVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.fh.entity.vo;
+package com.yfd.platform.qgc_env.fh.entity.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/env/fh/entity/vo/FhMsstbprptVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/FhMsstbprptVo.java
similarity index 98%
rename from backend/src/main/java/com/yfd/platform/env/fh/entity/vo/FhMsstbprptVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/FhMsstbprptVo.java
index 2214ad61..177ce601 100644
--- a/backend/src/main/java/com/yfd/platform/env/fh/entity/vo/FhMsstbprptVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/FhMsstbprptVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.fh.entity.vo;
+package com.yfd.platform.qgc_env.fh.entity.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/env/fh/entity/vo/FhSdriverdayVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/FhSdriverdayVo.java
similarity index 94%
rename from backend/src/main/java/com/yfd/platform/env/fh/entity/vo/FhSdriverdayVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/FhSdriverdayVo.java
index f81decd4..0abd7809 100644
--- a/backend/src/main/java/com/yfd/platform/env/fh/entity/vo/FhSdriverdayVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/FhSdriverdayVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.fh.entity.vo;
+package com.yfd.platform.qgc_env.fh.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/fh/entity/vo/FhSdrvwtsVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/FhSdrvwtsVo.java
similarity index 93%
rename from backend/src/main/java/com/yfd/platform/env/fh/entity/vo/FhSdrvwtsVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/FhSdrvwtsVo.java
index baafa011..5654168c 100644
--- a/backend/src/main/java/com/yfd/platform/env/fh/entity/vo/FhSdrvwtsVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/FhSdrvwtsVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.fh.entity.vo;
+package com.yfd.platform.qgc_env.fh.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/fh/entity/vo/HabitatVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/HabitatVo.java
similarity index 98%
rename from backend/src/main/java/com/yfd/platform/env/fh/entity/vo/HabitatVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/HabitatVo.java
index 876b478b..937c58f6 100644
--- a/backend/src/main/java/com/yfd/platform/env/fh/entity/vo/HabitatVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/HabitatVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.fh.entity.vo;
+package com.yfd.platform.qgc_env.fh.entity.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/env/fh/service/FhHabitatService.java b/backend/src/main/java/com/yfd/platform/qgc_env/fh/service/FhHabitatService.java
similarity index 72%
rename from backend/src/main/java/com/yfd/platform/env/fh/service/FhHabitatService.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/fh/service/FhHabitatService.java
index 237fa0f0..267ff509 100644
--- a/backend/src/main/java/com/yfd/platform/env/fh/service/FhHabitatService.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fh/service/FhHabitatService.java
@@ -1,11 +1,11 @@
-package com.yfd.platform.env.fh.service;
+package com.yfd.platform.qgc_env.fh.service;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.common.DataSourceResult;
-import com.yfd.platform.env.fh.entity.ao.FhDefaultAo;
-import com.yfd.platform.env.fh.entity.vo.FhBaseInfoVo;
-import com.yfd.platform.env.fh.entity.vo.FhDefaultVo;
-import com.yfd.platform.env.fh.entity.vo.HabitatVo;
+import com.yfd.platform.qgc_env.fh.entity.ao.FhDefaultAo;
+import com.yfd.platform.qgc_env.fh.entity.vo.FhBaseInfoVo;
+import com.yfd.platform.qgc_env.fh.entity.vo.FhDefaultVo;
+import com.yfd.platform.qgc_env.fh.entity.vo.HabitatVo;
public interface FhHabitatService {
diff --git a/backend/src/main/java/com/yfd/platform/env/fh/service/impl/FhHabitatServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/fh/service/impl/FhHabitatServiceImpl.java
similarity index 99%
rename from backend/src/main/java/com/yfd/platform/env/fh/service/impl/FhHabitatServiceImpl.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/fh/service/impl/FhHabitatServiceImpl.java
index d4cd1b34..d258e690 100644
--- a/backend/src/main/java/com/yfd/platform/env/fh/service/impl/FhHabitatServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fh/service/impl/FhHabitatServiceImpl.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.fh.service.impl;
+package com.yfd.platform.qgc_env.fh.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
@@ -13,15 +13,15 @@ import com.yfd.platform.common.GroupingInfo;
import com.yfd.platform.common.MicroservicDynamicSQLMapper;
import com.yfd.platform.common.PageInfo;
import com.yfd.platform.common.exception.BizException;
-import com.yfd.platform.env.fh.entity.ao.FhDefaultAo;
-import com.yfd.platform.env.fh.entity.vo.FhBaseInfoVo;
-import com.yfd.platform.env.fh.entity.vo.FhDefaultVo;
-import com.yfd.platform.env.fh.entity.vo.HabitatVo;
-import com.yfd.platform.env.fh.entity.vo.FhMsstbprptVo;
-import com.yfd.platform.env.fh.entity.vo.FhSdriverdayVo;
-import com.yfd.platform.env.fh.entity.vo.FhSdrvwtsVo;
-import com.yfd.platform.env.fh.service.FhHabitatService;
-import com.yfd.platform.env.wq.entity.vo.StTbYsVo;
+import com.yfd.platform.qgc_env.fh.entity.ao.FhDefaultAo;
+import com.yfd.platform.qgc_env.fh.entity.vo.FhBaseInfoVo;
+import com.yfd.platform.qgc_env.fh.entity.vo.FhDefaultVo;
+import com.yfd.platform.qgc_env.fh.entity.vo.HabitatVo;
+import com.yfd.platform.qgc_env.fh.entity.vo.FhMsstbprptVo;
+import com.yfd.platform.qgc_env.fh.entity.vo.FhSdriverdayVo;
+import com.yfd.platform.qgc_env.fh.entity.vo.FhSdrvwtsVo;
+import com.yfd.platform.qgc_env.fh.service.FhHabitatService;
+import com.yfd.platform.qgc_env.wq.entity.vo.StTbYsVo;
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/fp/controller/FishPassageController.java b/backend/src/main/java/com/yfd/platform/qgc_env/fp/controller/FishPassageController.java
similarity index 93%
rename from backend/src/main/java/com/yfd/platform/env/fp/controller/FishPassageController.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/fp/controller/FishPassageController.java
index f218d426..104b5e69 100644
--- a/backend/src/main/java/com/yfd/platform/env/fp/controller/FishPassageController.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fp/controller/FishPassageController.java
@@ -1,9 +1,9 @@
-package com.yfd.platform.env.fp.controller;
+package com.yfd.platform.qgc_env.fp.controller;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.config.ResponseResult;
-import com.yfd.platform.env.fp.service.FpBuildService;
-import com.yfd.platform.env.fp.service.FpRunService;
+import com.yfd.platform.qgc_env.fp.service.FpBuildService;
+import com.yfd.platform.qgc_env.fp.service.FpRunService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
diff --git a/backend/src/main/java/com/yfd/platform/env/fp/entity/vo/FdFishVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FdFishVo.java
similarity index 85%
rename from backend/src/main/java/com/yfd/platform/env/fp/entity/vo/FdFishVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FdFishVo.java
index 210e89b3..9c691ff7 100644
--- a/backend/src/main/java/com/yfd/platform/env/fp/entity/vo/FdFishVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FdFishVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.fp.entity.vo;
+package com.yfd.platform.qgc_env.fp.entity.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/env/fp/entity/vo/FpConstructionSituationVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FpConstructionSituationVo.java
similarity index 93%
rename from backend/src/main/java/com/yfd/platform/env/fp/entity/vo/FpConstructionSituationVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FpConstructionSituationVo.java
index 5f86411a..0e712b2c 100644
--- a/backend/src/main/java/com/yfd/platform/env/fp/entity/vo/FpConstructionSituationVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FpConstructionSituationVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.fp.entity.vo;
+package com.yfd.platform.qgc_env.fp.entity.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/env/fp/entity/vo/FpFtpStatisticsVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FpFtpStatisticsVo.java
similarity index 91%
rename from backend/src/main/java/com/yfd/platform/env/fp/entity/vo/FpFtpStatisticsVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FpFtpStatisticsVo.java
index 8073de06..55330057 100644
--- a/backend/src/main/java/com/yfd/platform/env/fp/entity/vo/FpFtpStatisticsVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FpFtpStatisticsVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.fp.entity.vo;
+package com.yfd.platform.qgc_env.fp.entity.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/env/fp/entity/vo/FpRunPlanVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FpRunPlanVo.java
similarity index 96%
rename from backend/src/main/java/com/yfd/platform/env/fp/entity/vo/FpRunPlanVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FpRunPlanVo.java
index 6f2c5455..0cb40ab2 100644
--- a/backend/src/main/java/com/yfd/platform/env/fp/entity/vo/FpRunPlanVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FpRunPlanVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.fp.entity.vo;
+package com.yfd.platform.qgc_env.fp.entity.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/env/fp/entity/vo/FpVmsstbprptVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FpVmsstbprptVo.java
similarity index 99%
rename from backend/src/main/java/com/yfd/platform/env/fp/entity/vo/FpVmsstbprptVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FpVmsstbprptVo.java
index 9a124dfc..4ad9471d 100644
--- a/backend/src/main/java/com/yfd/platform/env/fp/entity/vo/FpVmsstbprptVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/FpVmsstbprptVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.fp.entity.vo;
+package com.yfd.platform.qgc_env.fp.entity.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/env/fp/entity/vo/YearFpStatisticsVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/YearFpStatisticsVo.java
similarity index 91%
rename from backend/src/main/java/com/yfd/platform/env/fp/entity/vo/YearFpStatisticsVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/YearFpStatisticsVo.java
index ccbc42c3..29b100dc 100644
--- a/backend/src/main/java/com/yfd/platform/env/fp/entity/vo/YearFpStatisticsVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fp/entity/vo/YearFpStatisticsVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.fp.entity.vo;
+package com.yfd.platform.qgc_env.fp.entity.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/env/fp/service/FpBuildService.java b/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/FpBuildService.java
similarity index 68%
rename from backend/src/main/java/com/yfd/platform/env/fp/service/FpBuildService.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/fp/service/FpBuildService.java
index 1053e9ee..8d1cefac 100644
--- a/backend/src/main/java/com/yfd/platform/env/fp/service/FpBuildService.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/FpBuildService.java
@@ -1,9 +1,9 @@
-package com.yfd.platform.env.fp.service;
+package com.yfd.platform.qgc_env.fp.service;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.common.DataSourceResult;
-import com.yfd.platform.env.fp.entity.vo.FpConstructionSituationVo;
-import com.yfd.platform.env.fp.entity.vo.FpVmsstbprptVo;
+import com.yfd.platform.qgc_env.fp.entity.vo.FpConstructionSituationVo;
+import com.yfd.platform.qgc_env.fp.entity.vo.FpVmsstbprptVo;
public interface FpBuildService {
diff --git a/backend/src/main/java/com/yfd/platform/env/fp/service/FpRunService.java b/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/FpRunService.java
similarity index 65%
rename from backend/src/main/java/com/yfd/platform/env/fp/service/FpRunService.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/fp/service/FpRunService.java
index da685715..3088f708 100644
--- a/backend/src/main/java/com/yfd/platform/env/fp/service/FpRunService.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/FpRunService.java
@@ -1,9 +1,9 @@
-package com.yfd.platform.env.fp.service;
+package com.yfd.platform.qgc_env.fp.service;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.common.DataSourceResult;
-import com.yfd.platform.env.fp.entity.vo.YearFpStatisticsVo;
-import com.yfd.platform.env.fp.entity.vo.FpRunPlanVo;
+import com.yfd.platform.qgc_env.fp.entity.vo.YearFpStatisticsVo;
+import com.yfd.platform.qgc_env.fp.entity.vo.FpRunPlanVo;
import java.util.List;
diff --git a/backend/src/main/java/com/yfd/platform/env/fp/service/impl/FpBuildServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/impl/FpBuildServiceImpl.java
similarity index 98%
rename from backend/src/main/java/com/yfd/platform/env/fp/service/impl/FpBuildServiceImpl.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/fp/service/impl/FpBuildServiceImpl.java
index 6153fdb7..7ae27947 100644
--- a/backend/src/main/java/com/yfd/platform/env/fp/service/impl/FpBuildServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/impl/FpBuildServiceImpl.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.fp.service.impl;
+package com.yfd.platform.qgc_env.fp.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yfd.platform.common.DataSourceLoadOptionsBase;
@@ -6,9 +6,9 @@ import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.common.DataSourceResult;
import com.yfd.platform.common.MicroservicDynamicSQLMapper;
import com.yfd.platform.common.PageInfo;
-import com.yfd.platform.env.fp.entity.vo.FpConstructionSituationVo;
-import com.yfd.platform.env.fp.entity.vo.FpVmsstbprptVo;
-import com.yfd.platform.env.fp.service.FpBuildService;
+import com.yfd.platform.qgc_env.fp.entity.vo.FpConstructionSituationVo;
+import com.yfd.platform.qgc_env.fp.entity.vo.FpVmsstbprptVo;
+import com.yfd.platform.qgc_env.fp.service.FpBuildService;
import com.yfd.platform.utils.QgcQueryWrapperUtil;
import jakarta.annotation.Resource;
import org.springframework.util.CollectionUtils;
diff --git a/backend/src/main/java/com/yfd/platform/env/fp/service/impl/FpRunServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/impl/FpRunServiceImpl.java
similarity index 97%
rename from backend/src/main/java/com/yfd/platform/env/fp/service/impl/FpRunServiceImpl.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/fp/service/impl/FpRunServiceImpl.java
index d2d0e9a6..d0591911 100644
--- a/backend/src/main/java/com/yfd/platform/env/fp/service/impl/FpRunServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/impl/FpRunServiceImpl.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.fp.service.impl;
+package com.yfd.platform.qgc_env.fp.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
@@ -9,10 +9,10 @@ import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.common.DataSourceResult;
import com.yfd.platform.common.MicroservicDynamicSQLMapper;
import com.yfd.platform.common.exception.BizException;
-import com.yfd.platform.env.fp.entity.vo.FpFtpStatisticsVo;
-import com.yfd.platform.env.fp.entity.vo.FpRunPlanVo;
-import com.yfd.platform.env.fp.entity.vo.YearFpStatisticsVo;
-import com.yfd.platform.env.fp.service.FpRunService;
+import com.yfd.platform.qgc_env.fp.entity.vo.FpFtpStatisticsVo;
+import com.yfd.platform.qgc_env.fp.entity.vo.FpRunPlanVo;
+import com.yfd.platform.qgc_env.fp.entity.vo.YearFpStatisticsVo;
+import com.yfd.platform.qgc_env.fp.service.FpRunService;
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/wq/controller/EnvWqDataController.java b/backend/src/main/java/com/yfd/platform/qgc_env/wq/controller/EnvWqDataController.java
similarity index 97%
rename from backend/src/main/java/com/yfd/platform/env/wq/controller/EnvWqDataController.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wq/controller/EnvWqDataController.java
index 7472649c..ff4f0655 100644
--- a/backend/src/main/java/com/yfd/platform/env/wq/controller/EnvWqDataController.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wq/controller/EnvWqDataController.java
@@ -1,8 +1,8 @@
-package com.yfd.platform.env.wq.controller;
+package com.yfd.platform.qgc_env.wq.controller;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.config.ResponseResult;
-import com.yfd.platform.env.wq.service.EnvWqDataService;
+import com.yfd.platform.qgc_env.wq.service.EnvWqDataService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
diff --git a/backend/src/main/java/com/yfd/platform/env/wq/entity/vo/EnvWqDataVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/EnvWqDataVo.java
similarity index 99%
rename from backend/src/main/java/com/yfd/platform/env/wq/entity/vo/EnvWqDataVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/EnvWqDataVo.java
index 4a60882e..c7c8cd5b 100644
--- a/backend/src/main/java/com/yfd/platform/env/wq/entity/vo/EnvWqDataVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/EnvWqDataVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wq.entity.vo;
+package com.yfd.platform.qgc_env.wq.entity.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/env/wq/entity/vo/EnvWqVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/EnvWqVo.java
similarity index 99%
rename from backend/src/main/java/com/yfd/platform/env/wq/entity/vo/EnvWqVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/EnvWqVo.java
index 47163bf7..f40f3699 100644
--- a/backend/src/main/java/com/yfd/platform/env/wq/entity/vo/EnvWqVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/EnvWqVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wq.entity.vo;
+package com.yfd.platform.qgc_env.wq.entity.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/env/wq/entity/vo/StTbYsVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/StTbYsVo.java
similarity index 94%
rename from backend/src/main/java/com/yfd/platform/env/wq/entity/vo/StTbYsVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/StTbYsVo.java
index 21b3251d..b529cff3 100644
--- a/backend/src/main/java/com/yfd/platform/env/wq/entity/vo/StTbYsVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/StTbYsVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wq.entity.vo;
+package com.yfd.platform.qgc_env.wq.entity.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/env/wq/entity/vo/StbprpYsVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/StbprpYsVo.java
similarity index 96%
rename from backend/src/main/java/com/yfd/platform/env/wq/entity/vo/StbprpYsVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/StbprpYsVo.java
index f5c5d413..80ab125e 100644
--- a/backend/src/main/java/com/yfd/platform/env/wq/entity/vo/StbprpYsVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/StbprpYsVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wq.entity.vo;
+package com.yfd.platform.qgc_env.wq.entity.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/env/wq/entity/vo/WqAlongVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/WqAlongVo.java
similarity index 98%
rename from backend/src/main/java/com/yfd/platform/env/wq/entity/vo/WqAlongVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/WqAlongVo.java
index ad5d38b2..c47d8f41 100644
--- a/backend/src/main/java/com/yfd/platform/env/wq/entity/vo/WqAlongVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/WqAlongVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wq.entity.vo;
+package com.yfd.platform.qgc_env.wq.entity.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/env/wq/entity/vo/WqBaseInfoVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/WqBaseInfoVo.java
similarity index 98%
rename from backend/src/main/java/com/yfd/platform/env/wq/entity/vo/WqBaseInfoVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/WqBaseInfoVo.java
index ac273d24..0fc81648 100644
--- a/backend/src/main/java/com/yfd/platform/env/wq/entity/vo/WqBaseInfoVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/WqBaseInfoVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wq.entity.vo;
+package com.yfd.platform.qgc_env.wq.entity.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/env/wq/entity/vo/WqMsstbprptGroupVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/WqMsstbprptGroupVo.java
similarity index 88%
rename from backend/src/main/java/com/yfd/platform/env/wq/entity/vo/WqMsstbprptGroupVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/WqMsstbprptGroupVo.java
index 8ba1aeb1..05a011fa 100644
--- a/backend/src/main/java/com/yfd/platform/env/wq/entity/vo/WqMsstbprptGroupVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/WqMsstbprptGroupVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wq.entity.vo;
+package com.yfd.platform.qgc_env.wq.entity.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/env/wq/entity/vo/WqVmsstbprptVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/WqVmsstbprptVo.java
similarity index 97%
rename from backend/src/main/java/com/yfd/platform/env/wq/entity/vo/WqVmsstbprptVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/WqVmsstbprptVo.java
index 0a46130d..04810375 100644
--- a/backend/src/main/java/com/yfd/platform/env/wq/entity/vo/WqVmsstbprptVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/WqVmsstbprptVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wq.entity.vo;
+package com.yfd.platform.qgc_env.wq.entity.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/env/wq/service/EnvWqDataService.java b/backend/src/main/java/com/yfd/platform/qgc_env/wq/service/EnvWqDataService.java
similarity index 90%
rename from backend/src/main/java/com/yfd/platform/env/wq/service/EnvWqDataService.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wq/service/EnvWqDataService.java
index 321901d7..3d084c72 100644
--- a/backend/src/main/java/com/yfd/platform/env/wq/service/EnvWqDataService.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wq/service/EnvWqDataService.java
@@ -1,8 +1,8 @@
-package com.yfd.platform.env.wq.service;
+package com.yfd.platform.qgc_env.wq.service;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.common.DataSourceResult;
-import com.yfd.platform.env.wq.entity.vo.WqBaseInfoVo;
+import com.yfd.platform.qgc_env.wq.entity.vo.WqBaseInfoVo;
public interface EnvWqDataService {
diff --git a/backend/src/main/java/com/yfd/platform/env/wq/service/impl/EnvWqDataServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/wq/service/impl/EnvWqDataServiceImpl.java
similarity index 99%
rename from backend/src/main/java/com/yfd/platform/env/wq/service/impl/EnvWqDataServiceImpl.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wq/service/impl/EnvWqDataServiceImpl.java
index a3357165..ed24d9b9 100644
--- a/backend/src/main/java/com/yfd/platform/env/wq/service/impl/EnvWqDataServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wq/service/impl/EnvWqDataServiceImpl.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wq.service.impl;
+package com.yfd.platform.qgc_env.wq.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
@@ -13,9 +13,9 @@ import com.yfd.platform.common.GroupingInfo;
import com.yfd.platform.common.MicroservicDynamicSQLMapper;
import com.yfd.platform.common.PageInfo;
import com.yfd.platform.common.exception.BizException;
-import com.yfd.platform.env.wq.entity.vo.*;
-import com.yfd.platform.env.wq.service.EnvWqDataService;
-import com.yfd.platform.env.wt.entity.vo.WbsbVo;
+import com.yfd.platform.qgc_env.wq.entity.vo.*;
+import com.yfd.platform.qgc_env.wq.service.EnvWqDataService;
+import com.yfd.platform.qgc_env.wt.entity.vo.WbsbVo;
import com.yfd.platform.utils.KendoUtil;
import com.yfd.platform.utils.QgcQueryWrapperUtil;
import com.yfd.platform.utils.RequestHolder;
diff --git a/backend/src/main/java/com/yfd/platform/env/wt/controller/SdWTMonitorController.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/controller/SdWTMonitorController.java
similarity index 98%
rename from backend/src/main/java/com/yfd/platform/env/wt/controller/SdWTMonitorController.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/controller/SdWTMonitorController.java
index 93460c1a..b1bf235c 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/controller/SdWTMonitorController.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/controller/SdWTMonitorController.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.controller;
+package com.yfd.platform.qgc_env.wt.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,9 +7,9 @@ import com.yfd.platform.common.DataSourceRequest;
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.wt.entity.vo.WtrvInfo;
-import com.yfd.platform.env.wt.service.*;
+import com.yfd.platform.qgc_base.entity.vo.BatchDeleteAo;
+import com.yfd.platform.qgc_env.wt.entity.vo.WtrvInfo;
+import com.yfd.platform.qgc_env.wt.service.*;
import com.yfd.platform.utils.QgcQueryWrapperUtil;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
diff --git a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/DfltkwFacilityCountVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/DfltkwFacilityCountVo.java
similarity index 93%
rename from backend/src/main/java/com/yfd/platform/env/wt/entity/vo/DfltkwFacilityCountVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/DfltkwFacilityCountVo.java
index 5ed84803..46cafc39 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/DfltkwFacilityCountVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/DfltkwFacilityCountVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.entity.vo;
+package com.yfd.platform.qgc_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/wt/entity/vo/FishSpawnVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/FishSpawnVo.java
similarity index 85%
rename from backend/src/main/java/com/yfd/platform/env/wt/entity/vo/FishSpawnVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/FishSpawnVo.java
index 4d1c9de6..566b83c8 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/FishSpawnVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/FishSpawnVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.entity.vo;
+package com.yfd.platform.qgc_env.wt.entity.vo;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/RstcdTreeInfoVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/RstcdTreeInfoVo.java
similarity index 92%
rename from backend/src/main/java/com/yfd/platform/env/wt/entity/vo/RstcdTreeInfoVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/RstcdTreeInfoVo.java
index d62cab4c..54819070 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/RstcdTreeInfoVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/RstcdTreeInfoVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.entity.vo;
+package com.yfd.platform.qgc_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/wt/entity/vo/SdAlongDetailVO.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdAlongDetailVO.java
similarity index 95%
rename from backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdAlongDetailVO.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdAlongDetailVO.java
index 6496d197..a3188af3 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdAlongDetailVO.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdAlongDetailVO.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.entity.vo;
+package com.yfd.platform.qgc_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/wt/entity/vo/SdAlongVO.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdAlongVO.java
similarity index 96%
rename from backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdAlongVO.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdAlongVO.java
index d4a6a7c0..b6559bd6 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdAlongVO.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdAlongVO.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.entity.vo;
+package com.yfd.platform.qgc_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/wt/entity/vo/SdDzChuiXiangListVO.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdDzChuiXiangListVO.java
similarity index 90%
rename from backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdDzChuiXiangListVO.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdDzChuiXiangListVO.java
index 90ec997e..df6a7e66 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdDzChuiXiangListVO.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdDzChuiXiangListVO.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.entity.vo;
+package com.yfd.platform.qgc_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/wt/entity/vo/SdMonthDetailVO.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdMonthDetailVO.java
similarity index 94%
rename from backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdMonthDetailVO.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdMonthDetailVO.java
index bd26e144..c708410c 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdMonthDetailVO.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdMonthDetailVO.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.entity.vo;
+package com.yfd.platform.qgc_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/wt/entity/vo/SdRvwtSVO.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdRvwtSVO.java
similarity index 96%
rename from backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdRvwtSVO.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdRvwtSVO.java
index 0e79bea0..ae6d7108 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdRvwtSVO.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdRvwtSVO.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.entity.vo;
+package com.yfd.platform.qgc_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/wt/entity/vo/SdWtBaseInfoVO.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdWtBaseInfoVO.java
similarity index 97%
rename from backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdWtBaseInfoVO.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdWtBaseInfoVO.java
index 15a30c95..71894890 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdWtBaseInfoVO.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdWtBaseInfoVO.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.entity.vo;
+package com.yfd.platform.qgc_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/wt/entity/vo/SdWtMonitorCountVO.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdWtMonitorCountVO.java
similarity index 93%
rename from backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdWtMonitorCountVO.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdWtMonitorCountVO.java
index 3e05d905..9a5c397e 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdWtMonitorCountVO.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdWtMonitorCountVO.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.entity.vo;
+package com.yfd.platform.qgc_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/wt/entity/vo/SdWtvtYearVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdWtvtYearVo.java
similarity index 89%
rename from backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdWtvtYearVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdWtvtYearVo.java
index b63b2bd4..65a81f06 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdWtvtYearVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdWtvtYearVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.entity.vo;
+package com.yfd.platform.qgc_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/wt/entity/vo/SdYearDetailVO.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdYearDetailVO.java
similarity index 95%
rename from backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdYearDetailVO.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdYearDetailVO.java
index 1ba93147..bb3da57c 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdYearDetailVO.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdYearDetailVO.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.entity.vo;
+package com.yfd.platform.qgc_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/wt/entity/vo/SdYearListVO.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdYearListVO.java
similarity index 94%
rename from backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdYearListVO.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdYearListVO.java
index 570db59e..d4d6d3c6 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SdYearListVO.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdYearListVO.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.entity.vo;
+package com.yfd.platform.qgc_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/wt/entity/vo/StcdVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/StcdVo.java
similarity index 89%
rename from backend/src/main/java/com/yfd/platform/env/wt/entity/vo/StcdVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/StcdVo.java
index bd578063..c0cd75f2 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/StcdVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/StcdVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.entity.vo;
+package com.yfd.platform.qgc_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/wt/entity/vo/SttpInfoVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SttpInfoVo.java
similarity index 95%
rename from backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SttpInfoVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SttpInfoVo.java
index 681f9e78..0b3962b3 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/SttpInfoVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SttpInfoVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.entity.vo;
+package com.yfd.platform.qgc_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/wt/entity/vo/WbsbVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WbsbVo.java
similarity index 97%
rename from backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WbsbVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WbsbVo.java
index f205081a..eaccd9ef 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WbsbVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WbsbVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.entity.vo;
+package com.yfd.platform.qgc_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/wt/entity/vo/WtBaseInfoVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtBaseInfoVo.java
similarity index 98%
rename from backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WtBaseInfoVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtBaseInfoVo.java
index 031deef9..37d0f22f 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WtBaseInfoVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtBaseInfoVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.entity.vo;
+package com.yfd.platform.qgc_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/wt/entity/vo/WtFishVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtFishVo.java
similarity index 85%
rename from backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WtFishVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtFishVo.java
index 859a4d46..181aaae2 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WtFishVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtFishVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.entity.vo;
+package com.yfd.platform.qgc_env.wt.entity.vo;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WtTreeStcdVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtTreeStcdVo.java
similarity index 96%
rename from backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WtTreeStcdVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtTreeStcdVo.java
index 541514ba..9ec0fcbe 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WtTreeStcdVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtTreeStcdVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.entity.vo;
+package com.yfd.platform.qgc_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/wt/entity/vo/WtrvDataVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtrvDataVo.java
similarity index 93%
rename from backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WtrvDataVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtrvDataVo.java
index f788117f..a3b5b195 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WtrvDataVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtrvDataVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.entity.vo;
+package com.yfd.platform.qgc_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/wt/entity/vo/WtrvInfo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtrvInfo.java
similarity index 97%
rename from backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WtrvInfo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtrvInfo.java
index 43dc6c2c..75c8b69b 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WtrvInfo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtrvInfo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.entity.vo;
+package com.yfd.platform.qgc_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/wt/entity/vo/WtrvVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtrvVo.java
similarity index 87%
rename from backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WtrvVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtrvVo.java
index 1f4a30ed..ac9c0f7d 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/entity/vo/WtrvVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtrvVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.entity.vo;
+package com.yfd.platform.qgc_env.wt.entity.vo;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/env/wt/mapper/AlongDetailMapper.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/AlongDetailMapper.java
similarity index 98%
rename from backend/src/main/java/com/yfd/platform/env/wt/mapper/AlongDetailMapper.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/AlongDetailMapper.java
index 486b6d8c..3592d50e 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/mapper/AlongDetailMapper.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/AlongDetailMapper.java
@@ -1,8 +1,8 @@
-package com.yfd.platform.env.wt.mapper;
+package com.yfd.platform.qgc_env.wt.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yfd.platform.env.wt.entity.vo.SdAlongDetailVO;
-import com.yfd.platform.env.wt.entity.vo.WtrvInfo;
+import com.yfd.platform.qgc_env.wt.entity.vo.SdAlongDetailVO;
+import com.yfd.platform.qgc_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/wt/mapper/AlongListMapper.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/AlongListMapper.java
similarity index 98%
rename from backend/src/main/java/com/yfd/platform/env/wt/mapper/AlongListMapper.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/AlongListMapper.java
index b5849c7c..0fd45a09 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/mapper/AlongListMapper.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/AlongListMapper.java
@@ -1,9 +1,9 @@
-package com.yfd.platform.env.wt.mapper;
+package com.yfd.platform.qgc_env.wt.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yfd.platform.env.wt.entity.vo.SdAlongVO;
+import com.yfd.platform.qgc_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/wt/mapper/SdDzChuiXiangListMapper.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/SdDzChuiXiangListMapper.java
similarity index 89%
rename from backend/src/main/java/com/yfd/platform/env/wt/mapper/SdDzChuiXiangListMapper.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/SdDzChuiXiangListMapper.java
index a9a46a9d..100ec6bc 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/mapper/SdDzChuiXiangListMapper.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/SdDzChuiXiangListMapper.java
@@ -1,7 +1,7 @@
-package com.yfd.platform.env.wt.mapper;
+package com.yfd.platform.qgc_env.wt.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yfd.platform.env.wt.entity.vo.SdDzChuiXiangListVO;
+import com.yfd.platform.qgc_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/wt/mapper/SdRvwtSInOutOneMapper.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/SdRvwtSInOutOneMapper.java
similarity index 94%
rename from backend/src/main/java/com/yfd/platform/env/wt/mapper/SdRvwtSInOutOneMapper.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/SdRvwtSInOutOneMapper.java
index c3298452..2670ef36 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/mapper/SdRvwtSInOutOneMapper.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/SdRvwtSInOutOneMapper.java
@@ -1,8 +1,8 @@
-package com.yfd.platform.env.wt.mapper;
+package com.yfd.platform.qgc_env.wt.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yfd.platform.env.wt.entity.vo.SdRvwtSVO;
-import com.yfd.platform.env.wt.entity.vo.StcdVo;
+import com.yfd.platform.qgc_env.wt.entity.vo.SdRvwtSVO;
+import com.yfd.platform.qgc_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/wt/mapper/SdWtMonitorMapper.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/SdWtMonitorMapper.java
similarity index 90%
rename from backend/src/main/java/com/yfd/platform/env/wt/mapper/SdWtMonitorMapper.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/SdWtMonitorMapper.java
index b17bdef0..98c88ee4 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/mapper/SdWtMonitorMapper.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/SdWtMonitorMapper.java
@@ -1,6 +1,6 @@
-package com.yfd.platform.env.wt.mapper;
+package com.yfd.platform.qgc_env.wt.mapper;
-import com.yfd.platform.env.wt.entity.vo.SdWtMonitorCountVO;
+import com.yfd.platform.qgc_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/wt/mapper/SdWtrvdrtpSMapper.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/SdWtrvdrtpSMapper.java
similarity index 93%
rename from backend/src/main/java/com/yfd/platform/env/wt/mapper/SdWtrvdrtpSMapper.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/SdWtrvdrtpSMapper.java
index 76ea5e53..1ae5ef60 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/mapper/SdWtrvdrtpSMapper.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/SdWtrvdrtpSMapper.java
@@ -1,6 +1,6 @@
-package com.yfd.platform.env.wt.mapper;
+package com.yfd.platform.qgc_env.wt.mapper;
-import com.yfd.platform.env.entity.vo.DataParam;
+import com.yfd.platform.qgc_base.entity.vo.DataParam;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/backend/src/main/java/com/yfd/platform/env/wt/mapper/SdWtvtRMapper.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/SdWtvtRMapper.java
similarity index 89%
rename from backend/src/main/java/com/yfd/platform/env/wt/mapper/SdWtvtRMapper.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/SdWtvtRMapper.java
index 4357f570..8a514c00 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/mapper/SdWtvtRMapper.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/SdWtvtRMapper.java
@@ -1,7 +1,7 @@
-package com.yfd.platform.env.wt.mapper;
+package com.yfd.platform.qgc_env.wt.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yfd.platform.env.wt.entity.vo.SdWtvtYearVo;
+import com.yfd.platform.qgc_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/wt/service/AlongDetailService.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/AlongDetailService.java
similarity index 87%
rename from backend/src/main/java/com/yfd/platform/env/wt/service/AlongDetailService.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/service/AlongDetailService.java
index 7ff96690..5465ec79 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/service/AlongDetailService.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/AlongDetailService.java
@@ -1,13 +1,13 @@
-package com.yfd.platform.env.wt.service;
+package com.yfd.platform.qgc_env.wt.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
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.wt.entity.vo.SdAlongDetailVO;
-import com.yfd.platform.env.wt.entity.vo.WtrvInfo;
+import com.yfd.platform.qgc_base.entity.vo.BatchDeleteAo;
+import com.yfd.platform.qgc_env.wt.entity.vo.SdAlongDetailVO;
+import com.yfd.platform.qgc_env.wt.entity.vo.WtrvInfo;
import java.util.Map;
diff --git a/backend/src/main/java/com/yfd/platform/env/wt/service/AlongListService.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/AlongListService.java
similarity index 83%
rename from backend/src/main/java/com/yfd/platform/env/wt/service/AlongListService.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/service/AlongListService.java
index 418fc40f..f55a9beb 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/service/AlongListService.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/AlongListService.java
@@ -1,10 +1,10 @@
-package com.yfd.platform.env.wt.service;
+package com.yfd.platform.qgc_env.wt.service;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.common.DataSourceResult;
-import com.yfd.platform.env.wt.entity.vo.SdYearListVO;
-import com.yfd.platform.env.wt.entity.vo.StcdVo;
+import com.yfd.platform.qgc_env.wt.entity.vo.SdYearListVO;
+import com.yfd.platform.qgc_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/wt/service/SdDzChuiXiangListService.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/SdDzChuiXiangListService.java
similarity index 91%
rename from backend/src/main/java/com/yfd/platform/env/wt/service/SdDzChuiXiangListService.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/service/SdDzChuiXiangListService.java
index de4bbff4..086a3235 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/service/SdDzChuiXiangListService.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/SdDzChuiXiangListService.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.service;
+package com.yfd.platform.qgc_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/wt/service/SdRvwtSInOutOneService.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/SdRvwtSInOutOneService.java
similarity index 72%
rename from backend/src/main/java/com/yfd/platform/env/wt/service/SdRvwtSInOutOneService.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/service/SdRvwtSInOutOneService.java
index 2bd09913..0ac4708b 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/service/SdRvwtSInOutOneService.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/SdRvwtSInOutOneService.java
@@ -1,9 +1,9 @@
-package com.yfd.platform.env.wt.service;
+package com.yfd.platform.qgc_env.wt.service;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.common.DataSourceResult;
-import com.yfd.platform.env.wt.entity.vo.SdRvwtSVO;
-import com.yfd.platform.env.wt.entity.vo.StcdVo;
+import com.yfd.platform.qgc_env.wt.entity.vo.SdRvwtSVO;
+import com.yfd.platform.qgc_env.wt.entity.vo.StcdVo;
public interface SdRvwtSInOutOneService {
diff --git a/backend/src/main/java/com/yfd/platform/env/wt/service/SdWtMonitorService.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/SdWtMonitorService.java
similarity index 68%
rename from backend/src/main/java/com/yfd/platform/env/wt/service/SdWtMonitorService.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/service/SdWtMonitorService.java
index 9a52159c..e8aab7ec 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/service/SdWtMonitorService.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/SdWtMonitorService.java
@@ -1,16 +1,16 @@
-package com.yfd.platform.env.wt.service;
+package com.yfd.platform.qgc_env.wt.service;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.common.DataSourceResult;
-import com.yfd.platform.env.wt.entity.vo.DfltkwFacilityCountVo;
-import com.yfd.platform.env.wt.entity.vo.FishSpawnVo;
-import com.yfd.platform.env.wt.entity.vo.RstcdTreeInfoVo;
-import com.yfd.platform.env.wt.entity.vo.SdMonthDetailVO;
-import com.yfd.platform.env.wt.entity.vo.SdYearDetailVO;
-import com.yfd.platform.env.wt.entity.vo.SttpInfoVo;
-import com.yfd.platform.env.wt.entity.vo.WbsbVo;
-import com.yfd.platform.env.wt.entity.vo.WtBaseInfoVo;
-import com.yfd.platform.env.wt.entity.vo.WtrvVo;
+import com.yfd.platform.qgc_env.wt.entity.vo.DfltkwFacilityCountVo;
+import com.yfd.platform.qgc_env.wt.entity.vo.FishSpawnVo;
+import com.yfd.platform.qgc_env.wt.entity.vo.RstcdTreeInfoVo;
+import com.yfd.platform.qgc_env.wt.entity.vo.SdMonthDetailVO;
+import com.yfd.platform.qgc_env.wt.entity.vo.SdYearDetailVO;
+import com.yfd.platform.qgc_env.wt.entity.vo.SttpInfoVo;
+import com.yfd.platform.qgc_env.wt.entity.vo.WbsbVo;
+import com.yfd.platform.qgc_env.wt.entity.vo.WtBaseInfoVo;
+import com.yfd.platform.qgc_env.wt.entity.vo.WtrvVo;
import java.util.List;
diff --git a/backend/src/main/java/com/yfd/platform/env/wt/service/SdWtvtRService.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/SdWtvtRService.java
similarity index 90%
rename from backend/src/main/java/com/yfd/platform/env/wt/service/SdWtvtRService.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/service/SdWtvtRService.java
index 9d0e7382..f820339c 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/service/SdWtvtRService.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/SdWtvtRService.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.service;
+package com.yfd.platform.qgc_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/wt/service/impl/AlongDetailServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/AlongDetailServiceImpl.java
similarity index 98%
rename from backend/src/main/java/com/yfd/platform/env/wt/service/impl/AlongDetailServiceImpl.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/AlongDetailServiceImpl.java
index 59a06849..d1bb3656 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/service/impl/AlongDetailServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/AlongDetailServiceImpl.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.service.impl;
+package com.yfd.platform.qgc_env.wt.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
@@ -8,12 +8,13 @@ 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.common.exception.BizException;
-import com.yfd.platform.env.entity.vo.*;
-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.qgc_env.wt.mapper.AlongDetailMapper;
+import com.yfd.platform.qgc_env.wt.mapper.SdWtrvdrtpSMapper;
+import com.yfd.platform.qgc_env.wt.service.AlongDetailService;
+import com.yfd.platform.qgc_env.wt.entity.vo.SdAlongDetailVO;
+import com.yfd.platform.qgc_env.wt.entity.vo.WtrvInfo;
+import com.yfd.platform.qgc_base.entity.vo.BatchDeleteAo;
+import com.yfd.platform.qgc_base.entity.vo.DataParam;
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/wt/service/impl/AlongListServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/AlongListServiceImpl.java
similarity index 98%
rename from backend/src/main/java/com/yfd/platform/env/wt/service/impl/AlongListServiceImpl.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/AlongListServiceImpl.java
index aa5e2168..8529947c 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/service/impl/AlongListServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/AlongListServiceImpl.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.service.impl;
+package com.yfd.platform.qgc_env.wt.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,11 +10,11 @@ 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.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.qgc_env.wt.entity.vo.SdAlongVO;
+import com.yfd.platform.qgc_env.wt.entity.vo.SdYearListVO;
+import com.yfd.platform.qgc_env.wt.entity.vo.StcdVo;
+import com.yfd.platform.qgc_env.wt.mapper.AlongListMapper;
+import com.yfd.platform.qgc_env.wt.service.AlongListService;
import com.yfd.platform.utils.QgcQueryWrapperUtil;
import com.yfd.platform.utils.SqlUtil;
import jakarta.annotation.Resource;
diff --git a/backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdDzChuiXiangListServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdDzChuiXiangListServiceImpl.java
similarity index 92%
rename from backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdDzChuiXiangListServiceImpl.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdDzChuiXiangListServiceImpl.java
index 9ee64c92..388aa8a3 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdDzChuiXiangListServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdDzChuiXiangListServiceImpl.java
@@ -1,13 +1,13 @@
-package com.yfd.platform.env.wt.service.impl;
+package com.yfd.platform.qgc_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.common.MicroservicDynamicSQLMapper;
-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.qgc_env.wt.entity.vo.SdDzChuiXiangListVO;
+import com.yfd.platform.qgc_env.wt.mapper.SdDzChuiXiangListMapper;
+import com.yfd.platform.qgc_env.wt.service.SdDzChuiXiangListService;
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/wt/service/impl/SdRvwtSInOutOneServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdRvwtSInOutOneServiceImpl.java
similarity index 98%
rename from backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdRvwtSInOutOneServiceImpl.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdRvwtSInOutOneServiceImpl.java
index 68c98d69..6c86008f 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdRvwtSInOutOneServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdRvwtSInOutOneServiceImpl.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.wt.service.impl;
+package com.yfd.platform.qgc_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.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.qgc_env.wt.entity.vo.SdRvwtSVO;
+import com.yfd.platform.qgc_env.wt.entity.vo.StcdVo;
+import com.yfd.platform.qgc_env.wt.mapper.SdRvwtSInOutOneMapper;
+import com.yfd.platform.qgc_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/wt/service/impl/SdWtMonitorServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdWtMonitorServiceImpl.java
similarity index 99%
rename from backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdWtMonitorServiceImpl.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdWtMonitorServiceImpl.java
index 7c0fb6c4..1c7092ec 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdWtMonitorServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdWtMonitorServiceImpl.java
@@ -1,24 +1,24 @@
-package com.yfd.platform.env.wt.service.impl;
+package com.yfd.platform.qgc_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.common.exception.BizException;
-import com.yfd.platform.env.wt.entity.vo.DfltkwFacilityCountVo;
-import com.yfd.platform.env.wt.entity.vo.FishSpawnVo;
-import com.yfd.platform.env.wt.entity.vo.RstcdTreeInfoVo;
-import com.yfd.platform.env.wt.entity.vo.SdMonthDetailVO;
-import com.yfd.platform.env.wt.entity.vo.SdYearDetailVO;
-import com.yfd.platform.env.wt.entity.vo.SdWtBaseInfoVO;
-import com.yfd.platform.env.wt.entity.vo.SdWtMonitorCountVO;
-import com.yfd.platform.env.wt.entity.vo.SttpInfoVo;
-import com.yfd.platform.env.wt.entity.vo.WbsbVo;
-import com.yfd.platform.env.wt.entity.vo.WtBaseInfoVo;
-import com.yfd.platform.env.wt.entity.vo.WtFishVo;
-import com.yfd.platform.env.wt.entity.vo.WtTreeStcdVo;
-import com.yfd.platform.env.wt.entity.vo.WtrvVo;
-import com.yfd.platform.env.wt.mapper.SdWtMonitorMapper;
-import com.yfd.platform.env.wt.service.SdWtMonitorService;
+import com.yfd.platform.qgc_env.wt.entity.vo.DfltkwFacilityCountVo;
+import com.yfd.platform.qgc_env.wt.entity.vo.FishSpawnVo;
+import com.yfd.platform.qgc_env.wt.entity.vo.RstcdTreeInfoVo;
+import com.yfd.platform.qgc_env.wt.entity.vo.SdMonthDetailVO;
+import com.yfd.platform.qgc_env.wt.entity.vo.SdYearDetailVO;
+import com.yfd.platform.qgc_env.wt.entity.vo.SdWtBaseInfoVO;
+import com.yfd.platform.qgc_env.wt.entity.vo.SdWtMonitorCountVO;
+import com.yfd.platform.qgc_env.wt.entity.vo.SttpInfoVo;
+import com.yfd.platform.qgc_env.wt.entity.vo.WbsbVo;
+import com.yfd.platform.qgc_env.wt.entity.vo.WtBaseInfoVo;
+import com.yfd.platform.qgc_env.wt.entity.vo.WtFishVo;
+import com.yfd.platform.qgc_env.wt.entity.vo.WtTreeStcdVo;
+import com.yfd.platform.qgc_env.wt.entity.vo.WtrvVo;
+import com.yfd.platform.qgc_env.wt.mapper.SdWtMonitorMapper;
+import com.yfd.platform.qgc_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/wt/service/impl/SdWtvtRServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdWtvtRServiceImpl.java
similarity index 92%
rename from backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdWtvtRServiceImpl.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdWtvtRServiceImpl.java
index 22d28686..bb59d92e 100644
--- a/backend/src/main/java/com/yfd/platform/env/wt/service/impl/SdWtvtRServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdWtvtRServiceImpl.java
@@ -1,13 +1,13 @@
-package com.yfd.platform.env.wt.service.impl;
+package com.yfd.platform.qgc_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.common.MicroservicDynamicSQLMapper;
-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.qgc_env.wt.entity.vo.SdWtvtYearVo;
+import com.yfd.platform.qgc_env.wt.mapper.SdWtvtRMapper;
+import com.yfd.platform.qgc_env.wt.service.SdWtvtRService;
import com.yfd.platform.utils.QgcQueryWrapperUtil;
import jakarta.annotation.Resource;
import org.apache.commons.lang3.StringUtils;
diff --git a/backend/src/main/java/com/yfd/platform/env/zq/controller/ZqMonitorController.java b/backend/src/main/java/com/yfd/platform/qgc_env/zq/controller/ZqMonitorController.java
similarity index 92%
rename from backend/src/main/java/com/yfd/platform/env/zq/controller/ZqMonitorController.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/zq/controller/ZqMonitorController.java
index 0b327e37..c38ec14b 100644
--- a/backend/src/main/java/com/yfd/platform/env/zq/controller/ZqMonitorController.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/zq/controller/ZqMonitorController.java
@@ -1,8 +1,8 @@
-package com.yfd.platform.env.zq.controller;
+package com.yfd.platform.qgc_env.zq.controller;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.config.ResponseResult;
-import com.yfd.platform.env.zq.service.ZqMonitorService;
+import com.yfd.platform.qgc_env.zq.service.ZqMonitorService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
diff --git a/backend/src/main/java/com/yfd/platform/env/zq/entity/vo/ZqBaseInfoVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/zq/entity/vo/ZqBaseInfoVo.java
similarity index 98%
rename from backend/src/main/java/com/yfd/platform/env/zq/entity/vo/ZqBaseInfoVo.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/zq/entity/vo/ZqBaseInfoVo.java
index ff8e42bd..0dfcbd38 100644
--- a/backend/src/main/java/com/yfd/platform/env/zq/entity/vo/ZqBaseInfoVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/zq/entity/vo/ZqBaseInfoVo.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.zq.entity.vo;
+package com.yfd.platform.qgc_env.zq.entity.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/backend/src/main/java/com/yfd/platform/env/zq/service/ZqMonitorService.java b/backend/src/main/java/com/yfd/platform/qgc_env/zq/service/ZqMonitorService.java
similarity index 71%
rename from backend/src/main/java/com/yfd/platform/env/zq/service/ZqMonitorService.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/zq/service/ZqMonitorService.java
index 30caf16b..fd576538 100644
--- a/backend/src/main/java/com/yfd/platform/env/zq/service/ZqMonitorService.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/zq/service/ZqMonitorService.java
@@ -1,8 +1,8 @@
-package com.yfd.platform.env.zq.service;
+package com.yfd.platform.qgc_env.zq.service;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.common.DataSourceResult;
-import com.yfd.platform.env.zq.entity.vo.ZqBaseInfoVo;
+import com.yfd.platform.qgc_env.zq.entity.vo.ZqBaseInfoVo;
public interface ZqMonitorService {
diff --git a/backend/src/main/java/com/yfd/platform/env/zq/service/impl/ZqMonitorServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/zq/service/impl/ZqMonitorServiceImpl.java
similarity index 99%
rename from backend/src/main/java/com/yfd/platform/env/zq/service/impl/ZqMonitorServiceImpl.java
rename to backend/src/main/java/com/yfd/platform/qgc_env/zq/service/impl/ZqMonitorServiceImpl.java
index 27033f5f..b8704f59 100644
--- a/backend/src/main/java/com/yfd/platform/env/zq/service/impl/ZqMonitorServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/zq/service/impl/ZqMonitorServiceImpl.java
@@ -1,4 +1,4 @@
-package com.yfd.platform.env.zq.service.impl;
+package com.yfd.platform.qgc_env.zq.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
@@ -8,8 +8,8 @@ import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.common.DataSourceResult;
import com.yfd.platform.common.MicroservicDynamicSQLMapper;
import com.yfd.platform.common.exception.BizException;
-import com.yfd.platform.env.zq.entity.vo.ZqBaseInfoVo;
-import com.yfd.platform.env.zq.service.ZqMonitorService;
+import com.yfd.platform.qgc_env.zq.entity.vo.ZqBaseInfoVo;
+import com.yfd.platform.qgc_env.zq.service.ZqMonitorService;
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/system/controller/SmsVerifyCodeController.java b/backend/src/main/java/com/yfd/platform/system/controller/SmsVerifyCodeController.java
index e3183674..a0572066 100644
--- a/backend/src/main/java/com/yfd/platform/system/controller/SmsVerifyCodeController.java
+++ b/backend/src/main/java/com/yfd/platform/system/controller/SmsVerifyCodeController.java
@@ -4,11 +4,11 @@ import cn.hutool.json.JSONUtil;
import cn.hutool.jwt.JWTUtil;
import com.yfd.platform.config.ResponseResult;
import com.yfd.platform.config.WebConfig;
-import com.yfd.platform.data.domain.SysUserDataScope;
-import com.yfd.platform.data.service.ISysUserDataScopeService;
-import com.yfd.platform.env.domain.SdEngInfoBH;
-import com.yfd.platform.env.service.ISdEngInfoBHService;
-import com.yfd.platform.env.service.ISdHbrvDicService;
+import com.yfd.platform.qgc_data.domain.SysUserDataScope;
+import com.yfd.platform.qgc_data.service.ISysUserDataScopeService;
+import com.yfd.platform.qgc_base.domain.SdEngInfoBH;
+import com.yfd.platform.qgc_base.service.ISdEngInfoBHService;
+import com.yfd.platform.qgc_base.service.ISdHbrvDicService;
import com.yfd.platform.system.domain.*;
import com.yfd.platform.system.mapper.SysMenuMapper;
import com.yfd.platform.system.service.ISmsVerifyCodeService;
diff --git a/backend/src/main/java/com/yfd/platform/system/service/impl/UserServiceImpl.java b/backend/src/main/java/com/yfd/platform/system/service/impl/UserServiceImpl.java
index 31aa4ea9..bdc2fa5e 100644
--- a/backend/src/main/java/com/yfd/platform/system/service/impl/UserServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/system/service/impl/UserServiceImpl.java
@@ -10,13 +10,11 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yfd.platform.config.ResponseResult;
-import com.yfd.platform.data.domain.SysUserDataScope;
-import com.yfd.platform.data.mapper.SysUserDataScopeMapper;
-import com.yfd.platform.env.domain.SdEngInfoBH;
-import com.yfd.platform.env.domain.SdHbrvDic;
-import com.yfd.platform.env.domain.StationBasinInfo;
-import com.yfd.platform.env.mapper.SdEngInfoBHMapper;
-import com.yfd.platform.env.mapper.SdHbrvDicMapper;
+import com.yfd.platform.qgc_data.domain.SysUserDataScope;
+import com.yfd.platform.qgc_data.mapper.SysUserDataScopeMapper;
+import com.yfd.platform.qgc_base.domain.StationBasinInfo;
+import com.yfd.platform.qgc_base.mapper.SdEngInfoBHMapper;
+import com.yfd.platform.qgc_base.mapper.SdHbrvDicMapper;
import com.yfd.platform.system.domain.LoginUser;
import com.yfd.platform.system.domain.SysRole;
import com.yfd.platform.system.domain.SysUser;
diff --git a/backend/src/main/resources/mapper/data/FishDraftDataMapper.xml b/backend/src/main/resources/mapper/data/FishDraftDataMapper.xml
index ec55559f..a2e54147 100644
--- a/backend/src/main/resources/mapper/data/FishDraftDataMapper.xml
+++ b/backend/src/main/resources/mapper/data/FishDraftDataMapper.xml
@@ -3,7 +3,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">