Changes
This commit is contained in:
+18
-22
@@ -3,19 +3,15 @@ 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.RoadModel;
|
||||
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;
|
||||
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.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
@@ -23,28 +19,28 @@ import org.springframework.web.bind.annotation.RequestParam;
|
||||
* 道路信息表
|
||||
*/
|
||||
@FeignClient(name = ApiConstants.NAME, contextId = "RoadApi", url = "${maint.infra.url:http://127.0.0.1:7424}")
|
||||
@Tag(name = "RPC 服务 - 道路信息表")
|
||||
@Tag(name = "RPC 服务 - 道路")
|
||||
public interface RoadApi {
|
||||
|
||||
String PREFIX = ApiConstants.PREFIX + "/road";
|
||||
|
||||
@PostMapping(PREFIX + "/create")
|
||||
@Operation(summary = "新增道路信息表")
|
||||
Result<RoadResp> create(@RequestBody RoadSaveReq req);
|
||||
|
||||
@GetMapping(PREFIX + "/get-by-id")
|
||||
@Operation(summary = "按主键查询道路信息表")
|
||||
Result<RoadResp> getById(@Parameter(description = "主键") @RequestParam("id") String id);
|
||||
|
||||
@PutMapping(PREFIX + "/update")
|
||||
@Operation(summary = "修改道路信息表")
|
||||
Result<Boolean> update(@RequestBody RoadSaveReq req);
|
||||
|
||||
@DeleteMapping(PREFIX + "/delete")
|
||||
@Operation(summary = "删除道路信息表")
|
||||
Result<Boolean> delete(@Parameter(description = "主键") @RequestParam("id") String id);
|
||||
|
||||
@PostMapping(PREFIX + "/page")
|
||||
@Operation(summary = "分页查询道路")
|
||||
Result<PageResult<RoadListModel>> page(@RequestBody RoadSearchModel searchModel);
|
||||
|
||||
@PostMapping(PREFIX + "/create")
|
||||
@Operation(summary = "新增道路")
|
||||
Result<Boolean> create(@RequestBody RoadModel model);
|
||||
|
||||
@PostMapping(PREFIX + "/update")
|
||||
@Operation(summary = "修改道路")
|
||||
Result<Boolean> update(@RequestBody RoadModel model);
|
||||
|
||||
@PostMapping(PREFIX + "/delete")
|
||||
@Operation(summary = "删除道路")
|
||||
Result<Boolean> delete(@Parameter(description = "主键") @RequestParam("ids") String ids);
|
||||
|
||||
@GetMapping(PREFIX + "/get-by-id")
|
||||
@Operation(summary = "按主键查询道路")
|
||||
Result<RoadModel> getById(@Parameter(description = "主键") @RequestParam("id") String id);
|
||||
}
|
||||
|
||||
+62
@@ -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 RoadModel {
|
||||
|
||||
@Schema(description = "主键")
|
||||
private String id;
|
||||
|
||||
@Schema(description = "管养单位-ID")
|
||||
private String deptId;
|
||||
|
||||
@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 subgrade;
|
||||
|
||||
@Schema(description = "路面")
|
||||
private String pavement;
|
||||
|
||||
@Schema(description = "主要构筑物")
|
||||
private String majorStructure;
|
||||
|
||||
@Schema(description = "沿线设施")
|
||||
private String roadsideFacility;
|
||||
|
||||
@Schema(description = "沿线环境")
|
||||
private String roadsideEnv;
|
||||
|
||||
@Schema(description = "行政区划-ID")
|
||||
private String regionId;
|
||||
|
||||
@Schema(description = "状态")
|
||||
private Integer status;
|
||||
|
||||
@Schema(description = "技术状态")
|
||||
private Integer techStatus;
|
||||
|
||||
@Schema(description = "附件")
|
||||
private String attacmentIds;
|
||||
}
|
||||
+119
-24
@@ -1,16 +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.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.RoadModel;
|
||||
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;
|
||||
import com.wanji.software.tocc.infra.maint.model.po.Road;
|
||||
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.StringUtils;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@@ -23,28 +26,120 @@ public class RoadApiImpl implements RoadApi {
|
||||
@Resource
|
||||
private RoadMapper roadMapper;
|
||||
|
||||
@Override
|
||||
public Result<RoadResp> create(RoadSaveReq req) {
|
||||
return MaintRecords.create(roadMapper, req, Road.class, RoadResp.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Result<RoadResp> getById(String id) {
|
||||
return MaintRecords.get(roadMapper, id, RoadResp.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Result<Boolean> update(RoadSaveReq req) {
|
||||
return MaintRecords.update(roadMapper, req);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Result<Boolean> delete(String id) {
|
||||
return MaintRecords.delete(roadMapper, id);
|
||||
}
|
||||
@Resource
|
||||
private JdbcTemplate jdbcTemplate;
|
||||
|
||||
@Override
|
||||
public Result<PageResult<RoadListModel>> page(RoadSearchModel searchModel) {
|
||||
return MaintRecords.page(roadMapper, searchModel, Road.class, RoadListModel.class);
|
||||
Long pageNo = ObjectUtils.defaultIfNull(searchModel.getPageNo(), 1L);
|
||||
Long pageSize = ObjectUtils.defaultIfNull(searchModel.getPageSize(), 10L);
|
||||
Page<RoadListModel> page = new Page<>(pageNo, pageSize);
|
||||
roadMapper.page(page, searchModel);
|
||||
|
||||
PageResult<RoadListModel> pageResult = new PageResult<>();
|
||||
pageResult.setTotal(page.getTotal());
|
||||
pageResult.setPageNo(page.getCurrent());
|
||||
pageResult.setPageSize(page.getSize());
|
||||
pageResult.setRecords(page.getRecords());
|
||||
|
||||
return Result.ok(pageResult);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public Result<Boolean> create(RoadModel model) {
|
||||
String sql = "SELECT count(1) FROM maint_road WHERE road_code = ?";
|
||||
Long total = jdbcTemplate.queryForObject(sql, Long.class, model.getRoadCode());
|
||||
if (total > 0) {
|
||||
return Result.fail("桥梁编码重复");
|
||||
}
|
||||
|
||||
sql = "SELECT count(1) FROM maint_road WHERE road_name = ?";
|
||||
total = jdbcTemplate.queryForObject(sql, Long.class, model.getRoadName());
|
||||
if (total > 0) {
|
||||
return Result.fail("桥梁名称重复");
|
||||
}
|
||||
|
||||
Road road = new Road();
|
||||
BeanUtils.copyProperties(model, road, "id");
|
||||
roadMapper.insert(road);
|
||||
|
||||
return Result.ok(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public Result<Boolean> update(RoadModel model) {
|
||||
if (StringUtils.isBlank(model.getId())) {
|
||||
return Result.fail("主键不能为空");
|
||||
}
|
||||
|
||||
Road road = roadMapper.selectById(model.getId());
|
||||
if (road == null) {
|
||||
return Result.fail("数据不存在");
|
||||
}
|
||||
|
||||
String sql = "SELECT count(1) FROM maint_road WHERE id <> ? AND road_code = ?";
|
||||
Long total = jdbcTemplate.queryForObject(sql, Long.class, model.getId(), model.getRoadCode());
|
||||
if (total > 0) {
|
||||
return Result.fail("桥梁编码重复");
|
||||
}
|
||||
|
||||
sql = "SELECT count(1) FROM maint_road WHERE id <> ? AND road_name = ?";
|
||||
total = jdbcTemplate.queryForObject(sql, Long.class, model.getId(), model.getRoadName());
|
||||
if (total > 0) {
|
||||
return Result.fail("桥梁名称重复");
|
||||
}
|
||||
|
||||
BeanUtils.copyProperties(model, road);
|
||||
roadMapper.updateById(road);
|
||||
|
||||
return Result.ok(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public Result<Boolean> delete(String ids) {
|
||||
String[] idArray = StringUtils.split(ids, ",");
|
||||
for (String id : idArray) {
|
||||
Road road = roadMapper.selectById(id);
|
||||
if (road == null) {
|
||||
return Result.fail("数据不存在");
|
||||
}
|
||||
|
||||
String sql = "SELECT count(1) FROM maint_archive_asset WHERE asset_id = ?";
|
||||
Long total = jdbcTemplate.queryForObject(sql, Long.class, road.getId());
|
||||
if (total > 0) {
|
||||
return Result.fail(String.format("【%s】关联工程建设档案,不能删除", road.getRoadName()));
|
||||
}
|
||||
|
||||
sql = "SELECT count(1) FROM maint_asset_inventory WHERE asset_id = ?";
|
||||
total = jdbcTemplate.queryForObject(sql, Long.class, road.getId());
|
||||
if (total > 0) {
|
||||
return Result.fail(String.format("【%s】关联路产采集,不能删除", road.getRoadName()));
|
||||
}
|
||||
|
||||
sql = "SELECT count(1) FROM maint_defect_asset WHERE asset_id = ?";
|
||||
total = jdbcTemplate.queryForObject(sql, Long.class, road.getId());
|
||||
if (total > 0) {
|
||||
return Result.fail(String.format("【%s】关联病害,不能删除", road.getRoadName()));
|
||||
}
|
||||
|
||||
roadMapper.deleteById(road.getId());
|
||||
}
|
||||
|
||||
return Result.ok(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Result<RoadModel> getById(String id) {
|
||||
Road road = roadMapper.selectById(id);
|
||||
if (road == null) {
|
||||
return Result.fail("数据不存在");
|
||||
}
|
||||
|
||||
RoadModel model = new RoadModel();
|
||||
BeanUtils.copyProperties(road, model);
|
||||
return Result.ok(model);
|
||||
}
|
||||
}
|
||||
|
||||
+6
@@ -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.RoadListModel;
|
||||
import com.wanji.software.tocc.infra.maint.model.RoadSearchModel;
|
||||
import com.wanji.software.tocc.infra.maint.model.po.Road;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
@Mapper
|
||||
public interface RoadMapper extends BaseMapper<Road> {
|
||||
|
||||
Page<RoadListModel> page(Page page, @Param("searchModel") RoadSearchModel searchModel);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
<?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.RoadMapper">
|
||||
<select id="page" resultType="com.wanji.software.tocc.infra.maint.model.RoadListModel">
|
||||
SELECT maint_road.id,
|
||||
maint_road.road_code,
|
||||
maint_road.road_name,
|
||||
maint_road.chainage_start,
|
||||
maint_road.chainage_end,
|
||||
maint_road.admin_level,
|
||||
maint_road.road_len,
|
||||
maint_road.status,
|
||||
maint_road.tech_status
|
||||
FROM maint_road
|
||||
WHERE 1 = 1
|
||||
<if test="searchModel.deptId != null and searchModel.deptId != ''">
|
||||
AND maint_road.dept_id = #{searchModel.deptId}
|
||||
</if>
|
||||
<if test="searchModel.roadCode != null and searchModel.roadCode != ''">
|
||||
AND maint_road.road_code LIKE concat('%', #{searchModel.roadCode}, '%')
|
||||
</if>
|
||||
<if test="searchModel.roadName != null and searchModel.roadName != ''">
|
||||
AND maint_road.road_name LIKE concat(#{searchModel.roadName}, '%')
|
||||
</if>
|
||||
<if test="searchModel.adminLevel != null">
|
||||
AND maint_road.admin_level = #{searchModel.adminLevel}
|
||||
</if>
|
||||
<if test="searchModel.status != null">
|
||||
AND maint_road.status = #{searchModel.status}
|
||||
</if>
|
||||
<if test="searchModel.techStatus != null">
|
||||
AND maint_road.tech_status = #{searchModel.techStatus}
|
||||
</if>
|
||||
ORDER BY maint_road.road_code ASC
|
||||
</select>
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user