This commit is contained in:
wangxin
2026-11-20 22:49:28 +08:00
parent 803bcdd2e8
commit 916fa29249
11 changed files with 277 additions and 15 deletions
@@ -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<Boolean> delete(@Parameter(description = "主键") @RequestParam("id") String id);
@PostMapping(PREFIX + "/page")
@Operation(summary = "分页查询桥梁信息表")
Result<PageResult<BridgeResp>> page(@RequestBody BridgePageReq req);
@Operation(summary = "分页查询桥梁")
Result<PageResult<BridgeListModel>> page(@RequestBody BridgeSearchModel searchModel);
}
@@ -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<Boolean> delete(@Parameter(description = "主键") @RequestParam("id") String id);
@PostMapping(PREFIX + "/page")
@Operation(summary = "分页查询道路信息表")
Result<PageResult<RoadResp>> page(@RequestBody RoadPageReq req);
@Operation(summary = "分页查询道路")
Result<PageResult<RoadListModel>> page(@RequestBody RoadSearchModel searchModel);
}
@@ -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;
}
@@ -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;
}
@@ -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;
}
@@ -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;
}
@@ -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<PageResult<BridgeResp>> page(BridgePageReq req) {
return MaintRecords.page(bridgeMapper, req, Bridge.class, BridgeResp.class);
public Result<PageResult<BridgeListModel>> page(BridgeSearchModel searchModel) {
Long pageNo = ObjectUtils.defaultIfNull(searchModel.getPageNo(), 1L);
Long pageSize = ObjectUtils.defaultIfNull(searchModel.getPageSize(), 10L);
Page<BridgeListModel> page = new Page<>(pageNo, pageSize);
bridgeMapper.page(page, searchModel);
PageResult<BridgeListModel> pageResult = new PageResult<>();
pageResult.setTotal(page.getTotal());
pageResult.setPageNo(page.getCurrent());
pageResult.setPageSize(page.getSize());
pageResult.setRecords(page.getRecords());
return Result.ok(pageResult);
}
}
@@ -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<PageResult<RoadResp>> page(RoadPageReq req) {
return MaintRecords.page(roadMapper, req, Road.class, RoadResp.class);
public Result<PageResult<RoadListModel>> page(RoadSearchModel searchModel) {
return MaintRecords.page(roadMapper, searchModel, Road.class, RoadListModel.class);
}
}
@@ -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<Bridge> {
Page<BridgeListModel> page(Page page, @Param("searchModel") BridgeSearchModel searchModel);
}
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.wanji.software.tocc.infra.maint.mapper.BridgeMapper">
<select id="page" resultType="com.wanji.software.tocc.infra.maint.model.BridgeListModel">
SELECT maint_bridge.id,
maint_bridge.bridge_code,
maint_bridge.bridge_name,
maint_bridge.chainage_start,
maint_bridge.chainage_end,
maint_bridge.bridge_type,
maint_bridge.bridge_len,
maint_bridge.total_span_len,
maint_bridge.deck_clear_width,
maint_bridge.status,
maint_bridge.tech_status,
maint_road.road_code,
maint_road.road_name,
maint_road_section.section_code,
maint_road_section.section_name
FROM maint_bridge
LEFT JOIN maint_road ON maint_bridge.road_id = maint_road.id
LEFT JOIN maint_road_section ON maint_bridge.road_section_id = maint_road_section.id
WHERE 1 = 1
<if test="searchModel.deptId != null and searchModel.deptId != ''">
AND maint_bridge.dept_id = #{searchModel.deptId}
</if>
<if test="searchModel.roadId != null and searchModel.roadId != ''">
AND maint_bridge.road_id = #{searchModel.roadId}
</if>
<if test="searchModel.bridgeCode != null and searchModel.bridgeCode != ''">
AND maint_bridge.bridge_code LIKE concat('%', #{searchModel.bridgeCode}, '%')
</if>
<if test="searchModel.bridgeName != null and searchModel.bridgeName != ''">
AND maint_bridge.bridge_name LIKE concat(#{searchModel.bridgeName}, '%')
</if>
<if test="searchModel.bridgeType != null">
AND maint_bridge.bridge_type = #{searchModel.bridgeType}
</if>
<if test="searchModel.status != null">
AND maint_bridge.status = #{searchModel.status}
</if>
<if test="searchModel.techStatus != null">
AND maint_bridge.tech_status = #{searchModel.techStatus}
</if>
ORDER BY maint_bridge.bridge_code ASC
</select>
</mapper>
@@ -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<BridgeResp> getBridgeById(@RequestParam("id") String id) {
return Result.ok(bridgeApi.getById(id).getCheckedData());
@GetMapping("/road/page")
@Operation(summary = "分页查询道路")
public Result<PageResult<RoadListModel>> roadPage(RoadSearchModel searchModel) {
return roadApi.page(searchModel);
}
@GetMapping("/bridge/page")
@Operation(summary = "分页查询桥梁")
public Result<PageResult<BridgeListModel>> bridgePage(BridgeSearchModel searchModel) {
return bridgeApi.page(searchModel);
}
}