diff --git a/src/main/java/com/gunshi/project/xyt/controller/ReservoirWaterController.java b/src/main/java/com/gunshi/project/xyt/controller/ReservoirWaterController.java index b57b184..9ca0c65 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/ReservoirWaterController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/ReservoirWaterController.java @@ -1,15 +1,18 @@ package com.gunshi.project.xyt.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.annotation.Get; import com.gunshi.core.annotation.Post; import com.gunshi.core.result.R; import com.gunshi.project.xyt.entity.so.DataQueryCommonSo; +import com.gunshi.project.xyt.entity.so.PicQuerySo; import com.gunshi.project.xyt.entity.so.ReservoirWaterCommonSo; import com.gunshi.project.xyt.entity.vo.AttResBaseVo; import com.gunshi.project.xyt.entity.vo.AttResMonitorVo; import com.gunshi.project.xyt.entity.vo.AttRvMonitorDetailVo; import com.gunshi.project.xyt.entity.vo.StRsvrVo; +import com.gunshi.project.xyt.model.StImgR; import com.gunshi.project.xyt.model.StImgRReal; import com.gunshi.project.xyt.model.StStbprpB; import com.gunshi.project.xyt.service.ReservoirWaterService; @@ -55,6 +58,11 @@ public class ReservoirWaterController { return R.ok(reservoirWaterService.channel(resCode)); } + @Post(path = "/image/info", summary = "图片信息") + public R> imageInfo(@RequestBody @Validated PicQuerySo picQuerySo) { + return R.ok(reservoirWaterService.imageInfo(picQuerySo)); + } + @Post(path = "/real/img", summary = "水库实时图像") public R> realImg(@RequestBody ReservoirWaterCommonSo reservoirWaterCommonSo) { return R.ok(reservoirWaterService.realImg(reservoirWaterCommonSo)); diff --git a/src/main/java/com/gunshi/project/xyt/entity/so/PicQuerySo.java b/src/main/java/com/gunshi/project/xyt/entity/so/PicQuerySo.java new file mode 100644 index 0000000..e4f2396 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/entity/so/PicQuerySo.java @@ -0,0 +1,41 @@ +package com.gunshi.project.xyt.entity.so; + +import com.gunshi.db.dto.PageSo; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.Pattern; +import lombok.Data; + +/** + * + * Created by wanyan on 2024/2/2. + * + * @author wanyan + * @version 1.0 + */ +@Data +@Schema(description = "查询条件") +public class PicQuerySo { + + @Schema(description="水库编码") + @NotEmpty(message = "水库编码不可为空") + private String resCode; + + @Schema(description="测站编码") + private String stcd; + + @Schema(description = "开始时间") + @NotEmpty(message = "开始时间不能为空") + @Pattern(regexp = "^[1-9]\\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])\\s+(20|21|22|23|[0-1]\\d):[0-5]\\d:[0-5]\\d$", message = "时间格式应为:yyyy-MM-dd HH:mm:ss") + private String stm; + + @Schema(description = "结束时间") + @NotEmpty(message = "结束时间不能为空") + @Pattern(regexp = "^[1-9]\\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])\\s+(20|21|22|23|[0-1]\\d):[0-5]\\d:[0-5]\\d$", message = "时间格式应为:yyyy-MM-dd HH:mm:ss") + private String etm; + + @Schema(description="分页参数") + private PageSo pageSo; + + +} diff --git a/src/main/java/com/gunshi/project/xyt/mapper/AttResBaseMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/AttResBaseMapper.java index c23ed02..c9a34d8 100644 --- a/src/main/java/com/gunshi/project/xyt/mapper/AttResBaseMapper.java +++ b/src/main/java/com/gunshi/project/xyt/mapper/AttResBaseMapper.java @@ -1,13 +1,12 @@ package com.gunshi.project.xyt.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.project.xyt.entity.so.DataQueryCommonSo; +import com.gunshi.project.xyt.entity.so.PicQuerySo; import com.gunshi.project.xyt.entity.vo.AttResBaseVo; import com.gunshi.project.xyt.entity.vo.AttResMonitorVo; -import com.gunshi.project.xyt.model.AttResBase; -import com.gunshi.project.xyt.model.StImgRReal; -import com.gunshi.project.xyt.model.StRsvrR; -import com.gunshi.project.xyt.model.StStbprpB; +import com.gunshi.project.xyt.model.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -118,4 +117,21 @@ public interface AttResBaseMapper extends BaseMapper { """) List channel(@Param("resCode") String resCode); + + @Select(""" + + """) + Page imageInfo(@Param("page") Page page ,@Param("obj") PicQuerySo picQuerySo); } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/service/ReservoirWaterService.java b/src/main/java/com/gunshi/project/xyt/service/ReservoirWaterService.java index 70a19dc..4d1545f 100644 --- a/src/main/java/com/gunshi/project/xyt/service/ReservoirWaterService.java +++ b/src/main/java/com/gunshi/project/xyt/service/ReservoirWaterService.java @@ -3,15 +3,14 @@ package com.gunshi.project.xyt.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.project.xyt.entity.so.DataQueryCommonSo; +import com.gunshi.project.xyt.entity.so.PicQuerySo; import com.gunshi.project.xyt.entity.so.ReservoirWaterCommonSo; import com.gunshi.project.xyt.entity.vo.*; import com.gunshi.project.xyt.mapper.AttResBaseMapper; import com.gunshi.project.xyt.mapper.StZvarlBMapper; -import com.gunshi.project.xyt.model.AttResBase; -import com.gunshi.project.xyt.model.StImgRReal; -import com.gunshi.project.xyt.model.StStbprpB; -import com.gunshi.project.xyt.model.StZvarlB; +import com.gunshi.project.xyt.model.*; import com.gunshi.project.xyt.util.DataHandleUtil; import com.gunshi.project.xyt.util.DateUtil; import jakarta.annotation.Resource; @@ -218,4 +217,8 @@ public class ReservoirWaterService { public List channel(String resCode) { return attResBaseMapper.channel(resCode); } + + public Page imageInfo(PicQuerySo picQuerySo) { + return attResBaseMapper.imageInfo(picQuerySo.getPageSo().toPage(),picQuerySo); + } }