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
@@ -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>