diff --git a/zc-business/src/main/java/com/zc/business/controller/DcRampController.java b/zc-business/src/main/java/com/zc/business/controller/DcRampController.java index d6394d59..73c4923a 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcRampController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcRampController.java @@ -5,6 +5,8 @@ import javax.servlet.http.HttpServletResponse; import com.zc.business.domain.DcRamp; import com.zc.business.service.IDcRampService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -29,6 +31,8 @@ import com.ruoyi.common.core.page.TableDataInfo; * @author ruoyi * @date 2024-01-12 */ +@Api(value = "匝道信息",tags = {"匝道信息"}) + @RestController @RequestMapping("/system/ramp") public class DcRampController extends BaseController @@ -39,18 +43,33 @@ public class DcRampController extends BaseController /** * 查询匝道信息列表 */ - @PreAuthorize("@ss.hasPermi('system:ramp:list')") + @ApiOperation("查询匝道信息列表") + + //@PreAuthorize("@ss.hasPermi('system:ramp:list')") @GetMapping("/list") public TableDataInfo list(DcRamp dcRamp) { startPage(); List list = dcRampService.selectDcRampList(dcRamp); return getDataTable(list); + } /** + * 无分页查询匝道信息列表 + */ +@ApiOperation("无分页查询匝道信息列表") + +//@PreAuthorize("@ss.hasPermi('system:ramp:list')") + @GetMapping("/listAll") + public TableDataInfo listAll(DcRamp dcRamp) + { + List list = dcRampService.selectDcRampList(dcRamp); + return getDataTable(list); } /** * 根据设施类型 查询匝道信息列表 */ - // @PreAuthorize("@ss.hasPermi('system:ramp:list')") + @ApiOperation("根据设施类型 查询匝道信息列表") + + // @PreAuthorize("@ss.hasPermi('system:ramp:list')") @GetMapping("/listAll/{type}") public TableDataInfo listAll(@PathVariable("type") Long type) { @@ -61,7 +80,9 @@ public class DcRampController extends BaseController /** * 导出匝道信息列表 */ - @PreAuthorize("@ss.hasPermi('system:ramp:export')") + @ApiOperation("导出匝道信息列表") + + // @PreAuthorize("@ss.hasPermi('system:ramp:export')") @Log(title = "匝道信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, DcRamp dcRamp) @@ -74,7 +95,9 @@ public class DcRampController extends BaseController /** * 获取匝道信息详细信息 */ - @PreAuthorize("@ss.hasPermi('system:ramp:query')") + @ApiOperation("获取匝道信息详细信息") + + // @PreAuthorize("@ss.hasPermi('system:ramp:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -84,7 +107,9 @@ public class DcRampController extends BaseController /** * 新增匝道信息 */ - @PreAuthorize("@ss.hasPermi('system:ramp:add')") + @ApiOperation("新增匝道信息") + + // @PreAuthorize("@ss.hasPermi('system:ramp:add')") @Log(title = "匝道信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody DcRamp dcRamp) @@ -95,7 +120,9 @@ public class DcRampController extends BaseController /** * 修改匝道信息 */ - @PreAuthorize("@ss.hasPermi('system:ramp:edit')") + @ApiOperation("修改匝道信息") + + // @PreAuthorize("@ss.hasPermi('system:ramp:edit')") @Log(title = "匝道信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody DcRamp dcRamp) @@ -106,7 +133,9 @@ public class DcRampController extends BaseController /** * 删除匝道信息 */ - @PreAuthorize("@ss.hasPermi('system:ramp:remove')") + @ApiOperation("删除匝道信息") + + // @PreAuthorize("@ss.hasPermi('system:ramp:remove')") @Log(title = "匝道信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/zc-business/src/main/java/com/zc/business/domain/DcEventAccident.java b/zc-business/src/main/java/com/zc/business/domain/DcEventAccident.java index 3d1785e0..a794ccc1 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcEventAccident.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcEventAccident.java @@ -222,9 +222,13 @@ public class DcEventAccident extends BaseEntity { * 设施关联 */ @ApiModelProperty("设施关联") - private Integer facilityId; +@ApiModelProperty("匝道") + private Integer rampId; +@ApiModelProperty("地点") + private String location; + @ApiModelProperty("事件信息实体") //事件信息表 @TableField(exist = false) diff --git a/zc-business/src/main/java/com/zc/business/domain/DcEventConstruction.java b/zc-business/src/main/java/com/zc/business/domain/DcEventConstruction.java index 778d75de..327134d0 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcEventConstruction.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcEventConstruction.java @@ -94,6 +94,10 @@ public class DcEventConstruction extends BaseEntity 2-通行受阻 */ @ApiModelProperty("通行情况:1-通行正常 2-通行受阻") private Long trafficCondition; +@ApiModelProperty("匝道") +private Long rampId; +@ApiModelProperty("施工方式") +private Long constructionMethod; @ApiModelProperty("事件信息实体") //事件信息表 diff --git a/zc-business/src/main/java/com/zc/business/domain/DcEventTrafficCongestion.java b/zc-business/src/main/java/com/zc/business/domain/DcEventTrafficCongestion.java index f667ebe2..1157c9be 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcEventTrafficCongestion.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcEventTrafficCongestion.java @@ -75,6 +75,14 @@ public class DcEventTrafficCongestion extends BaseEntity @ApiModelProperty("地点(收费站):1-入口 2-出口 3-入口内广场 4--出口内广场5-外广场6-入口车道7-出口车道8-入口匝道9-出口匝道 ") private Long location; + @ApiModelProperty("详细原因") + private Integer detailedReasons; + + @ApiModelProperty("地点类型") + private Integer locationType; + @ApiModelProperty("地点描述") + private String locationDescription; + @ApiModelProperty("事件信息实体") //事件信息表 diff --git a/zc-business/src/main/java/com/zc/business/domain/DcEventVehicleAccident.java b/zc-business/src/main/java/com/zc/business/domain/DcEventVehicleAccident.java index 6001d2fb..25461bb3 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcEventVehicleAccident.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcEventVehicleAccident.java @@ -114,6 +114,15 @@ public class DcEventVehicleAccident extends BaseEntity /** 私密事件 */ @ApiModelProperty( "私密事件") private Integer isPrivate; + @ApiModelProperty("设施关联") + private Integer facilityId; + + @ApiModelProperty("匝道") + private Integer rampId; + @ApiModelProperty("地点") + private String location; + + @ApiModelProperty("事件信息实体") //事件信息表 diff --git a/zc-business/src/main/java/com/zc/business/domain/DcRamp.java b/zc-business/src/main/java/com/zc/business/domain/DcRamp.java index 120ac8b3..0c0585d8 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcRamp.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcRamp.java @@ -48,6 +48,7 @@ public class DcRamp extends BaseEntity @ApiModelProperty("匝道宽度(米)") private Long widthMeters; + public void setId(Long id) { this.id = id; diff --git a/zc-business/src/main/resources/mapper/business/DcEventAccidentMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventAccidentMapper.xml index ce16e770..aec41677 100644 --- a/zc-business/src/main/resources/mapper/business/DcEventAccidentMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcEventAccidentMapper.xml @@ -30,10 +30,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select id, reporter_name, reporter_phone_number, accident_type, location_type, traffic_jam, weather_condition, impact_level, is_reverse_cargo, is_maintenance, police_contact, towing_service_contact, congestion_ahead, at_intersection, on_curve, spillage_item, vehicle_owner_phone, small_car, trucks, buses, tankers, minor_injuries, serious_injuries, fatalities, is_private, facility_id from dc_event_accident + select id, reporter_name, reporter_phone_number, accident_type, location_type, traffic_jam, weather_condition, impact_level, is_reverse_cargo, is_maintenance, police_contact, towing_service_contact, congestion_ahead, at_intersection, on_curve, spillage_item, vehicle_owner_phone, small_car, trucks, buses, tankers, minor_injuries, serious_injuries, fatalities, is_private, facility_id,location,ramp_id from dc_event_accident @@ -75,6 +80,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" serious_injuries, fatalities, is_private, + location, + ramp_id, + facility_id, #{id}, @@ -94,6 +102,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{seriousInjuries}, #{fatalities}, #{isPrivate}, + #{location}, + #{rampId}, + #{facilityId}, @@ -116,6 +127,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" serious_injuries = #{seriousInjuries}, fatalities = #{fatalities}, is_private = #{isPrivate}, + location = #{location}, + ramp_id = #{rampId}, + facility_id = #{facilityId}, where id = #{id}