mengff
/
jihe-dc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

视频复核，雷达事件

develop
王兴琳 4 months ago
parent
195bb64bba
commit
faaeaa4513
4 changed files with 107 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      ruoyi-ui/src/views/videoReview/index.vue
  2. 4
      zc-business/src/main/java/com/zc/business/enums/WarningSubclassEnum.java
  3. 81
      zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java
  4. 16
      zc-business/src/main/resources/mapper/business/DcWarningMapper.xml

33
ruoyi-ui/src/views/videoReview/index.vue
View File

@ -228,6 +228,11 @@
{{ getAuditResultDescription(scope.row.auditFlag) }}
</template>
</el-table-column>
<el-table-column align="center" label="发生时间" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.warningTime) }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="复核时间" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.auditTime) }}</span>
@ -292,7 +297,7 @@
</div>
<div class="detail-item">
<span class="label">发生时间:</span>
<span class="value">{{ parseTime(currentEvent.createTime) }}</span>
<span class="value">{{ parseTime(currentEvent.warningTime) }}</span>
</div>
<div class="detail-item">
<span class="label">预计结束时间:</span>
@ -878,15 +883,33 @@ export default {
yAxis: {type: 'value'},
series: [
{
name: '正确数', data: this.chartData.bar.auditFlag1Data.map(item => item.value), type: 'bar', itemStyle: {
name: '正确数', data: this.chartData.bar.auditFlag1Data.map(item => item.value), type: 'bar',
itemStyle: {
color: '#05f578' // 设置错误数的颜色为红色
},
label: {
show: true, // 显示标签
position: 'top', // 设置标签位置为顶部
formatter: '{c}', // 显示实际数值，{c}代表数值
color: '#000', // 标签文字颜色
fontSize: 12 // 文字大小
}
}, // 移除了 stack
},
{
name: '错误数', data: this.chartData.bar.auditFlag2Data.map(item => item.value), type: 'bar', itemStyle: {
name: '错误数',
data: this.chartData.bar.auditFlag2Data.map(item => item.value),
type: 'bar',
itemStyle: {
color: '#f87070' // 设置错误数的颜色为红色
},
label: {
show: true,
position: 'top',
formatter: '{c}',
color: '#000',
fontSize: 12
}
} // 移除了 stack
}
]
};

4
zc-business/src/main/java/com/zc/business/enums/WarningSubclassEnum.java
View File

