diff --git a/zc-business/src/main/java/com/zc/business/controller/DcEventController.java b/zc-business/src/main/java/com/zc/business/controller/DcEventController.java index db486cba..fb255909 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcEventController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcEventController.java @@ -57,6 +57,7 @@ public class DcEventController extends BaseController return getDataTable(list); } + /**调度记录-事件列表 按时间展示交通事件。默认当天时间 。可查询条件 交通事件状态 ，时间范围 * */ diff --git a/zc-business/src/main/java/com/zc/business/controller/DeviceController.java b/zc-business/src/main/java/com/zc/business/controller/DeviceController.java index 59068c78..170b58b2 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DeviceController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DeviceController.java @@ -23,7 +23,7 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.zc.business.service.IDeviceService; /** - * 【请填写功能名称】Controller + * 设备状态 Controller * * @author ruoyi * @date 2024-01-20 @@ -36,7 +36,7 @@ public class DeviceController extends BaseController private IDeviceService deviceService; /** - * 查询【请填写功能名称】列表 + * 查询设备状态列表 */ @PreAuthorize("@ss.hasPermi('system:device:list')") @GetMapping("/list") @@ -48,20 +48,20 @@ public class DeviceController extends BaseController } /** - * 导出【请填写功能名称】列表 + * 导出设备状态列表 */ @PreAuthorize("@ss.hasPermi('system:device:export')") - @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) + @Log(title = "设备状态", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, Device device) { List list = deviceService.selectDeviceList(device); ExcelUtil util = new ExcelUtil<>(Device.class); - util.exportExcel(response, list, "【请填写功能名称】数据"); + util.exportExcel(response, list, "设备状态数据"); } /** - * 获取【请填写功能名称】详细信息 + * 获取设备状态详细信息 */ @PreAuthorize("@ss.hasPermi('system:device:query')") @GetMapping(value = "/{id}") @@ -71,10 +71,10 @@ public class DeviceController extends BaseController } /** - * 新增【请填写功能名称】 + * 新增设备状态 */ @PreAuthorize("@ss.hasPermi('system:device:add')") - @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) + @Log(title = "设备状态", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody Device device) { @@ -82,10 +82,10 @@ public class DeviceController extends BaseController } /** - * 修改【请填写功能名称】 + * 修改设备状态 */ @PreAuthorize("@ss.hasPermi('system:device:edit')") - @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) + @Log(title = "设备状态", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody Device device) { @@ -93,10 +93,10 @@ public class DeviceController extends BaseController } /** - * 删除【请填写功能名称】 + * 删除设备状态 */ @PreAuthorize("@ss.hasPermi('system:device:remove')") - @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) + @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/DcBoardReleaseLog.java b/zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java index 1599ad83..262dc44c 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java @@ -37,7 +37,7 @@ public class DcBoardReleaseLog extends BaseEntity /** 桩号 */ @Excel(name = "桩号") @ApiModelProperty(value="桩号") - private String stakeMarkId; + private String stakeMark; /** 方向1-上行,2-中,3-下行 */ @Excel(name = "方向1-上行,2-中,3-下行") @@ -118,12 +118,12 @@ public class DcBoardReleaseLog extends BaseEntity return deviceName; } - public String getStakeMarkId() { - return stakeMarkId; + public String getStakeMark() { + return stakeMark; } - public void setStakeMarkId(String stakeMarkId) { - this.stakeMarkId = stakeMarkId; + public void setStakeMark(String stakeMark) { + this.stakeMark = stakeMark; } public String getDirection() { diff --git a/zc-business/src/main/java/com/zc/business/domain/DcDevice.java b/zc-business/src/main/java/com/zc/business/domain/DcDevice.java index 8b036887..3843bfed 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcDevice.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcDevice.java @@ -22,7 +22,7 @@ public class DcDevice { @ApiModelProperty("产品ID") private Long productId; @ApiModelProperty("桩号") - private String stakeMarkId; + private String stakeMark; @ApiModelProperty("方向1-上行(菏泽方向),2-中,3-下行(济南方向)") private String direction; @ApiModelProperty("设备名称") diff --git a/zc-business/src/main/java/com/zc/business/domain/DcEvent.java b/zc-business/src/main/java/com/zc/business/domain/DcEvent.java index 111e8c88..292ed873 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcEvent.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcEvent.java @@ -1,6 +1,7 @@ package com.zc.business.domain; import java.util.Date; +import java.util.List; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; @@ -188,6 +189,31 @@ public class DcEvent extends BaseEntity { @ApiModelProperty("高速公路") private Long roadId; + /** + * 2024-1-24新增 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("发生时间") + private Date occurrenceTime; + @ApiModelProperty("是否是感知事件 0 表示 false，1 表示 true") + private Integer isPerceived; + @ApiModelProperty("影响车道") + private Long lang; + @ApiModelProperty("高速名") + @TableField(exist = false) + private String roadName; + @ApiModelProperty("机构") + @TableField(exist = false) + private String organizationName; + @ApiModelProperty("事件流程") + @TableField(exist = false) + private List processConfigList; +@ApiModelProperty("事件标题") + private String eventTitle; + + /** + * + */ @ApiModelProperty("事件详情参数") @TableField(exist = false) private DcEventMap dcEventMap; diff --git a/zc-business/src/main/java/com/zc/business/domain/DcEventHistory.java b/zc-business/src/main/java/com/zc/business/domain/DcEventHistory.java index a4916fe3..19e99a8f 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcEventHistory.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcEventHistory.java @@ -28,7 +28,7 @@ public class DcEventHistory extends BaseEntity /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private String stakeMarkId; + private String stakeMark; /** 1-上 2-中 @@ -127,14 +127,14 @@ public class DcEventHistory extends BaseEntity { return groupId; } - public void setStakeMarkId(String stakeMarkId) + public void setStakeMark(String stakeMark) { - this.stakeMarkId = stakeMarkId; + this.stakeMark = stakeMark; } - public String getStakeMarkId() + public String getStakeMark() { - return stakeMarkId; + return stakeMark; } public void setDirection(String direction) { @@ -286,7 +286,7 @@ public class DcEventHistory extends BaseEntity return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("id", getId()) .append("groupId", getGroupId()) - .append("stakeMarkId", getStakeMarkId()) + .append("stakeMark", getStakeMark()) .append("direction", getDirection()) .append("roadId", getRoadId()) .append("startTime", getStartTime()) diff --git a/zc-business/src/main/java/com/zc/business/domain/DcEventMap.java b/zc-business/src/main/java/com/zc/business/domain/DcEventMap.java index 58cebd89..66875dbf 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcEventMap.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcEventMap.java @@ -48,7 +48,7 @@ public class DcEventMap { @ApiModelProperty("机构地址") private String organizationAddress; @ApiModelProperty("机构所在桩号") - private String dcOrganizationStakeMarkId; + private String dcOrganizationStakeMark; @ApiModelProperty("车牌号") private String vehiclePlate; @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 f36a1f74..f667ebe2 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 @@ -32,7 +32,12 @@ public class DcEventTrafficCongestion extends BaseEntity /** 拥堵里程(公里) */ @ApiModelProperty("拥堵里程(公里)") - private Long congestionMileage; + private Float congestionMileage; + + /** 最大拥堵里程(公里) */ + @ApiModelProperty("最大拥堵里程(公里)") + private Float maxCongestionMileage; + /** 拥堵原因： 1-车流量大 @@ -70,11 +75,14 @@ public class DcEventTrafficCongestion extends BaseEntity @ApiModelProperty("地点（收费站）：1-入口 2-出口 3-入口内广场 4--出口内广场5-外广场6-入口车道7-出口车道8-入口匝道9-出口匝道 ") private Long location; + @ApiModelProperty("事件信息实体") //事件信息表 @TableField(exist = false) private DcEvent dcEvent; + + @ApiModelProperty("路网设施实体") //事件信息表 @TableField(exist = false) diff --git a/zc-business/src/main/java/com/zc/business/domain/DcFacility.java b/zc-business/src/main/java/com/zc/business/domain/DcFacility.java index 11f3e6eb..616f2d2f 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcFacility.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcFacility.java @@ -18,7 +18,7 @@ public class DcFacility { @ApiModelProperty("ID") private Long id; @ApiModelProperty("桩号") - private String stakeMarkId; + private String stakeMark; @ApiModelProperty("方向") private String direction; @ApiModelProperty("道路标识") diff --git a/zc-business/src/main/java/com/zc/business/domain/DcOrganization.java b/zc-business/src/main/java/com/zc/business/domain/DcOrganization.java index a6e9ce80..f396054a 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcOrganization.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcOrganization.java @@ -39,7 +39,7 @@ public class DcOrganization extends TreeEntity /** 桩号 */ @ApiModelProperty("桩号") @Excel(name = "桩号") - private String stakeMarkId; + private String stakeMark; /** 救援单位 */ @ApiModelProperty("救援单位") @@ -119,14 +119,14 @@ public class DcOrganization extends TreeEntity { return organizationAddress; } - public void setStakeMarkId(String stakeMarkId) + public void setStakeMark(String stakeMark) { - this.stakeMarkId = stakeMarkId; + this.stakeMark = stakeMark; } - public String getStakeMarkId() + public String getStakeMark() { - return stakeMarkId; + return stakeMark; } public void setRescueUnit(String rescueUnit) { @@ -155,7 +155,7 @@ public class DcOrganization extends TreeEntity .append("organizationType", getOrganizationType()) .append("organizationName", getOrganizationName()) .append("organizationAddress", getOrganizationAddress()) - .append("stakeMarkId", getStakeMarkId()) + .append("stakeMark", getStakeMark()) .append("rescueUnit", getRescueUnit()) .append("description", getDescription()) .append("createTime", getCreateTime()) diff --git a/zc-business/src/main/java/com/zc/business/domain/DcWarning.java b/zc-business/src/main/java/com/zc/business/domain/DcWarning.java index 7204f2cb..55c1dfb6 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcWarning.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcWarning.java @@ -23,7 +23,7 @@ public class DcWarning extends BaseEntity /** 所在桩号 */ @Excel(name = "所在桩号") - private String stakeMarkId; + private String stakeMark; /** 方向： 1-上行 @@ -179,14 +179,14 @@ public class DcWarning extends BaseEntity { return id; } - public void setStakeMarkId(String stakeMarkId) + public void setStakeMark(String stakeMark) { - this.stakeMarkId = stakeMarkId; + this.stakeMark = stakeMark; } - public String getStakeMarkId() + public String getStakeMark() { - return stakeMarkId; + return stakeMark; } public void setDirection(String direction) { @@ -292,7 +292,7 @@ public class DcWarning extends BaseEntity public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("id", getId()) - .append("stakeMarkId", getStakeMarkId()) + .append("stakeMark", getStakeMark()) .append("direction", getDirection()) .append("deptId", getDeptId()) .append("warningState", getWarningState()) diff --git a/zc-business/src/main/java/com/zc/business/mapper/DcPerceivedEventsWarningMapper.java b/zc-business/src/main/java/com/zc/business/mapper/DcPerceivedEventsWarningMapper.java index ab3b42c6..915f3414 100644 --- a/zc-business/src/main/java/com/zc/business/mapper/DcPerceivedEventsWarningMapper.java +++ b/zc-business/src/main/java/com/zc/business/mapper/DcPerceivedEventsWarningMapper.java @@ -56,7 +56,7 @@ public interface DcPerceivedEventsWarningMapper { //查询某个路段下的全部桩号 List> selectSectionMark(DcWarning dcWarning); //根据桩号查询条数 - String selectSectionNumber(@Param("stakeMarkId") String markId,@Param("direction") String direction); + String selectSectionNumber(@Param("stakeMark") String markId,@Param("direction") String direction); //预警事件,事件列表 查询状态为上报的感知事件 List> selectWarningEscalation(DcWarning dcWarning); //修改感知事件信息 diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java index a0f9b336..0bc79af1 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java @@ -61,8 +61,8 @@ public class DcDeviceServiceImpl extends ServiceImpl i } // 木桩 - if (StringUtils.hasText(dcDevice.getStakeMarkId())) { - queryWrapper.eq(DcDevice::getStakeMarkId, dcDevice.getStakeMarkId()); + if (StringUtils.hasText(dcDevice.getStakeMark())) { + queryWrapper.eq(DcDevice::getStakeMark, dcDevice.getStakeMark()); } // 设备名称 @@ -281,7 +281,7 @@ public class DcDeviceServiceImpl extends ServiceImpl i public DcStakeMark exampleQueryTheAssociatedPileNumber(DcDevice dcDevice) { DcStakeMark dcStakeMark = new DcStakeMark(); dcStakeMark.setDirection(dcDevice.getDirection()); - dcStakeMark.setId(dcDevice.getStakeMarkId()); + dcStakeMark.setId(dcDevice.getStakeMark()); List dcStakeMarks = dcStakeMarkService.listStakeMark(dcStakeMark); if (dcStakeMarks.size() == 1) { return dcStakeMarks.get(0); diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java index 2928a529..2ccd91e5 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java @@ -46,6 +46,8 @@ private DcEventAbnormalWeatherMapper dcEventAbnormalWeatherMapper; @Autowired private DcEventTrafficControlMapper dcEventTrafficControlMapper; + @Autowired + private DcProcessConfigMapper dcProcessConfigMapper; @@ -59,6 +61,9 @@ private DcEventAbnormalWeatherMapper dcEventAbnormalWeatherMapper; public DcEvent selectDcEventById( String id) { DcEvent dcEvent = dcEventMapper.selectDcEventById(id); + + List processConfigList = dcProcessConfigMapper.selectDcProcessConfigByEventType(Math.toIntExact(dcEvent.getEventType())); + dcEvent.setProcessConfigList(processConfigList); return dcEvent; } diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcFacilityServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcFacilityServiceImpl.java index 1c746baf..4737cc8d 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcFacilityServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcFacilityServiceImpl.java @@ -34,8 +34,8 @@ public class DcFacilityServiceImpl extends ServiceImpl - + - select t1.id, t1.device_id, t2.device_name,t2.stake_mark_id, t2.direction,t1.release_content, t1.release_status, + select t1.id, t1.device_id, t2.device_name,t2.stake_mark, t2.direction,t1.release_content, t1.release_status, t1.release_time,t1.release_dept_name,t1.release_dept_id,t1.release_user_name,t1.release_user_id,t1.platform,release_ip from dc_board_release_log t1 left join dc_device t2 on t1.device_id = t2.iot_device_id diff --git a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml index 3e71d46c..de2898c4 100644 --- a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml @@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" iot_device_id, group_id, product_id, - stake_mark_id, + stake_mark, direction, device_name, device_code, @@ -60,17 +60,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and group_id = #{groupId} - and stake_mark_id = #{stakeMarkId} + and stake_mark = #{stakeMark} and direction = #{direction} and road_id = #{roadId} and start_time = #{startTime} @@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" id, group_id, - stake_mark_id, + stake_mark, direction, road_id, start_time, @@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id}, #{groupId}, - #{stakeMarkId}, + #{stakeMark}, #{direction}, #{roadId}, #{startTime}, @@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update dc_event_history group_id = #{groupId}, - stake_mark_id = #{stakeMarkId}, + stake_mark = #{stakeMark}, direction = #{direction}, road_id = #{roadId}, start_time = #{startTime}, diff --git a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml index 5b2a7e8c..64a9f5cf 100644 --- a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml @@ -27,6 +27,8 @@ + + @@ -53,11 +55,18 @@ + + + + + + + + –> @@ -101,7 +110,7 @@ - + @@ -112,6 +121,7 @@ +--> @@ -446,6 +467,8 @@ event_source_tips, in_tunnel, road_id, + lang, + event_title, #{id}, @@ -470,6 +493,8 @@ #{eventSourceTips}, #{inTunnel}, #{roadId}, + #{lang}, + #{eventTitle}, @@ -497,6 +522,8 @@ event_source_tips = #{eventSourceTips}, in_tunnel = #{inTunnel}, road_id = #{roadId}, + road_id = #{lang}, + event_title = #{eventTitle}, where id = #{id} diff --git a/zc-business/src/main/resources/mapper/business/DcEventServiceAreaMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventServiceAreaMapper.xml index 24ec259f..8ca2b8ab 100644 --- a/zc-business/src/main/resources/mapper/business/DcEventServiceAreaMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcEventServiceAreaMapper.xml @@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + diff --git a/zc-business/src/main/resources/mapper/business/DcEventTrafficCongestionMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventTrafficCongestionMapper.xml index 04b8d7de..ded73779 100644 --- a/zc-business/src/main/resources/mapper/business/DcEventTrafficCongestionMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcEventTrafficCongestionMapper.xml @@ -11,18 +11,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - + - select id, congestion_mileage, congestion_cause, facility_id, ramp_id, location from dc_event_traffic_congestion + select id, congestion_mileage, congestion_cause, facility_id, ramp_id, location,max_congestion_mileage from dc_event_traffic_congestion @@ -33,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dc_event_traffic_congestion.id as id, dc_event_traffic_congestion.location as location, dc_event_traffic_congestion.ramp_id as ramp_id, + dc_event_traffic_congestion.max_congestion_mileage as max_congestion_mileage, dc_facility.other_config as other_config, dc_facility.remark as remark, @@ -69,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" facility_id, ramp_id, location, + max_congestion_mileage, #{id}, @@ -77,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{facilityId}, #{rampId}, #{location}, + #{maxCongestionMileage}, @@ -88,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" facility_id = #{facilityId}, ramp_id = #{rampId}, location = #{location}, + max_congestion_mileage = #{maxCongestionMileage}, where id = #{id} diff --git a/zc-business/src/main/resources/mapper/business/DcEventTrafficControlMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventTrafficControlMapper.xml index d4751c11..a1028599 100644 --- a/zc-business/src/main/resources/mapper/business/DcEventTrafficControlMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcEventTrafficControlMapper.xml @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + diff --git a/zc-business/src/main/resources/mapper/business/DcOrganizationMapper.xml b/zc-business/src/main/resources/mapper/business/DcOrganizationMapper.xml index dc6df91e..eec53113 100644 --- a/zc-business/src/main/resources/mapper/business/DcOrganizationMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcOrganizationMapper.xml @@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id,direction, parent_id, organization_type, organization_name, - organization_address, stake_mark_id, + organization_address, stake_mark, rescue_unit, description, create_time, update_time from dc_organization @@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" organization_type, organization_name, organization_address, - stake_mark_id, + stake_mark, rescue_unit, `description`, create_time, @@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{organizationType}, #{organizationName}, #{organizationAddress}, - #{stakeMarkId}, + #{stakeMark}, #{rescueUnit}, #{description}, #{createTime}, @@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" organization_type = #{organizationType}, organization_name = #{organizationName}, organization_address = #{organizationAddress}, - stake_mark_id = #{stakeMarkId}, + stake_mark = #{stakeMark}, rescue_unit = #{rescueUnit}, description = #{description}, create_time = #{createTime}, diff --git a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml index 01e52d66..3302b343 100644 --- a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml @@ -15,14 +15,14 @@ SELECT DATE_FORMAT(warning.create_time, '%Y-%m-%d %H') AS time, COUNT(*) AS number FROM dc_warning AS warning - LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark_id=mark.stake_mark + LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.id WHERE DATE_FORMAT(warning.create_time,'%Y-%m-%d')=DATE_FORMAT(#{createTime},'%Y-%m-%d') AND warning.direction=#{direction} AND mark.`section_id`=#{sectionId} @@ -85,7 +85,7 @@ SELECT warning.warning_type warningType,COUNT(*) AS number FROM dc_warning as warning - LEFT JOIN dc_stake_mark as mark on warning.stake_mark_id=mark.stake_mark + LEFT JOIN dc_stake_mark as mark on warning.stake_mark=mark.id where DATE_FORMAT(warning.create_time,'%Y-%m') =DATE_FORMAT(#{createTime},'%Y-%m') AND warning.direction=#{direction} and mark.`section_id`=#{sectionId} @@ -150,7 +149,7 @@ warning.warning_type warningType, COUNT(*) AS number FROM dc_warning as warning - LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark_id=mark.stake_mark + LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.id WHERE YEAR(warning.create_time) =DATE_FORMAT(#{createTime},'%Y') AND warning.direction=#{direction} and mark.`section_id`=#{sectionId} @@ -161,9 +160,8 @@ SELECT warning.warning_type warningType, COUNT(*) AS number, DATE_FORMAT(warning.create_time, '%Y') as createTime FROM dc_warning as warning - LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark_id=mark.stake_mark + LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.id where mark.`section_id`=#{sectionId} AND warning.direction=#{direction} - and YEAR(warning.create_time) =DATE_FORMAT(#{createTime},'%Y') GROUP BY warningType @@ -171,49 +169,23 @@ SELECT id FROM dc_stake_mark AS mark WHERE mark.section_id=#{sectionId} - - - - update dc_warning - stake_mark_id = #{stakeMarkId}, + stake_mark = #{stakeMark}, direction = #{direction}, dept_id = #{deptId}, warning_state = #{warningState}, diff --git a/zc-business/src/main/resources/mapper/business/DcProcessConfigMapper.xml b/zc-business/src/main/resources/mapper/business/DcProcessConfigMapper.xml index 9b949a05..85d34f15 100644 --- a/zc-business/src/main/resources/mapper/business/DcProcessConfigMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcProcessConfigMapper.xml @@ -83,4 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from dc_process_config where event_type = #{eventType} + + + \ No newline at end of file diff --git a/zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml b/zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml index 11f18424..10315f58 100644 --- a/zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml @@ -23,7 +23,7 @@