Browse Source

Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
develop
zhao-meiyu 1 year ago
parent
commit
661aae109f
  1. 1
      zc-business/src/main/java/com/zc/business/controller/DcEventController.java
  2. 24
      zc-business/src/main/java/com/zc/business/controller/DeviceController.java
  3. 10
      zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java
  4. 2
      zc-business/src/main/java/com/zc/business/domain/DcDevice.java
  5. 26
      zc-business/src/main/java/com/zc/business/domain/DcEvent.java
  6. 12
      zc-business/src/main/java/com/zc/business/domain/DcEventHistory.java
  7. 2
      zc-business/src/main/java/com/zc/business/domain/DcEventMap.java
  8. 10
      zc-business/src/main/java/com/zc/business/domain/DcEventTrafficCongestion.java
  9. 2
      zc-business/src/main/java/com/zc/business/domain/DcFacility.java
  10. 12
      zc-business/src/main/java/com/zc/business/domain/DcOrganization.java
  11. 12
      zc-business/src/main/java/com/zc/business/domain/DcWarning.java
  12. 2
      zc-business/src/main/java/com/zc/business/mapper/DcPerceivedEventsWarningMapper.java
  13. 6
      zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java
  14. 5
      zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java
  15. 4
      zc-business/src/main/java/com/zc/business/service/impl/DcFacilityServiceImpl.java
  16. 4
      zc-business/src/main/resources/mapper/business/DcBoardReleaseLogMapper.xml
  17. 10
      zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml
  18. 2
      zc-business/src/main/resources/mapper/business/DcEventConstructionMapper.xml
  19. 12
      zc-business/src/main/resources/mapper/business/DcEventHistoryMapper.xml
  20. 239
      zc-business/src/main/resources/mapper/business/DcEventMapper.xml
  21. 2
      zc-business/src/main/resources/mapper/business/DcEventServiceAreaMapper.xml
  22. 9
      zc-business/src/main/resources/mapper/business/DcEventTrafficCongestionMapper.xml
  23. 2
      zc-business/src/main/resources/mapper/business/DcEventTrafficControlMapper.xml
  24. 10
      zc-business/src/main/resources/mapper/business/DcOrganizationMapper.xml
  25. 68
      zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
  26. 3
      zc-business/src/main/resources/mapper/business/DcProcessConfigMapper.xml
  27. 2
      zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml

1
zc-business/src/main/java/com/zc/business/controller/DcEventController.java

@ -57,6 +57,7 @@ public class DcEventController extends BaseController
return getDataTable(list);
}
/**调度记录-事件列表 按时间展示交通事件默认当天时间 可查询条件 交通事件状态 时间范围
*
*/

24
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<Device> list = deviceService.selectDeviceList(device);
ExcelUtil<Device> 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)
{

10
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() {

2
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("设备名称")

26
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<DcProcessConfig> processConfigList;
@ApiModelProperty("事件标题")
private String eventTitle;
/**
*
*/
@ApiModelProperty("事件详情参数")
@TableField(exist = false)
private DcEventMap dcEventMap;

12
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())

2
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("车辆类型")

10
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)

2
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("道路标识")

12
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())

12
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())

2
zc-business/src/main/java/com/zc/business/mapper/DcPerceivedEventsWarningMapper.java