@ -24,7 +24,7 @@ public enum WarningSubclassEnum {
RAMP_OCCUPIED("4-4", "匝道有车", "发生停车"),
VEHICLE_BREAKDOWN("4-5", "车辆故障", "发生停车"),
TRAFFIC_ACCIDENT("4-6", "交通事故", "发生停车"),
EMERGENCY_LANE_BLOCKED("4-7", "应急车道被占用", "发生停车"),
EMERGENCY_LANE_BLOCKED("", "应急车道被占用", "发生停车"),
VEHICLE_EXIT_EMERGENCY_LANE("4-8", "车离开应急车道", "发生停车"),
OTHER_CONDITION("4-9", "其他", "发生停车"),
OTHER_UNKNOWN("4-10", "未知车辆", "发生停车"),
@ -47,7 +47,7 @@ public enum WarningSubclassEnum {
FOG("8-4", "雾", "发生异常天气"),
HIGH_TEMPERATURE("8-5", "高温", "发生异常天气"),
WATER_POOLING("8-6", "积水", "发生异常天气"),
SLIPPERY_ROAD_SURFACE("8-6", "路面湿滑", "发生异常天气"),
SLIPPERY_ROAD_SURFACE("8-7", "路面湿滑", "发生异常天气"),
ICY_ROAD("8-8", "路面结冰", "发生异常天气"),
LOW_VISIBILITY("8-9", "道路能见度低", "发生异常天气"),
ROAD_FOG("8-10", "道路团雾", "发生异常天气"),

81
zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java
View File

@ -1409,22 +1409,25 @@ public class DcWarningServiceImpl implements IDcWarningService {
List<DcWarning> dcWarningsOne = dcWarningMapper.selectVideoReviewEventTypeList(dcWarning);
dcWarning.setAuditFlag(UniversalEnum.TWO.getNumber());
List<DcWarning> dcWarningsTwo = dcWarningMapper.selectVideoReviewEventTypeList(dcWarning);
Map<String, Object> result = new LinkedHashMap<>();
// 使用枚举类来定义类型映射
Map<Integer, String> warningTypeMap = Arrays.stream(WarningTypeEnum.values())
.collect(Collectors.toMap(WarningTypeEnum::getCode, WarningTypeEnum::getInfo));
if (dcWarning.getWarningType()==null){
// 使用枚举类来定义类型映射
Map<Integer, String> warningTypeMap = Arrays.stream(WarningTypeEnum.values())
.collect(Collectors.toMap(WarningTypeEnum::getCode, WarningTypeEnum::getInfo));
// 统计 dcWarningsOne 每种类型的数量
Map<Integer, Long> typeCountOne = dcWarningsOne.stream()
.collect(Collectors.groupingBy(DcWarning::getWarningType, Collectors.counting()));
// 统计 dcWarningsOne 每种类型的数量
Map<Integer, Long> typeCountOne = dcWarningsOne.stream()
.collect(Collectors.groupingBy(DcWarning::getWarningType, Collectors.counting()));
// 统计 dcWarningsTwo 每种类型的数量
Map<Integer, Long> typeCountTwo = dcWarningsTwo.stream()
.collect(Collectors.groupingBy(DcWarning::getWarningType, Collectors.counting()));
// 初始化结果集
DecimalFormat decimalFormat = new DecimalFormat("0");
// 统计 dcWarningsTwo 每种类型的数量
Map<Integer, Long> typeCountTwo = dcWarningsTwo.stream()
.collect(Collectors.groupingBy(DcWarning::getWarningType, Collectors.counting()));
// 初始化结果集
Map<String, Object> result = new LinkedHashMap<>();
DecimalFormat decimalFormat = new DecimalFormat("0");
// 遍历所有类型，计算数量和百分比
warningTypeMap.forEach((type, getWarningSource) -> {
@ -1461,6 +1464,60 @@ public class DcWarningServiceImpl implements IDcWarningService {
*/
});
}
else {
// 使用枚举类来定义类型映射
Map<String, String> warningTypeMap = Arrays.stream(WarningSubclassEnum.values())
.collect(Collectors.toMap(WarningSubclassEnum::getCode, WarningSubclassEnum::getInfo));
// 统计 dcWarningsOne 每种类型的数量
Map<String, Long> typeCountOne = dcWarningsOne.stream()
.collect(Collectors.groupingBy(DcWarning::getWarningSubclass, Collectors.counting()));
// 统计 dcWarningsTwo 每种类型的数量
Map<String, Long> typeCountTwo = dcWarningsTwo.stream()
.collect(Collectors.groupingBy(DcWarning::getWarningSubclass, Collectors.counting()));
// 初始化结果集
DecimalFormat decimalFormat = new DecimalFormat("0");
// 遍历所有类型，计算数量和百分比
warningTypeMap.forEach((type, getWarningSubclass) -> {
long countOne = typeCountOne.getOrDefault(type, 0L);
long countTwo = typeCountTwo.getOrDefault(type, 0L);
// 计算总数量
long totalCount = countOne + countTwo;
// 计算百分比并格式化
double percentageOne = totalCount == 0 ? 0 : ((double) countOne / totalCount) * 100;
double percentageTwo = totalCount == 0 ? 0 : ((double) countTwo / totalCount) * 100;
String formattedPercentageOne = decimalFormat.format(percentageOne);
String formattedPercentageTwo = decimalFormat.format(percentageTwo);
// 只保留有非零数量的类型
if (countOne > 0 || countTwo > 0) {
// 存储结果
Map<String, Object> typeResult = new LinkedHashMap<>();
typeResult.put("AuditFlag1_Count", countOne);
typeResult.put("AuditFlag2_Count", countTwo);
typeResult.put("AuditFlag1_Percentage", formattedPercentageOne+"%");
typeResult.put("AuditFlag2_Percentage", formattedPercentageTwo+"%");
result.put(getWarningSubclass, typeResult);
}
/* // 存储结果
Map<String, Object> typeResult = new LinkedHashMap<>();
typeResult.put("AuditFlag1_Count", countOne);
typeResult.put("AuditFlag2_Count", countTwo);
typeResult.put("AuditFlag1_Percentage", formattedPercentageOne);
typeResult.put("AuditFlag2_Percentage", formattedPercentageTwo);
result.put(getWarningSource, typeResult);
*/
});
}
return result;
}

16
zc-business/src/main/resources/mapper/business/DcWarningMapper.xml
View File

@ -491,8 +491,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="warningTitle != null and warningTitle != ''"> and warning_title = #{warningTitle}</if>
<if test="otherConfig != null and otherConfig != ''"> and other_config = #{otherConfig}</if>
<if test="lane != null and lane != ''"> and lane = #{lane}</if>
<if test="startDate != null and startDate != ''"> and date_format(audit_time, '%Y-%m-%d') >= #{startDate}</if>
<if test="endDate != null and endDate != ''"> and date_format(audit_time,'%Y-%m-%d') &lt;= #{endDate}</if>
<if test="startDate != null and startDate != ''"> and date_format(warning_time, '%Y-%m-%d') >= #{startDate}</if>
<if test="endDate != null and endDate != ''"> and date_format(warning_time,'%Y-%m-%d') &lt;= #{endDate}</if>
<if test="auditFlag != null and auditFlag != ''"> and audit_flag = #{auditFlag}</if>
</where>
</select>
@ -516,8 +516,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="warningLevel != null"> and warning_level = #{warningLevel}</if>
<if test="warningType != null"> and warning_type = #{warningType}</if>
<if test="warningSubclass != null and warningSubclass != ''"> and warning_subclass = #{warningSubclass}</if>
<if test="startDate != null and startDate != ''"> and date_format(audit_time, '%Y-%m-%d') >= #{startDate}</if>
<if test="endDate != null and endDate != ''"> and date_format(audit_time,'%Y-%m-%d') &lt;= #{endDate}</if>
<if test="startDate != null and startDate != ''"> and date_format(warning_time, '%Y-%m-%d') >= #{startDate}</if>
<if test="endDate != null and endDate != ''"> and date_format(warning_time,'%Y-%m-%d') &lt;= #{endDate}</if>
</where>
</select>
@ -541,10 +541,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="warningSubclass != null and warningSubclass != ''"> and warning_subclass = #{warningSubclass}</if>
<if test="auditFlag != null and auditFlag != ''"> and audit_flag = #{auditFlag}</if>
<if test="type == 1">
and YEAR(audit_time) = #{startDate}
and YEAR(warning_time) = #{startDate}
</if>
<if test="type == 2">
and DATE_FORMAT(audit_time, '%Y-%m') = #{startDate}
and DATE_FORMAT(warning_time, '%Y-%m') = #{startDate}
</if>
</where>
@ -569,10 +569,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="warningType != null"> and warning_type = #{warningType}</if>
<if test="warningSubclass != null and warningSubclass != ''"> and warning_subclass = #{warningSubclass}</if>
<if test="type == 1">
and YEAR(audit_time) = #{startDate}
and YEAR(warning_time) = #{startDate}
</if>
<if test="type == 2">
and DATE_FORMAT(audit_time, '%Y-%m') = #{startDate}
and DATE_FORMAT(warning_time, '%Y-%m') = #{startDate}
</if>
</where>

Write Preview
Loading…
Cancel
Save