From ba5cff09a1babc87a82a734e2367fadb03bde811 Mon Sep 17 00:00:00 2001 From: wany <13995595726@qq.com> Date: Thu, 14 Nov 2024 11:08:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=BA=A2=E6=B4=AA=E9=81=93=EF=BC=8C=E9=98=B2?= =?UTF-8?q?=E6=B1=9B=E9=81=93=E8=B7=AF=EF=BC=8C=E6=94=BE=E7=A9=BA=E6=B4=9E?= =?UTF-8?q?=EF=BC=8C=E7=81=8C=E6=BA=89=E5=8F=91=E7=94=B5=E6=B4=9E=EF=BC=8C?= =?UTF-8?q?=E6=8B=A6=E6=B4=AA=E5=9D=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xyt/controller/AttDamBaseController.java | 4 +- .../controller/ResFloodRoadController.java | 57 ++++++++ .../xyt/controller/ResTunnelController.java | 58 ++++++++ .../xyt/mapper/ResFloodRoadMapper.java | 15 ++ .../project/xyt/mapper/ResTunnelMapper.java | 15 ++ .../gunshi/project/xyt/model/AttDamBase.java | 2 +- .../project/xyt/model/AttSpillwayBase.java | 16 +++ .../project/xyt/model/ResFloodRoad.java | 70 ++++++++++ .../gunshi/project/xyt/model/ResTunnel.java | 130 ++++++++++++++++++ .../xyt/service/ResFloodRoadService.java | 25 ++++ .../project/xyt/service/ResTunnelService.java | 25 ++++ 11 files changed, 414 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/gunshi/project/xyt/controller/ResFloodRoadController.java create mode 100644 src/main/java/com/gunshi/project/xyt/controller/ResTunnelController.java create mode 100644 src/main/java/com/gunshi/project/xyt/mapper/ResFloodRoadMapper.java create mode 100644 src/main/java/com/gunshi/project/xyt/mapper/ResTunnelMapper.java create mode 100644 src/main/java/com/gunshi/project/xyt/model/ResFloodRoad.java create mode 100644 src/main/java/com/gunshi/project/xyt/model/ResTunnel.java create mode 100644 src/main/java/com/gunshi/project/xyt/service/ResFloodRoadService.java create mode 100644 src/main/java/com/gunshi/project/xyt/service/ResTunnelService.java diff --git a/src/main/java/com/gunshi/project/xyt/controller/AttDamBaseController.java b/src/main/java/com/gunshi/project/xyt/controller/AttDamBaseController.java index 3e80c30..f804b31 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/AttDamBaseController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/AttDamBaseController.java @@ -95,9 +95,9 @@ public class AttDamBaseController extends AbstractCommonFileController{ return R.ok(service.lambdaQuery().list()); } - @Operation(summary = "获取主副坝信息") + @Operation(summary = "获取主副坝,拦洪坝信息") @GetMapping("/info") - public R> info(@Schema(name = "isMain",description = "是否主坝（0否 1是）") @RequestParam(name = "isMain") Integer isMain) { + public R> info(@Schema(name = "isMain",description = "是否主坝（0否 1是 2拦洪坝）") @RequestParam(name = "isMain") Integer isMain) { return R.ok(service.lambdaQuery().eq(AttDamBase::getIsMain,isMain).list()); } diff --git a/src/main/java/com/gunshi/project/xyt/controller/ResFloodRoadController.java b/src/main/java/com/gunshi/project/xyt/controller/ResFloodRoadController.java new file mode 100644 index 0000000..a94e63c --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/controller/ResFloodRoadController.java @@ -0,0 +1,57 @@ +package com.gunshi.project.xyt.controller; + +import com.gunshi.core.result.R; +import com.gunshi.project.xyt.model.ResFloodRoad; +import com.gunshi.project.xyt.service.ResFloodRoadService; +import com.gunshi.project.xyt.validate.markers.Insert; +import com.gunshi.project.xyt.validate.markers.Update; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.Serializable; +import java.util.List; +/** + * 描述: 防汛道路 + * author: xusan + * date: 2024-11-14 10:37:15 + */ +@Tag(name = "防汛道路") +@RestController +@RequestMapping(value="/resFloodRoad") +public class ResFloodRoadController { + + @Autowired + private ResFloodRoadService service; + + + @Operation(summary = "新增") + @PostMapping("/insert") + public R insert(@Validated(Insert.class) @RequestBody ResFloodRoad dto) { + boolean result = service.save(dto); + return R.ok(result ? dto : null); + } + + @Operation(summary = "修改") + @PostMapping("/update") + public R update(@Validated(Update.class) @RequestBody ResFloodRoad dto) { + boolean result = service.updateById(dto); + return R.ok(result ? dto : null); + } + + @Operation(summary = "删除") + @GetMapping("/del/{id}") + public R del(@Schema(name = "id") @PathVariable("id") Serializable id) { + return R.ok(service.removeById(id)); + } + + @Operation(summary = "列表") + @PostMapping("/list") + public R> list() { + return R.ok(service.lambdaQuery().list()); + } + +} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/controller/ResTunnelController.java b/src/main/java/com/gunshi/project/xyt/controller/ResTunnelController.java new file mode 100644 index 0000000..9131efc --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/controller/ResTunnelController.java @@ -0,0 +1,58 @@ +package com.gunshi.project.xyt.controller; + +import com.gunshi.core.result.R; +import com.gunshi.project.xyt.model.ResTunnel; +import com.gunshi.project.xyt.service.ResTunnelService; +import com.gunshi.project.xyt.validate.markers.Insert; +import com.gunshi.project.xyt.validate.markers.Update; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.Serializable; +import java.util.List; +/** + * 描述: 水库建筑物 - 放空洞/灌溉发电洞 + * author: xusan + * date: 2024-11-14 10:34:11 + */ +@Tag(name = "水库建筑物 - 放空洞/灌溉发电洞") +@RestController +@RequestMapping(value="/resTunnel") +public class ResTunnelController { + + @Autowired + private ResTunnelService service; + + + @Operation(summary = "新增") + @PostMapping("/insert") + public R insert(@Validated(Insert.class) @RequestBody ResTunnel dto) { + boolean result = service.save(dto); + return R.ok(result ? dto : null); + } + + @Operation(summary = "修改") + @PostMapping("/update") + public R update(@Validated(Update.class) @RequestBody ResTunnel dto) { + boolean result = service.updateById(dto); + return R.ok(result ? dto : null); + } + + @Operation(summary = "删除") + @GetMapping("/del/{id}") + public R del(@Schema(name = "id") @PathVariable("id") Serializable id) { + return R.ok(service.removeById(id)); + } + + @Operation(summary = "列表") + @GetMapping("/list") + public R> list(@Schema(name = "type",description = "类型（1放空洞 2灌溉发电洞)") @RequestParam(name = "type") Integer type) { + return R.ok(service.lambdaQuery().eq(ResTunnel::getType,type).list()); + } + + +} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/ResFloodRoadMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/ResFloodRoadMapper.java new file mode 100644 index 0000000..9494157 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/mapper/ResFloodRoadMapper.java @@ -0,0 +1,15 @@ +package com.gunshi.project.xyt.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.gunshi.project.xyt.model.ResFloodRoad; +import org.apache.ibatis.annotations.Mapper; + +/** + * 描述: 防汛道路 + * author: xusan + * date: 2024-11-14 10:37:15 + */ +@Mapper +public interface ResFloodRoadMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/ResTunnelMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/ResTunnelMapper.java new file mode 100644 index 0000000..de126e8 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/mapper/ResTunnelMapper.java @@ -0,0 +1,15 @@ +package com.gunshi.project.xyt.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.gunshi.project.xyt.model.ResTunnel; +import org.apache.ibatis.annotations.Mapper; + +/** + * 描述: 水库建筑物 - 放空洞/灌溉发电洞 + * author: xusan + * date: 2024-11-14 10:34:12 + */ +@Mapper +public interface ResTunnelMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/AttDamBase.java b/src/main/java/com/gunshi/project/xyt/model/AttDamBase.java index 1929f53..b362f38 100644 --- a/src/main/java/com/gunshi/project/xyt/model/AttDamBase.java +++ b/src/main/java/com/gunshi/project/xyt/model/AttDamBase.java @@ -60,7 +60,7 @@ public class AttDamBase implements Serializable { * 是否主坝（0否 1是） */ @TableField(value="is_main") - @Schema(description="是否主坝（0否 1是）") + @Schema(description="是否主坝（0否 1是 2拦洪坝）") private Integer isMain; /** diff --git a/src/main/java/com/gunshi/project/xyt/model/AttSpillwayBase.java b/src/main/java/com/gunshi/project/xyt/model/AttSpillwayBase.java index 700d546..e963e5a 100644 --- a/src/main/java/com/gunshi/project/xyt/model/AttSpillwayBase.java +++ b/src/main/java/com/gunshi/project/xyt/model/AttSpillwayBase.java @@ -55,6 +55,22 @@ public class AttSpillwayBase implements Serializable { @Size(max = 30,message = "型式最大长度要小于 30") private String buildType; + /** + * 堰顶型式 + */ + @TableField(value="crest_type") + @Schema(description="堰顶型式") + @Size(max = 30,message = "堰顶型式最大长度要小于 30") + private String crestType; + + /** + * 地基特性 + */ + @TableField(value="found_character") + @Schema(description="地基特性") + @Size(max = 30,message = "地基特性最大长度要小于 30") + private String foundCharacter; + /** * 堰顶高程(m) */ diff --git a/src/main/java/com/gunshi/project/xyt/model/ResFloodRoad.java b/src/main/java/com/gunshi/project/xyt/model/ResFloodRoad.java new file mode 100644 index 0000000..fb2ec19 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/model/ResFloodRoad.java @@ -0,0 +1,70 @@ +package com.gunshi.project.xyt.model; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Size; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** +* 描述: 防汛道路 +* author: xusan +* date: 2024-11-14 10:37:15 +*/ +@Schema(description="防汛道路") +@Data +@TableName("public.res_flood_road") +public class ResFloodRoad implements Serializable { + + public final static String thisTableName = "ResFloodRoad"; + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value="id", type= IdType.AUTO) + @Schema(description="主键") + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** + * 水库代码 + */ + @TableField(value="res_code") + @Schema(description="水库代码") + @Size(max = 32,message = "水库代码最大长度要小于 32") + private String resCode; + + /** + * 名称 + */ + @TableField(value="name") + @Schema(description="名称") + @Size(max = 30,message = "名称最大长度要小于 30") + private String name; + + /** + * 防汛路长度 + */ + @TableField(value="flood_road_len") + @Schema(description="防汛路长度") + private BigDecimal floodRoadLen; + + /** + * 路面宽度 + */ + @TableField(value="road_width") + @Schema(description="路面宽度") + @Size(max = 30,message = "路面宽度最大长度要小于 30") + private String roadWidth; + +} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/ResTunnel.java b/src/main/java/com/gunshi/project/xyt/model/ResTunnel.java new file mode 100644 index 0000000..f4d7a0d --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/model/ResTunnel.java @@ -0,0 +1,130 @@ +package com.gunshi.project.xyt.model; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Size; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** +* 描述: 水库建筑物 - 放空洞/灌溉发电洞 +* author: xusan +* date: 2024-11-14 10:34:11 +*/ +@Schema(description="水库建筑物 - 放空洞/灌溉发电洞") +@Data +@TableName("public.res_tunnel") +public class ResTunnel implements Serializable { + + public final static String thisTableName = "ResTunnel"; + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value="id", type= IdType.AUTO) + @Schema(description="主键") + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** + * 水库代码 + */ + @TableField(value="res_code") + @Schema(description="水库代码") + @Size(max = 32,message = "水库代码最大长度要小于 32") + private String resCode; + + /** + * 建筑物名称 + */ + @TableField(value="name") + @Schema(description="建筑物名称") + @Size(max = 30,message = "建筑物名称最大长度要小于 30") + private String name; + + /** + * 型式 + */ + @TableField(value="build_type") + @Schema(description="型式") + @Size(max = 30,message = "型式最大长度要小于 30") + private String buildType; + + /** + * 衬砌型式 + */ + @TableField(value="lining_type") + @Schema(description="衬砌型式") + @Size(max = 30,message = "衬砌型式最大长度要小于 30") + private String liningType; + + /** + * 地基特性 + */ + @TableField(value="found_character") + @Schema(description="地基特性") + @Size(max = 30,message = "地基特性最大长度要小于 30") + private String foundCharacter; + + /** + * 进口底板高程(m) + */ + @TableField(value="inlet_ele") + @Schema(description="进口底板高程(m)") + private BigDecimal inletEle; + + /** + * 断面尺寸 + */ + @TableField(value="section_size") + @Schema(description="断面尺寸") + private BigDecimal sectionSize; + + /** + * 洞长 + */ + @TableField(value="tunnel_len") + @Schema(description="洞长") + private BigDecimal tunnelLen; + + /** + * 设计流量(m3/s) + */ + @TableField(value="des_q") + @Schema(description="设计流量(m3/s)") + private BigDecimal desQ; + + /** + * 进口闸门型式 + */ + @TableField(value="valve_type") + @Schema(description="进口闸门型式") + @Size(max = 30,message = "进口闸门型式最大长度要小于 30") + private String valveType; + + /** + * 进口启闭机型式 + */ + @TableField(value="oc_type") + @Schema(description="进口启闭机型式") + @Size(max = 18,message = "进口启闭机型式最大长度要小于 18") + private String ocType; + + /** + * 类型（1放空洞 2灌溉发电洞) + */ + @TableField(value="type") + @Schema(description="类型（1放空洞 2灌溉发电洞)") + private Integer type; + +} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/service/ResFloodRoadService.java b/src/main/java/com/gunshi/project/xyt/service/ResFloodRoadService.java new file mode 100644 index 0000000..4fc59a2 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/service/ResFloodRoadService.java @@ -0,0 +1,25 @@ +package com.gunshi.project.xyt.service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gunshi.project.xyt.mapper.ResFloodRoadMapper; +import com.gunshi.project.xyt.model.ResFloodRoad; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; + +/** + * 描述: 防汛道路 + * author: xusan + * date: 2024-11-14 10:37:15 + */ +@Service +@Slf4j +@Transactional(rollbackFor = Exception.class) +public class ResFloodRoadService extends ServiceImpl +{ + +} + + diff --git a/src/main/java/com/gunshi/project/xyt/service/ResTunnelService.java b/src/main/java/com/gunshi/project/xyt/service/ResTunnelService.java new file mode 100644 index 0000000..f1cacfe --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/service/ResTunnelService.java @@ -0,0 +1,25 @@ +package com.gunshi.project.xyt.service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gunshi.project.xyt.mapper.ResTunnelMapper; +import com.gunshi.project.xyt.model.ResTunnel; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; + +/** + * 描述: 水库建筑物 - 放空洞/灌溉发电洞 + * author: xusan + * date: 2024-11-14 10:34:12 + */ +@Service +@Slf4j +@Transactional(rollbackFor = Exception.class) +public class ResTunnelService extends ServiceImpl +{ + +} + +