admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

包头修改

Browse Source
This commit is contained in:
guoshengxiong 2025-11-27 18:34:14 +08:00
parent 649320930f
commit c89c0dd3d6
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zhgd/xmgl/modules/baotou/entity/CarDangerDetect.java
View File

@ -19,6 +19,7 @@ import java.io.Serializable;
@Data
@TableName("car_danger_detect")
@ApiModel(value = "CarDangerDetect实体类", description = "CarDangerDetect")
@Deprecated//使用车辆测速设备
public class CarDangerDetect implements Serializable {
private static final long serialVersionUID = 1L;

1
src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/ProjectHomeNameServiceImpl.java
View File

@ -91,6 +91,7 @@ public class ProjectHomeNameServiceImpl extends ServiceImpl<ProjectHomeNameMappe
public void saveName(ProjectHomeName projectHomeName) {
ProjectHomeName name = projectHomeNameMapper.selectOne(new LambdaQueryWrapper<ProjectHomeName>()
.eq(ProjectHomeName::getWhichType, projectHomeName.getWhichType())
.eq(ProjectHomeName::getWhichModule, projectHomeName.getWhichModule())
.eq(ProjectHomeName::getProjectSn, projectHomeName.getProjectSn())
);
if (name == null) {

2
src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java
View File

@ -327,6 +327,8 @@ public class Project implements Serializable {
private String workerSafeWatchTime;
@ApiModelProperty(value = "是否需要项目管理员做AI抓拍初筛")
private Integer aiAlarmNeedManageApprove;
@ApiModelProperty(value = "是否需要项目管理员做车辆不安全行为监测抓拍初筛")
private Integer carDangerNeedManageApprove;
/**
* runde平台token
*/

22
src/main/java/com/zhgd/xmgl/task/CarInfoTask.java
View File

@ -26,6 +26,7 @@ import com.zhgd.xmgl.modules.car.service.ICarMeasureSpeedDataService;
import com.zhgd.xmgl.modules.car.service.ICarMeasureSpeedDevService;
import com.zhgd.xmgl.modules.car.service.impl.CarInfoServiceImpl;
import com.zhgd.xmgl.modules.project.entity.Project;
import com.zhgd.xmgl.modules.project.entity.vo.ProjectInfoExtVo;
import com.zhgd.xmgl.modules.project.mapper.ProjectMapper;
import com.zhgd.xmgl.util.HikvisionUtil;
import lombok.extern.slf4j.Slf4j;
@ -125,7 +126,6 @@ public class CarInfoTask {
List<Project> projects = projectMapper.selectList(new LambdaQueryWrapper<Project>()
.eq(Project::getSyncHikvision, 1));
Map<String, List<CarMeasureSpeedDev>> projectMap = carMeasureSpeedDevService.list().stream().collect(Collectors.groupingBy(CarMeasureSpeedDev::getProjectSn));
Map<String, List<CarDangerDetect>> dangerDetectProjectMap = carDangerDetectService.list().stream().collect(Collectors.groupingBy(CarDangerDetect::getProjectSn));
for (Project project : projects) {
try {
JSONArray listJa = getSpeedDataList(start, project);
@ -138,11 +138,15 @@ public class CarInfoTask {
carMeasureSpeedDataService.saveBatch(speedDatas);
}
Map<String, CarDangerDetect> carDangerDevMap = Optional.ofNullable(dangerDetectProjectMap.get(project.getProjectSn())).map(m -> m.stream().collect(Collectors.toMap(CarDangerDetect::getHardwareId, Function.identity()))).orElse(null);
List<CarDangerDetectRecord> carDangers = buildCarDangerData(listJa, carDangerDevMap, project);
List<CarDangerDetectRecord> carDangers = buildCarDangerData(listJa, devMap, project);
if (CollUtil.isNotEmpty(carDangers)) {
carDangerDetectRecordService.saveBatch(carDangers);
}
if (Objects.equals(project.getCarDangerNeedManageApprove(), 0)) {
for (CarDangerDetectRecord danger : carDangers) {
carDangerDetectRecordService.violationPush(danger.getId());
}
}
} catch (Exception e) {
log.error("定时到海康拉取车辆超速错误：", e);
@ -151,7 +155,7 @@ public class CarInfoTask {
}
private List<CarDangerDetectRecord> buildCarDangerData(JSONArray listJa, Map<String, CarDangerDetect> carDangerDevMap, Project project) throws Exception {
private List<CarDangerDetectRecord> buildCarDangerData(JSONArray listJa, Map<String, CarMeasureSpeedDev> carDangerDevMap, Project project) throws Exception {
List<CarDangerDetectRecord> datas = new ArrayList<>();
if (CollUtil.isNotEmpty(listJa)) {
for (int i = 0; i < listJa.size(); i++) {
@ -161,7 +165,7 @@ public class CarInfoTask {
continue;
}
String monitoringId = jo.getString("monitoringId");
CarDangerDetect dev = carDangerDevMap.get(monitoringId);
CarMeasureSpeedDev dev = carDangerDevMap.get(monitoringId);
if (dev == null) {
continue;
}
@ -170,16 +174,16 @@ public class CarInfoTask {
Date time = DateUtil.parse(jo.getString("crossTime"));
CarDangerDetectRecord data = new CarDangerDetectRecord();
data.setProjectSn(dev.getProjectSn());
data.setHardwareName(dev.getHardwareName());
data.setHardwareId(dev.getHardwareId());
data.setHardwareName(dev.getDeviceName());
data.setHardwareId(dev.getDevSn());
String platePicUrl = jo.getString("carPicUri");
String svrIndex = jo.getString("aswSyscode");
if (StringUtils.isNotBlank(platePicUrl)) {
data.setImageUrl(hikvisionCall.saveToLocal(HikvisionCall.getHikvisionEventsPicture(new HikvisionEventsPictureRq(svrIndex, platePicUrl), project.getArtemisConfigHost(), project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret())));
}
data.setAlarmDesc(dev.getHardwareName());
data.setAlarmDesc(dev.getDeviceName());
data.setAlarmType(1);
data.setLocation(dev.getHardwareName());
data.setLocation(dev.getDeviceName());
data.setCreateTime(DateUtil.formatDateTime(time));
data.setIsPushed(false);
data.setCarNumber(plateNo);