From 916fa29249a95ab66f9244aa51e973d28308491c Mon Sep 17 00:00:00 2001 From: wangxin <19528409042@163.com> Date: Fri, 20 Nov 2026 22:49:28 +0800 Subject: [PATCH] Changes --- .../tocc/infra/maint/api/BridgeApi.java | 6 +- .../tocc/infra/maint/api/RoadApi.java | 6 +- .../infra/maint/model/BridgeListModel.java | 62 +++++++++++++++++++ .../infra/maint/model/BridgeSearchModel.java | 36 +++++++++++ .../tocc/infra/maint/model/RoadListModel.java | 44 +++++++++++++ .../infra/maint/model/RoadSearchModel.java | 33 ++++++++++ .../infra/maint/api/impl/BridgeApiImpl.java | 20 +++++- .../infra/maint/api/impl/RoadApiImpl.java | 6 +- .../tocc/infra/maint/mapper/BridgeMapper.java | 6 ++ .../main/resources/mapper/BridgeMapper.xml | 47 ++++++++++++++ .../maint/controller/MaintController.java | 26 +++++--- 11 files changed, 277 insertions(+), 15 deletions(-) create mode 100644 tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/BridgeListModel.java create mode 100644 tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/BridgeSearchModel.java create mode 100644 tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/RoadListModel.java create mode 100644 tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/RoadSearchModel.java create mode 100644 tocc-infra-maint/tocc-infra-maint-biz/src/main/resources/mapper/BridgeMapper.xml diff --git a/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/api/BridgeApi.java b/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/api/BridgeApi.java index 0439558..fb4e1bb 100644 --- a/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/api/BridgeApi.java +++ b/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/api/BridgeApi.java @@ -2,6 +2,8 @@ package com.wanji.software.tocc.infra.maint.api; import com.wanji.software.tocc.common.model.Result; import com.wanji.software.tocc.infra.maint.constants.ApiConstants; +import com.wanji.software.tocc.infra.maint.model.BridgeListModel; +import com.wanji.software.tocc.infra.maint.model.BridgeSearchModel; import com.wanji.software.tocc.infra.maint.model.dto.BridgePageReq; import com.wanji.software.tocc.infra.maint.model.dto.BridgeResp; import com.wanji.software.tocc.infra.maint.model.dto.BridgeSaveReq; @@ -43,6 +45,6 @@ public interface BridgeApi { Result delete(@Parameter(description = "主键") @RequestParam("id") String id); @PostMapping(PREFIX + "/page") - @Operation(summary = "分页查询桥梁信息表") - Result> page(@RequestBody BridgePageReq req); + @Operation(summary = "分页查询桥梁") + Result> page(@RequestBody BridgeSearchModel searchModel); } diff --git a/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/api/RoadApi.java b/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/api/RoadApi.java index 4b71b28..ac0aeaf 100644 --- a/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/api/RoadApi.java +++ b/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/api/RoadApi.java @@ -2,6 +2,8 @@ package com.wanji.software.tocc.infra.maint.api; import com.wanji.software.tocc.common.model.Result; import com.wanji.software.tocc.infra.maint.constants.ApiConstants; +import com.wanji.software.tocc.infra.maint.model.RoadListModel; +import com.wanji.software.tocc.infra.maint.model.RoadSearchModel; import com.wanji.software.tocc.infra.maint.model.dto.RoadPageReq; import com.wanji.software.tocc.infra.maint.model.dto.RoadResp; import com.wanji.software.tocc.infra.maint.model.dto.RoadSaveReq; @@ -43,6 +45,6 @@ public interface RoadApi { Result delete(@Parameter(description = "主键") @RequestParam("id") String id); @PostMapping(PREFIX + "/page") - @Operation(summary = "分页查询道路信息表") - Result> page(@RequestBody RoadPageReq req); + @Operation(summary = "分页查询道路") + Result> page(@RequestBody RoadSearchModel searchModel); } diff --git a/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/BridgeListModel.java b/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/BridgeListModel.java new file mode 100644 index 0000000..2cb0103 --- /dev/null +++ b/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/BridgeListModel.java @@ -0,0 +1,62 @@ +package com.wanji.software.tocc.infra.maint.model; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +@Schema(description = "桥梁列表") +public class BridgeListModel { + + @Schema(description = "ID") + private String id; + + @Schema(description = "管养单位-名称") + private String deptName; + + @Schema(description = "道路-编码") + private String roadCode; + + @Schema(description = "道路-名称") + private String roadName; + + @Schema(description = "路段-编码") + private String sectionCode; + + @Schema(description = "路段-名称") + private String sectionName; + + @Schema(description = "桥梁编码") + private String bridgeCode; + + @Schema(description = "桥梁名称") + private String bridgeName; + + @Schema(description = "起点桩号") + private String chainageStart; + + @Schema(description = "终点桩号") + private String chainageEnd; + + @Schema(description = "桥梁类型") + private Integer bridgeType; + + @Schema(description = "桥梁全长(m)") + private BigDecimal bridgeLen; + + @Schema(description = "跨径总长(m)") + private BigDecimal totalSpanLen; + + @Schema(description = "桥面净宽(m)") + private BigDecimal deckClearWidth; + + @Schema(description = "行政区划-名称") + private String regionName; + + @Schema(description = "状态") + private Integer status; + + @Schema(description = "技术状态") + private Integer techStatus; +} diff --git a/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/BridgeSearchModel.java b/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/BridgeSearchModel.java new file mode 100644 index 0000000..f38df4b --- /dev/null +++ b/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/BridgeSearchModel.java @@ -0,0 +1,36 @@ +package com.wanji.software.tocc.infra.maint.model; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description = "桥梁查询条件") +public class BridgeSearchModel { + + @Schema(description = "页码") + private Long pageNo = 1L; + + @Schema(description = "每页条数") + private Long pageSize = 10L; + + @Schema(description = "管养单位-ID") + private String deptId; + + @Schema(description = "道路-ID") + private String roadId; + + @Schema(description = "桥梁编码") + private String bridgeCode; + + @Schema(description = "桥梁名称") + private String bridgeName; + + @Schema(description = "桥梁类型") + private Integer bridgeType; + + @Schema(description = "状态") + private Integer status; + + @Schema(description = "技术状态") + private Integer techStatus; +} diff --git a/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/RoadListModel.java b/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/RoadListModel.java new file mode 100644 index 0000000..bddb9b5 --- /dev/null +++ b/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/RoadListModel.java @@ -0,0 +1,44 @@ +package com.wanji.software.tocc.infra.maint.model; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +@Schema(description = "道路列表") +public class RoadListModel { + + @Schema(description = "ID") + private String id; + + @Schema(description = "管养单位-名称") + private String deptName; + + @Schema(description = "道路编码") + private String roadCode; + + @Schema(description = "道路名称") + private String roadName; + + @Schema(description = "起点桩号") + private String chainageStart; + + @Schema(description = "终点桩号") + private String chainageEnd; + + @Schema(description = "行政等级") + private Integer adminLevel; + + @Schema(description = "道路长度(㎞)") + private BigDecimal roadLen; + + @Schema(description = "行政区划-名称") + private String regionName; + + @Schema(description = "状态") + private Integer status; + + @Schema(description = "技术状态") + private Integer techStatus; +} diff --git a/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/RoadSearchModel.java b/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/RoadSearchModel.java new file mode 100644 index 0000000..520583e --- /dev/null +++ b/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/RoadSearchModel.java @@ -0,0 +1,33 @@ +package com.wanji.software.tocc.infra.maint.model; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description = "道路查询条件") +public class RoadSearchModel { + + @Schema(description = "页码") + private Long pageNo = 1L; + + @Schema(description = "每页条数") + private Long pageSize = 10L; + + @Schema(description = "管养单位-ID") + private String deptId; + + @Schema(description = "道路编码") + private String roadCode; + + @Schema(description = "道路名称") + private String roadName; + + @Schema(description = "行政等级") + private Integer adminLevel; + + @Schema(description = "状态") + private Integer status; + + @Schema(description = "技术状态") + private Integer techStatus; +} diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/api/impl/BridgeApiImpl.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/api/impl/BridgeApiImpl.java index 3ba9382..c7d2966 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/api/impl/BridgeApiImpl.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/api/impl/BridgeApiImpl.java @@ -1,14 +1,19 @@ package com.wanji.software.tocc.infra.maint.api.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.wanji.software.tocc.common.model.Result; import com.wanji.software.tocc.infra.maint.api.BridgeApi; import com.wanji.software.tocc.infra.maint.mapper.BridgeMapper; +import com.wanji.software.tocc.infra.maint.model.BridgeListModel; +import com.wanji.software.tocc.infra.maint.model.BridgeSearchModel; import com.wanji.software.tocc.infra.maint.model.dto.BridgePageReq; import com.wanji.software.tocc.infra.maint.model.dto.BridgeResp; import com.wanji.software.tocc.infra.maint.model.dto.BridgeSaveReq; import com.wanji.software.tocc.infra.maint.model.po.Bridge; import com.wanji.software.tocc.infra.maint.support.MaintRecords; import com.wanji.software.tocc.maint.support.PageResult; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -42,7 +47,18 @@ public class BridgeApiImpl implements BridgeApi { } @Override - public Result> page(BridgePageReq req) { - return MaintRecords.page(bridgeMapper, req, Bridge.class, BridgeResp.class); + public Result> page(BridgeSearchModel searchModel) { + Long pageNo = ObjectUtils.defaultIfNull(searchModel.getPageNo(), 1L); + Long pageSize = ObjectUtils.defaultIfNull(searchModel.getPageSize(), 10L); + Page page = new Page<>(pageNo, pageSize); + bridgeMapper.page(page, searchModel); + + PageResult pageResult = new PageResult<>(); + pageResult.setTotal(page.getTotal()); + pageResult.setPageNo(page.getCurrent()); + pageResult.setPageSize(page.getSize()); + pageResult.setRecords(page.getRecords()); + + return Result.ok(pageResult); } } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/api/impl/RoadApiImpl.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/api/impl/RoadApiImpl.java index 6dbe96c..f9c4497 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/api/impl/RoadApiImpl.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/api/impl/RoadApiImpl.java @@ -3,6 +3,8 @@ package com.wanji.software.tocc.infra.maint.api.impl; import com.wanji.software.tocc.common.model.Result; import com.wanji.software.tocc.infra.maint.api.RoadApi; import com.wanji.software.tocc.infra.maint.mapper.RoadMapper; +import com.wanji.software.tocc.infra.maint.model.RoadListModel; +import com.wanji.software.tocc.infra.maint.model.RoadSearchModel; import com.wanji.software.tocc.infra.maint.model.dto.RoadPageReq; import com.wanji.software.tocc.infra.maint.model.dto.RoadResp; import com.wanji.software.tocc.infra.maint.model.dto.RoadSaveReq; @@ -42,7 +44,7 @@ public class RoadApiImpl implements RoadApi { } @Override - public Result> page(RoadPageReq req) { - return MaintRecords.page(roadMapper, req, Road.class, RoadResp.class); + public Result> page(RoadSearchModel searchModel) { + return MaintRecords.page(roadMapper, searchModel, Road.class, RoadListModel.class); } } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/mapper/BridgeMapper.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/mapper/BridgeMapper.java index 274777b..c70b878 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/mapper/BridgeMapper.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/mapper/BridgeMapper.java @@ -1,9 +1,15 @@ package com.wanji.software.tocc.infra.maint.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.wanji.software.tocc.infra.maint.model.BridgeListModel; +import com.wanji.software.tocc.infra.maint.model.BridgeSearchModel; import com.wanji.software.tocc.infra.maint.model.po.Bridge; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; @Mapper public interface BridgeMapper extends BaseMapper { + + Page page(Page page, @Param("searchModel") BridgeSearchModel searchModel); } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/resources/mapper/BridgeMapper.xml b/tocc-infra-maint/tocc-infra-maint-biz/src/main/resources/mapper/BridgeMapper.xml new file mode 100644 index 0000000..a83d02a --- /dev/null +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/resources/mapper/BridgeMapper.xml @@ -0,0 +1,47 @@ + + + + + \ No newline at end of file diff --git a/tocc-system-maint/tocc-system-maint-biz/src/main/java/com/wanji/software/tocc/system/maint/controller/MaintController.java b/tocc-system-maint/tocc-system-maint-biz/src/main/java/com/wanji/software/tocc/system/maint/controller/MaintController.java index e3d81c2..3e5efc0 100644 --- a/tocc-system-maint/tocc-system-maint-biz/src/main/java/com/wanji/software/tocc/system/maint/controller/MaintController.java +++ b/tocc-system-maint/tocc-system-maint-biz/src/main/java/com/wanji/software/tocc/system/maint/controller/MaintController.java @@ -3,14 +3,17 @@ package com.wanji.software.tocc.system.maint.controller; import com.wanji.software.tocc.common.model.Result; import com.wanji.software.tocc.infra.maint.api.BridgeApi; import com.wanji.software.tocc.infra.maint.api.MaintHealthApi; -import com.wanji.software.tocc.infra.maint.model.dto.BridgeResp; +import com.wanji.software.tocc.infra.maint.api.RoadApi; +import com.wanji.software.tocc.infra.maint.model.BridgeListModel; +import com.wanji.software.tocc.infra.maint.model.BridgeSearchModel; +import com.wanji.software.tocc.infra.maint.model.RoadListModel; +import com.wanji.software.tocc.infra.maint.model.RoadSearchModel; import com.wanji.software.tocc.maint.support.CurrentUserHolder; +import com.wanji.software.tocc.maint.support.PageResult; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -26,6 +29,9 @@ public class MaintController { @Resource private MaintHealthApi maintHealthApi; + @Resource + private RoadApi roadApi; + @Resource private BridgeApi bridgeApi; @@ -41,9 +47,15 @@ public class MaintController { return Result.ok(CurrentUserHolder.get().getUserName()); } - @GetMapping("/bridge") - @Operation(summary = "查看本地开发使用的当前用户") - public Result getBridgeById(@RequestParam("id") String id) { - return Result.ok(bridgeApi.getById(id).getCheckedData()); + @GetMapping("/road/page") + @Operation(summary = "分页查询道路") + public Result> roadPage(RoadSearchModel searchModel) { + return roadApi.page(searchModel); + } + + @GetMapping("/bridge/page") + @Operation(summary = "分页查询桥梁") + public Result> bridgePage(BridgeSearchModel searchModel) { + return bridgeApi.page(searchModel); } }