@ -56,7 +56,7 @@ public interface DcPerceivedEventsWarningMapper {
//查询某个路段下的全部桩号
List<HashMap<String,Object>> selectSectionMark(DcWarning dcWarning);
//根据桩号查询条数
String selectSectionNumber(@Param("stakeMarkId") String markId,@Param("direction") String direction);
String selectSectionNumber(@Param("stakeMark") String markId,@Param("direction") String direction);
//预警事件,事件列表 查询状态为上报的感知事件
List<HashMap<String,Object>> selectWarningEscalation(DcWarning dcWarning);
//修改感知事件信息

6
zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java

@ -61,8 +61,8 @@ public class DcDeviceServiceImpl extends ServiceImpl<DcDeviceMapper, DcDevice> 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<DcDeviceMapper, DcDevice> i
public DcStakeMark exampleQueryTheAssociatedPileNumber(DcDevice dcDevice) {
DcStakeMark dcStakeMark = new DcStakeMark();
dcStakeMark.setDirection(dcDevice.getDirection());
dcStakeMark.setId(dcDevice.getStakeMarkId());
dcStakeMark.setId(dcDevice.getStakeMark());
List<DcStakeMark> dcStakeMarks = dcStakeMarkService.listStakeMark(dcStakeMark);
if (dcStakeMarks.size() == 1) {
return dcStakeMarks.get(0);

5
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<DcProcessConfig> processConfigList = dcProcessConfigMapper.selectDcProcessConfigByEventType(Math.toIntExact(dcEvent.getEventType()));
dcEvent.setProcessConfigList(processConfigList);
return dcEvent;
}

4
zc-business/src/main/java/com/zc/business/service/impl/DcFacilityServiceImpl.java

@ -34,8 +34,8 @@ public class DcFacilityServiceImpl extends ServiceImpl<DcFacilityMapper, DcFacil
}
// 木桩
if (StringUtils.hasText(dcFacility.getStakeMarkId())) {
queryWrapper.eq(DcFacility::getStakeMarkId, dcFacility.getStakeMarkId());
if (StringUtils.hasText(dcFacility.getStakeMark())) {
queryWrapper.eq(DcFacility::getStakeMark, dcFacility.getStakeMark());
}
// 方向

4
zc-business/src/main/resources/mapper/business/DcBoardReleaseLogMapper.xml

@ -17,12 +17,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="releaseUserId" column="release_user_id" />
<result property="platform" column="platform" />
<result property="releaseIp" column="release_ip" />
<result property="stakeMarkId" column="stake_mark_id" />
<result property="stakeMark" column="stake_mark" />
<result property="direction" column="direction" />
</resultMap>
<sql id="selectDcBoardReleaseLogVo">
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

10
zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml

@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="iotDeviceId" column="iot_device_id"/>
<result property="groupId" column="group_id"/>
<result property="productId" column="product_id"/>
<result property="stakeMarkId" column="stake_mark_id"/>
<result property="stakeMark" column="stake_mark"/>
<result property="direction" column="direction"/>
<result property="deviceName" column="device_name"/>
<result property="deviceCode" column="device_code"/>
@ -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"
<select id="selectDcDeviceList" parameterType="dcDevice" resultMap="DcDevice">
select t1.id, t1.iot_device_id, t1.group_id, t1.product_id, t1.stake_mark_id, t1.direction, t1.device_name, t1.device_code, t1.device_type,
select t1.id, t1.iot_device_id, t1.group_id, t1.product_id, t1.stake_mark, t1.direction, t1.device_name, t1.device_code, t1.device_type,
t1.installation_Date,t1.production_date,t1.durable_years,t1.installation_site,t1.use_state,t1.device_state,t1.other_config,t1.remark,t1.create_time,t1.update_time,
t2.longitude,t2.latitude
from dc_device t1
left join dc_stake_mark t2 on t1.stake_mark_id = t2.id and t1.direction = t2.direction
left join dc_stake_mark t2 on t1.stake_mark = t2.id and t1.direction = t2.direction
<where>
<if test="id != null and id != ''">and t1.id = #{id}</if>
<if test="iotDeviceId != null and iotDeviceId != ''">and t1.iot_device_id = #{iotDeviceId}</if>
<if test="groupId != null and groupId != ''">and t1.group_id = #{groupId}</if>
<if test="productId != null and productId != ''">and t1.product_id = #{productId}</if>
<if test="stakeMarkId != null and stakeMarkId != ''">and t1.stake_mark_id = #{stakeMarkId}</if>
<if test="stakeMark != null and stakeMark != ''">and t1.stake_mark = #{stakeMark}</if>
<if test="direction != null and direction != ''">and t1.direction = #{direction}</if>
<if test="deviceName != null and deviceName != ''">and t1.device_name like concat('%', #{deviceName}, '%')</if>
<if test="deviceCode != null and deviceCode != ''">and t1.device_code = #{deviceCode}</if>

2
zc-business/src/main/resources/mapper/business/DcEventConstructionMapper.xml

@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="dcFacility.facilityName" column="facility_name" />
<result property="dcFacility.facilityType" column="facility_type" />
<result property="dcFacility.direction" column="direction" />
<result property="dcFacility.stakeMarkId" column="stake_mark" />
<result property="dcFacility.stakeMark" column="stake_mark" />
<result property="dcFacility.remark" column="remark" />
<result property="dcFacility.otherConfig" column="other_config" />
</resultMap>

12
zc-business/src/main/resources/mapper/business/DcEventHistoryMapper.xml

@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="com.zc.business.domain.DcEventHistory" id="DcEventHistoryResult">
<result property="id" column="id" />
<result property="groupId" column="group_id" />
<result property="stakeMarkId" column="stake_mark_id" />
<result property="stakeMark" column="stake_mark" />
<result property="direction" column="direction" />
<result property="roadId" column="road_id" />
<result property="startTime" column="start_time" />
@ -30,14 +30,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectDcEventHistoryVo">
select id, group_id, stake_mark_id, direction, road_id, start_time, end_time, event_level, event_category, event_type, event_subclass, event_cause, impact_level, description, handling_person, handling_result, other_config, event_source, event_nature, remark, create_time, update_time from dc_event_history
select id, group_id, stake_mark, direction, road_id, start_time, end_time, event_level, event_category, event_type, event_subclass, event_cause, impact_level, description, handling_person, handling_result, other_config, event_source, event_nature, remark, create_time, update_time from dc_event_history
</sql>
<select id="selectDcEventHistoryList" parameterType="DcEventHistory" resultMap="DcEventHistoryResult">
<include refid="selectDcEventHistoryVo"/>
<where>
<if test="groupId != null "> and group_id = #{groupId}</if>
<if test="stakeMarkId != null and stakeMarkId != ''"> and stake_mark_id = #{stakeMarkId}</if>
<if test="stakeMark != null and stakeMark != ''"> and stake_mark = #{stakeMark}</if>
<if test="direction != null and direction != ''"> and direction = #{direction}</if>
<if test="roadId != null "> and road_id = #{roadId}</if>
<if test="startTime != null "> and start_time = #{startTime}</if>
@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="groupId != null">group_id,</if>
<if test="stakeMarkId != null and stakeMarkId != ''">stake_mark_id,</if>
<if test="stakeMark != null and stakeMark != ''">stake_mark,</if>
<if test="direction != null and direction != ''">direction,</if>
<if test="roadId != null">road_id,</if>
<if test="startTime != null">start_time,</if>
@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="groupId != null">#{groupId},</if>
<if test="stakeMarkId != null and stakeMarkId != ''">#{stakeMarkId},</if>
<if test="stakeMark != null and stakeMark != ''">#{stakeMark},</if>
<if test="direction != null and direction != ''">#{direction},</if>
<if test="roadId != null">#{roadId},</if>
<if test="startTime != null">#{startTime},</if>
@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update dc_event_history
<trim prefix="SET" suffixOverrides=",">
<if test="groupId != null">group_id = #{groupId},</if>
<if test="stakeMarkId != null and stakeMarkId != ''">stake_mark_id = #{stakeMarkId},</if>
<if test="stakeMark != null and stakeMark != ''">stake_mark = #{stakeMark},</if>
<if test="direction != null and direction != ''">direction = #{direction},</if>
<if test="roadId != null">road_id = #{roadId},</if>
<if test="startTime != null">start_time = #{startTime},</if>

239
zc-business/src/main/resources/mapper/business/DcEventMapper.xml

@ -27,6 +27,8 @@
<result property="stringEventType" column="stringEventType" />
<result property="stringEventSource" column="stringEventSource" />
<result property="roadId" column="road_id" />
<result property="lang" column="lang" />
<result property="eventTitle" column="event_title" />
</resultMap>
<resultMap type="com.zc.business.domain.DcEvent" id="DcEventResultById">
<result property="id" column="id" />
@ -53,11 +55,18 @@
<result property="eventName" column="event_name" />
<result property="nodeNode" column="node_node" />
<result property="roadId" column="road_id" />
<result property="eventTitle" column="event_title" />
<result property="commonPhrases" column="common_phrases" />
<result property="stringEventType" column="stringEventType" />
<result property="stringEventSource" column="stringEventSource" />
<result property="lang" column="lang" />
<result property="roadName" column="road_name" />
<result property="organizationName" column="organization_name" />
</resultMap>
<!--
<resultMap type="com.zc.business.domain.DcEvent" id="DcEventResultListAll">
<result property="id" column="id" />
<result property="deptId" column="dept_id" />
@ -82,9 +91,9 @@
<result property="inTunnel" column="in_tunnel" />
<result property="stringEventType" column="stringEventType" />
<result property="stringEventSource" column="stringEventSource" />
<!-- <result property="dcProcessConfig.processNode" column="process_node" />
&lt;!&ndash; <result property="dcProcessConfig.processNode" column="process_node" />
<result property="dcProcessConfig.commonPhrases" column="common_phrases" />
<result property="dcProcessConfig.nodeNode" column="node_node" /> -->
<result property="dcProcessConfig.nodeNode" column="node_node" /> &ndash;&gt;
<result property="dcEventMap.processNode" column="process_node"/>
<result property="dcEventMap.commonPhrases" column="common_phrases"/>
<result property="dcEventMap.nodeNode" column="node_node"/>
@ -101,7 +110,7 @@
<result property="dcEventMap.organizationType" column="organization_type"/>
<result property="dcEventMap.organizationName" column="organization_name"/>
<result property="dcEventMap.organizationAddress" column="organization_address"/>
<result property="dcEventMap.dcOrganizationStakeMarkId" column="dc_organization_stake_mark_id"/>
<result property="dcEventMap.dcOrganizationStakeMark" column="dc_organization_stake_mark"/>
<result property="dcEventMap.dcOrganizationDescription" column="dc_organization_description"/>
<result property="dcEventMap.vehiclePlate" column="vehicle_plate"/>
<result property="dcEventMap.vehicleType" column="vehicle_type"/>
@ -112,6 +121,7 @@
<result property="dcEventMap.contactNumber" column="contact_number"/>
</resultMap>
-->
<!-- <sql id="selectDcEventVo">
select id, dept_id, stake_mark, direction, user_id, start_time, end_time, estimated_end_time, event_level, event_type, event_subclass, event_cause, description, event_state, event_source, event_nature, remark, create_time, update_time, event_source_tips, in_tunnel from dc_event
@ -128,6 +138,7 @@
estimated_end_time,
event_level,
event_type,
event_title,
CASE event_type
WHEN '1' THEN '交通事故'
WHEN '2' THEN '车辆故障'
@ -240,6 +251,7 @@
dc_event.event_source_tips,
dc_event.in_tunnel,
dc_event.road_id,
dc_event.event_title,
dc_event_type.event_name AS event_name,
dc_process_config.node_node AS node_node,
@ -258,7 +270,7 @@
dc_organization.organization_type,
dc_organization.organization_name,
dc_organization.organization_address,
dc_organization.stake_mark_id AS dc_organization_stake_mark_id,
dc_organization.stake_mark AS dc_organization_stake_mark,
dc_organization.rescue_unit,
dc_organization.description AS dc_organization_description,
dc_vehicles.vehicle_plate,
@ -313,111 +325,120 @@
<!-- 事件详情 包含事件类型 节点-->
<select id="selectDcEventById" parameterType="String" resultMap="DcEventResultById">
/*详情可以调用事件处理流程*/
SELECT dc_event.id AS id,
dc_event.stake_mark,
dc_event.direction,
dc_event.user_id,
dc_event.start_time,
dc_event.end_time,
dc_event.estimated_end_time,
dc_event.event_level,
dc_event.event_type AS event_type,
CASE dc_event.event_type
WHEN '1' THEN '交通事故'
WHEN '2' THEN '车辆故障'
WHEN '3' THEN '交通管制'
WHEN '4' THEN '交通拥堵'
WHEN '5' THEN '非法上路'
WHEN '6' THEN '路障清除'
WHEN '7' THEN '施工建设'
WHEN '8' THEN '服务区异常'
WHEN '9' THEN '设施设备隐患'
WHEN '10' THEN '异常天气'
WHEN '11' THEN '其他事件'
ELSE '其他'
END AS stringEventType,
CASE dc_event.event_subclass
WHEN '1-1'THEN '追尾'
WHEN '1-2'THEN '侧翻'
WHEN '1-3'THEN '撞护栏'
WHEN '1-4'THEN '自然'
WHEN '1-5'THEN '其他事故'
WHEN '2-1'THEN '车辆故障'
WHEN '3-1'THEN '主线封闭和限行'
WHEN '3-2'THEN '收费站封闭和限行'
WHEN '3-3'THEN '立交封闭和限行'
WHEN '3-4'THEN '服务区封闭和限行'
WHEN '4-1'THEN '道路拥堵'
WHEN '4-2'THEN '立交拥堵'
WHEN '4-3'THEN '收费站拥堵'
WHEN '4-4'THEN '服务区拥堵'
WHEN '5-1'THEN '行人'
WHEN '5-2'THEN '非机动车'
WHEN '5-3'THEN '摩托车'
WHEN '5-4'THEN '其他'
WHEN '6-1'THEN '烟雾'
WHEN '6-2'THEN '倒伏树木'
WHEN '6-3'THEN '撒落物'
WHEN '6-4'THEN '动物'
WHEN '6-5'THEN '其他'
WHEN '7-1'THEN '道路养护施工'
WHEN '7-2'THEN '收费站养护施工'
WHEN '7-3'THEN '服务区养护施工'
WHEN '7-4'THEN '枢纽立交匝道养护施工'
WHEN '7-5'THEN '地方道路养护施工'
WHEN '7-6'THEN '道路工程建设施工'
WHEN '7-7'THEN '收费站工程建设施工'
WHEN '7-8'THEN '服务区工程建设施工'
WHEN '7-9' THEN '枢纽立交匝道工程建设施工'
WHEN '7-10' THEN'地方道路工程建设施工'
WHEN '8-1'THEN'封闭、暂停营业'
WHEN '8-2'THEN'重要设施停用'
WHEN '8-3'THEN'服务区其他异常'
WHEN '9-1'THEN'摄像机'
WHEN '9-2'THEN'护栏'
WHEN '9-3'THEN'隔离栅'
WHEN '9-4'THEN'情报板'
WHEN '9-5'THEN'防炫板'
WHEN '9-6'THEN'其他'
WHEN '10-1' THEN'雨'
WHEN '10-2' THEN'雪'
WHEN '10-3' THEN'雾'
WHEN '10-4' THEN'大风'
WHEN '10-5' THEN'低温寒潮'
WHEN '10-6' THEN'路面积雪'
WHEN '10-7' THEN'路面结冰'
WHEN '10-8' THEN'路面积水'
WHEN '10-9' THEN'其他'
WHEN '11-1' THEN'其他事件'
END AS event_subclass,
/*详情可以调用事件处理流程*/
SELECT dc_event.id AS id,
dc_event.stake_mark,
dc_event.direction,
dc_event.user_id,
dc_event.start_time,
dc_event.end_time,
dc_event.estimated_end_time,
dc_event.event_level,
dc_event.event_title,
dc_event.event_type AS event_type,
CASE dc_event.event_type
WHEN '1' THEN '交通事故'
WHEN '2' THEN '车辆故障'
WHEN '3' THEN '交通管制'
WHEN '4' THEN '交通拥堵'
WHEN '5' THEN '非法上路'
WHEN '6' THEN '路障清除'
WHEN '7' THEN '施工建设'
WHEN '8' THEN '服务区异常'
WHEN '9' THEN '设施设备隐患'
WHEN '10' THEN '异常天气'
WHEN '11' THEN '其他事件'
ELSE '其他'
END AS stringEventType,
CASE dc_event.event_subclass
WHEN '1-1'THEN '追尾'
WHEN '1-2'THEN '侧翻'
WHEN '1-3'THEN '撞护栏'
WHEN '1-4'THEN '自然'
WHEN '1-5'THEN '其他事故'
WHEN '2-1'THEN '车辆故障'
WHEN '3-1'THEN '主线封闭和限行'
WHEN '3-2'THEN '收费站封闭和限行'
WHEN '3-3'THEN '立交封闭和限行'
WHEN '3-4'THEN '服务区封闭和限行'
WHEN '4-1'THEN '道路拥堵'
WHEN '4-2'THEN '立交拥堵'
WHEN '4-3'THEN '收费站拥堵'
WHEN '4-4'THEN '服务区拥堵'
WHEN '5-1'THEN '行人'
WHEN '5-2'THEN '非机动车'
WHEN '5-3'THEN '摩托车'
WHEN '5-4'THEN '其他'
WHEN '6-1'THEN '烟雾'
WHEN '6-2'THEN '倒伏树木'
WHEN '6-3'THEN '撒落物'
WHEN '6-4'THEN '动物'
WHEN '6-5'THEN '其他'
WHEN '7-1'THEN '道路养护施工'
WHEN '7-2'THEN '收费站养护施工'
WHEN '7-3'THEN '服务区养护施工'
WHEN '7-4'THEN '枢纽立交匝道养护施工'
WHEN '7-5'THEN '地方道路养护施工'
WHEN '7-6'THEN '道路工程建设施工'
WHEN '7-7'THEN '收费站工程建设施工'
WHEN '7-8'THEN '服务区工程建设施工'
WHEN '7-9' THEN '枢纽立交匝道工程建设施工'
WHEN '7-10' THEN'地方道路工程建设施工'
WHEN '8-1'THEN'封闭、暂停营业'
WHEN '8-2'THEN'重要设施停用'
WHEN '8-3'THEN'服务区其他异常'
WHEN '9-1'THEN'摄像机'
WHEN '9-2'THEN'护栏'
WHEN '9-3'THEN'隔离栅'
WHEN '9-4'THEN'情报板'
WHEN '9-5'THEN'防炫板'
WHEN '9-6'THEN'其他'
WHEN '10-1' THEN'雨'
WHEN '10-2' THEN'雪'
WHEN '10-3' THEN'雾'
WHEN '10-4' THEN'大风'
WHEN '10-5' THEN'低温寒潮'
WHEN '10-6' THEN'路面积雪'
WHEN '10-7' THEN'路面结冰'
WHEN '10-8' THEN'路面积水'
WHEN '10-9' THEN'其他'
WHEN '11-1' THEN'其他事件'
END AS event_subclass,
dc_event.event_cause,
dc_event.description,
dc_event.event_state,
CASE dc_event.event_source
WHEN '1' THEN '96659'
WHEN '2' THEN '交警转接'
WHEN '3' THEN '道路巡查'
WHEN '4' THEN '视频巡查'
WHEN '5' THEN '视频AI'
WHEN '6' THEN '一键救援'
ELSE '其他'
END AS stringEventSource,
dc_event.event_nature,
dc_event.remark,
dc_event.create_time,
dc_event.update_time,
dc_event.event_source_tips,
dc_event.in_tunnel,
dc_event_type.event_name AS event_name,
dc_process_config.node_node AS node_node,
dc_process_config.common_phrases as common_phrases
FROM dc_event
LEFT JOIN dc_process_config on dc_process_config.event_type = dc_event.event_type
LEFT JOIN dc_event_type ON dc_event_type.event_type = dc_process_config.event_type
dc_event.event_cause,
dc_event.description,
dc_event.event_state,
CASE dc_event.event_source
WHEN '1' THEN '96659'
WHEN '2' THEN '交警转接'
WHEN '3' THEN '道路巡查'
WHEN '4' THEN '视频巡查'
WHEN '5' THEN '视频AI'
WHEN '6' THEN '一键救援'
ELSE '其他'
END AS stringEventSource,
dc_event.event_nature,
dc_event.remark,
dc_event.create_time,
dc_event.update_time,
dc_event.event_source_tips,
dc_event.in_tunnel,
dc_event.lang as lang,
dc_event_type.event_name AS event_name,
dc_organization.organization_name as organization_name,
dc_road.road_name as road_name
FROM dc_event
LEFT JOIN dc_event_type ON dc_event_type.event_type = dc_event.event_type
LEFT JOIN dc_stake_mark on dc_stake_mark.stake_mark = dc_event.stake_mark and dc_stake_mark.direction = dc_event.description
LEFT JOIN dc_road_section on dc_stake_mark.section_id = dc_road_section.id
LEFT JOIN dc_road on dc_road_section.road_id = dc_road.id
-- &#45;&#45; 关联机构表
LEFT JOIN dc_organization ON dc_stake_mark.stake_mark = dc_organization.stake_mark
where dc_event.id = #{id}
</select>
@ -446,6 +467,8 @@
<if test="eventSourceTips != null">event_source_tips,</if>
<if test="inTunnel != null">in_tunnel,</if>
<if test="roadId != null">road_id,</if>
<if test="lang != null">lang,</if>
<if test="eventTitle != null">event_title,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@ -470,6 +493,8 @@
<if test="eventSourceTips != null">#{eventSourceTips},</if>
<if test="inTunnel != null">#{inTunnel},</if>
<if test="roadId != null">#{roadId},</if>
<if test="lang != null">#{lang},</if>
<if test="eventTitle != null">#{eventTitle},</if>
</trim>
</insert>
@ -497,6 +522,8 @@
<if test="eventSourceTips != null">event_source_tips = #{eventSourceTips},</if>
<if test="inTunnel != null">in_tunnel = #{inTunnel},</if>
<if test="roadId != null">road_id = #{roadId},</if>
<if test="lang != null">road_id = #{lang},</if>
<if test="eventTitle != null">event_title = #{eventTitle},</if>
</trim>
where id = #{id}
</update>

2
zc-business/src/main/resources/mapper/business/DcEventServiceAreaMapper.xml

@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="dcFacility.facilityName" column="facility_name" />
<result property="dcFacility.facilityType" column="facility_type" />
<result property="dcFacility.direction" column="direction" />
<result property="dcFacility.stakeMarkId" column="stake_mark" />
<result property="dcFacility.stakeMark" column="stake_mark" />
<result property="dcFacility.remark" column="remark" />
<result property="dcFacility.otherConfig" column="other_config" />
</resultMap>

9
zc-business/src/main/resources/mapper/business/DcEventTrafficCongestionMapper.xml

@ -11,18 +11,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="facilityId" column="facility_id" />
<result property="rampId" column="ramp_id" />
<result property="location" column="location" />
<result property="maxCongestionMileage" column="max_congestion_mileage" />
<result property="dcFacility.facilityName" column="facility_name" />
<result property="dcFacility.facilityType" column="facility_type" />
<result property="dcFacility.direction" column="direction" />
<result property="dcFacility.stakeMarkId" column="stake_mark" />
<result property="dcFacility.stakeMark" column="stake_mark" />
<result property="dcFacility.remark" column="remark" />
<result property="dcFacility.otherConfig" column="other_config" />
</resultMap>
<sql id="selectDcEventTrafficCongestionVo">
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
</sql>
<!-- -->
<sql id="selectDcEventTrafficCongestionVoById">
@ -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"
<if test="facilityId != null">facility_id,</if>
<if test="rampId != null">ramp_id,</if>
<if test="location != null">location,</if>
<if test="maxCongestionMileage != null">max_congestion_mileage,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@ -77,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="facilityId != null">#{facilityId},</if>
<if test="rampId != null">#{rampId},</if>
<if test="location != null">#{location},</if>
<if test="maxCongestionMileage != null">#{maxCongestionMileage},</if>
</trim>
</insert>
@ -88,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="facilityId != null">facility_id = #{facilityId},</if>
<if test="rampId != null">ramp_id = #{rampId},</if>
<if test="location != null">location = #{location},</if>
<if test="maxCongestionMileage != null">max_congestion_mileage = #{maxCongestionMileage},</if>
</trim>
where id = #{id}
</update>

2
zc-business/src/main/resources/mapper/business/DcEventTrafficControlMapper.xml

@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="dcFacility.facilityName" column="facility_name" />
<result property="dcFacility.facilityType" column="facility_type" />
<result property="dcFacility.direction" column="direction" />
<result property="dcFacility.stakeMarkId" column="stake_mark" />
<result property="dcFacility.stakeMark" column="stake_mark" />
<result property="dcFacility.remark" column="remark" />
<result property="dcFacility.otherConfig" column="other_config" />

10
zc-business/src/main/resources/mapper/business/DcOrganizationMapper.xml

@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="organizationType" column="organization_type" />
<result property="organizationName" column="organization_name" />
<result property="organizationAddress" column="organization_address" />
<result property="stakeMarkId" column="stake_mark_id" />
<result property="stakeMark" column="stake_mark" />
<result property="rescueUnit" column="rescue_unit" />
<result property="description" column="description" />
<result property="createTime" column="create_time" />
@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectDcOrganizationVo">
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
</sql>
@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="organizationType != null">organization_type,</if>
<if test="organizationName != null and organizationName != ''">organization_name,</if>
<if test="organizationAddress != null">organization_address,</if>
<if test="stakeMarkId != null">stake_mark_id,</if>
<if test="stakeMark != null">stake_mark,</if>
<if test="rescueUnit != null">rescue_unit,</if>
<if test="description != null">`description`,</if>
<if test="createTime != null">create_time,</if>
@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="organizationType != null">#{organizationType},</if>
<if test="organizationName != null and organizationName != ''">#{organizationName},</if>
<if test="organizationAddress != null">#{organizationAddress},</if>
<if test="stakeMarkId != null">#{stakeMarkId},</if>
<if test="stakeMark != null">#{stakeMark},</if>
<if test="rescueUnit != null">#{rescueUnit},</if>
<if test="description != null">#{description},</if>
<if test="createTime != null">#{createTime},</if>
@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="organizationType != null">organization_type = #{organizationType},</if>
<if test="organizationName != null and organizationName != ''">organization_name = #{organizationName},</if>
<if test="organizationAddress != null">organization_address = #{organizationAddress},</if>
<if test="stakeMarkId != null">stake_mark_id = #{stakeMarkId},</if>
<if test="stakeMark != null">stake_mark = #{stakeMark},</if>
<if test="rescueUnit != null">rescue_unit = #{rescueUnit},</if>
<if test="description != null">description = #{description},</if>
<if test="createTime != null">create_time = #{createTime},</if>

68
zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml

@ -15,14 +15,14 @@
</select>
<select id="selectPerceivedEventsList" resultType="com.zc.business.domain.DcWarning">
SELECT warning.`id`,warning.`stake_mark_id`, warning.`direction`,
SELECT warning.`id`,warning.`stake_mark`, warning.`direction`,
mark.longitude,mark.latitude,warning.lane,
warning.`dept_id`,warning.`warning_state`,warning.`warning_time`,
warning.`user_id`, warning.`warning_source`,warning.`warning_level`,
warning.`remark`, warning.`create_time`,warning.`update_time`,
warning.`warning_type`,warning.`warning_subclass`,warning.`warning_title`,
warning.`other_config` FROM dc_warning AS warning
LEFT JOIN dc_stake_mark AS mark ON mark.stake_mark=warning.stake_mark_id
LEFT JOIN dc_stake_mark AS mark ON mark.id=warning.stake_mark
<where>
<if test="warningType != null and warningType != ''"> and warning_type = #{warningType}</if>
<if test="warningSubclass != null and warningSubclass != ''"> and warning_subclass = #{warningSubclass}</if>
@ -30,7 +30,7 @@
</select>
<select id="selectSectionPerceivedEventsList" resultType="hashmap">
SELECT COUNT(1) as number,section.section_name sectionName 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
LEFT JOIN dc_road_section AS section ON mark.section_id=section.id
where DATE_FORMAT(warning.create_time,'%Y-%m-%d')=DATE_FORMAT(#{createTime},'%Y-%m-%d')
group by section.section_name
@ -38,7 +38,7 @@
</select>
<select id="selectSectionPerceivedNumber" resultType="java.util.HashMap">
SELECT COUNT(1) as number,section.section_name sectionName 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
LEFT JOIN dc_road_section AS section ON mark.section_id=section.id
where DATE_FORMAT(warning.create_time,'%Y-%m-%d')=DATE_FORMAT(#{createTime},'%Y-%m-%d')
group by section.section_name
@ -76,7 +76,7 @@
<select id="selectWarningTrendDay" resultType="java.util.HashMap">
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 id="selectWarningTrendMonth" resultType="java.util.HashMap">
SELECT DATE(warning.create_time) AS DAY, 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}
@ -103,7 +103,7 @@
MONTH(warning.create_time) AS MONTH,
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}
@ -112,17 +112,16 @@
</select>
<select id="selectWarningTrendYear" resultType="java.util.HashMap">
SELECT DATE_FORMAT(warning.create_time,'%Y-%m') AS YEAR, COUNT(*) AS number
SELECT YEAR(warning.create_time) AS YEAR, 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 mark.`section_id`=#{sectionId} AND warning.direction=#{direction}
and YEAR(warning.create_time) =DATE_FORMAT(#{createTime},'%Y')
GROUP BY YEAR
</select>
<select id="selectWarningSectionTypeDay" resultType="java.util.HashMap">
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-%d')=DATE_FORMAT(#{createTime},'%Y-%m-%d')
AND warning.direction=#{direction}
and mark.`section_id`=#{sectionId}
@ -132,7 +131,7 @@
<select id="selectWarningSectionTypeMonth" resultType="java.util.HashMap">
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
</select>
@ -171,49 +169,23 @@
SELECT id FROM dc_stake_mark AS mark WHERE mark.section_id=#{sectionId}
</select>
<select id="selectSectionNumber" resultType="java.lang.String">
select count(1) from dc_warning where stake_mark_id=#{stakeMarkId} AND direction=#{direction}
select count(1) from dc_warning where stake_mark=#{stakeMark} AND warning.direction=#{direction}
</select>
<select id="selectWarningEscalation" resultType="java.util.HashMap">
select ifnull(org.organization_name,"")organizationName, ifnull(warning.warning_type,"")warningType,
ifnull(warning.warning_subclass,"")warningSubclass,ifnull(warning_title,"")warningTitle,
ifnull(warning.warning_state,"")warningState,ifnull(warning.warning_source,"")warningSource,
ifnull(DATE_FORMAT(warning.create_time,'%Y-%m-%d %H:%m:%s'),"") createTime from dc_warning as warning
LEFT JOIN dc_stake_mark as mark on warning.stake_mark_id=mark.stake_mark
LEFT JOIN dc_organization as org on mark.stake_mark=org.stake_mark_id AND mark.direction=org.direction
select org.organization_name,warning.warning_type,warning.warning_subclass,
warning_title,warning.warning_state,warning.
warning_source,DATE_FORMAT(warning.create_time,'%Y-%m-%d %H:%m:%s') createTime from dc_warning as warning
LEFT JOIN dc_stake_mark as mark on warning.stake_mark=mark.id
LEFT JOIN dc_organization as org on mark.id=org.stake_mark AND mark.direction=org.direction
<where>
<if test="warningState != null and warningState != ''"> and warning.warning_state = #{warningState}</if>
</where>
</select>
<select id="selectWarningMarkDay" resultType="java.lang.String">
select count(1) from dc_warning where stake_mark_id=#{stakeMarkId}
AND direction=#{direction} and DATE(create_time)=DATE_FORMAT(#{createTime},'%Y-%m-%d')
</select>
<select id="selectWarningMarkMonth" resultType="java.lang.String">
select count(1) from dc_warning where stake_mark_id=#{stakeMarkId}
AND direction=#{direction} and DATE_FORMAT(create_time,'%Y-%m') =DATE_FORMAT(#{createTime},'%Y-%m')
</select>
<select id="selectWarningMarkYear" resultType="java.lang.String">
select count(1) from dc_warning where stake_mark_id=#{stakeMarkId}
AND direction=#{direction} and YEAR(create_time) =DATE_FORMAT(#{createTime},'%Y')
</select>
<select id="selectWarningMarkQuarter" resultType="hashmap">
select count(1) number,stake_mark_id stakeMarkId,
CASE
WHEN MONTH(create_time) BETWEEN 1 AND 3 THEN '第一季度'
WHEN MONTH(create_time) BETWEEN 4 AND 6 THEN '第二季度'
WHEN MONTH(create_time) BETWEEN 7 AND 9 THEN '第三季度'
ELSE '第四季度'
END AS QUARTER
from dc_warning where stake_mark_id=#{stakeMarkId}
AND direction=#{direction}
GROUP BY QUARTER
ORDER BY QUARTER;
</select>
<update id="updateWarning">
update dc_warning
<trim prefix="SET" suffixOverrides=",">
<if test="stakeMarkId != null and stakeMarkId != ''">stake_mark_id = #{stakeMarkId},</if>
<if test="stakeMark != null and stakeMark != ''">stake_mark = #{stakeMark},</if>
<if test="direction != null">direction = #{direction},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
<if test="warningState != null">warning_state = #{warningState},</if>

3
zc-business/src/main/resources/mapper/business/DcProcessConfigMapper.xml

@ -83,4 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<delete id="deleteDcProcessConfigByEventType" parameterType="Integer">
delete from dc_process_config where event_type = #{eventType}
</delete>
</mapper>

2
zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml

@ -23,7 +23,7 @@
<select id="getEventListByType" resultType="java.util.Map" parameterType="String">
select t1.id,t1.stake_mark stakeMark,t1.direction, t2.longitude,t2.latitude
from dc_event t1 left join dc_stake_mark t2 on t1.stake_mark = t2.id and t1.direction = t2.direction
from dc_event t1 left join dc_stake_mark t2 on t1.stake_mark = t2.stake_mark and t1.direction = t2.direction
where t1.event_type = #{eventType} and t1.event_state != '2'
</select>

Loading…
Cancel
Save