Skip to content

T
traffic-signal-platform
Commit 841c0ee0 authored by duanruiming's avatar duanruiming
Browse files
Options

[add] 易华录灯态优化

parent 7716be7f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 202 deletions
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/controller/SignalStatusController.java
View file @ 841c0ee0
......@@ -5,7 +5,8 @@ package net.wanji.utc.hisense.controller;
* @date 2022/12/1 15:07
*/
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
......@@ -15,10 +16,10 @@ import lombok.extern.slf4j.Slf4j;
import net.wanji.common.annotation.aspect.AspectLog;
import net.wanji.common.enums.BaseEnum;
import net.wanji.common.framework.rest.JsonViewObject;
import net.wanji.common.utils.tool.JacksonUtils;
import net.wanji.databus.po.SignalStatusLogPO;
import net.wanji.databus.vo.LightsStatusVO;
import net.wanji.utc.hisense.pojo.convert.EhualuLightStatusPojo;
import net.wanji.utc.hisense.pojo.convert.HisenseLightStatusPojo;
import net.wanji.utc.hisense.pojo.convert.LightStatusPojo;
import net.wanji.utc.hisense.service.SignalStatusService;
import org.dom4j.DocumentException;
import org.springframework.web.bind.annotation.PostMapping;
......@@ -76,10 +77,10 @@ public class SignalStatusController {
@AspectLog(description = "接收海信灯态", operationType = BaseEnum.OperationTypeEnum.QUERY)
@PostMapping(value = "/receiveLightStatus", produces = MediaType.APPLICATION_JSON)
@ApiOperation(value = "接收海信灯态", notes = "接收海信灯态", response = LightsStatusVO.class, produces = MediaType.APPLICATION_JSON)
public JsonViewObject receiveLightStatus(@RequestBody List<HisenseLightStatusPojo> hisenseLightStatusPojos) throws Exception {
public JsonViewObject receiveLightStatus(@RequestBody List<LightStatusPojo> lightStatusPojos) throws Exception {
JsonViewObject jsonViewObject = JsonViewObject.newInstance();
try {
signalStatusService.receiveLightStatus(hisenseLightStatusPojos);
signalStatusService.receiveLightStatus(lightStatusPojos);
} catch (Exception e) {
log.error("海信接收灯态异常：{}", e);
}
......@@ -89,9 +90,11 @@ public class SignalStatusController {
@AspectLog(description = "接收易华录灯态", operationType = BaseEnum.OperationTypeEnum.QUERY)
@PostMapping(value = "/receiveEhualu", produces = MediaType.APPLICATION_JSON)
@ApiOperation(value = "接收海信灯态", notes = "接收海信灯态", response = LightsStatusVO.class, produces = MediaType.APPLICATION_JSON)
public JsonViewObject receiveLightStatusEhualu(@RequestBody List<EhualuLightStatusPojo> ehualuLightStatusPojos) throws Exception {
public JsonViewObject receiveLightStatusEhualu(@RequestBody String data) throws Exception {
JsonViewObject jsonViewObject = JsonViewObject.newInstance();
ObjectMapper jackson = JacksonUtils.getInstance();
try {
List<LightStatusPojo> ehualuLightStatusPojos = jackson.readValue(data, new TypeReference<List<LightStatusPojo>>() {});
signalStatusService.receiveLightStatusEhualu(ehualuLightStatusPojos);
} catch (Exception e) {
log.error("易华录接收灯态异常：{}", e);
......
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/pojo/convert/EhualuLightStatusPojo.java deleted 100644 → 0
View file @ 7716be7f
package net.wanji.utc.hisense.pojo.convert;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author duanruiming
* @date 2025/03/03 17:35
*/
@Data
public class EhualuLightStatusPojo {
private String headers;
private String body;
@ApiModel(value = "来自滴滴海信灯态实体类")
@Data
public static class Headers {
@ApiModelProperty(value = "数据名称")
private String name;
@ApiModelProperty(value = "滴滴数据大脑数据来源")
private String from;
private String taskId;
}
@Data
@ApiModel(value = "来自滴滴海信灯态实体类")
public static class Body {
@ApiModelProperty(value = "灯态数据内容")
private ContentBody content;
@ApiModelProperty(value = "数据源，固定字符串，比如 “haixin”")
private String source;
@ApiModelProperty(value = "数据类型，固定数字2，代表JSON格式")
private Integer type;
}
@Data
@ApiModel(value = "来自滴滴海信灯态实体类")
public static class ContentBody {
@ApiModelProperty(value = "城市名称拼音，如“yinchuan”")
private String cityCode;
@ApiModelProperty(value = "行政区编号,如“640104")
private String regionId;
@ApiModelProperty(value = "置信度，1.0代表100%可信，若遇早晚高峰动态配时，可以降低置信度")
private int confidence;
@ApiModelProperty(value = "控制模式，11：特殊控制-关灯，12：特殊控制-全红，13：特殊控制-黄闪，21：单点多时段控制，" +
"22：单点感应控制，23：单点自适应控制，31：线协调控制，41：区域协调控制，51：干预控制-手动控制，" +
"52：干预控制-锁定阶段控制，53：干预控制-指定方案，54：干预控制-锁定相位控制")
private int controlMode;
@ApiModelProperty(value = "海信定义路口编号")
private String crossId;
@ApiModelProperty(value = "信号机实时状态，0-正常，1-掉线")
private int crossRealStatus;
@ApiModelProperty(value = "周期剩余时间")
private int cycleCountDown;
@ApiModelProperty(value = "灯态JSON Object")
private List<LampRealInfos> lampRealInfos;
@ApiModelProperty(value = "信号灯周期（单位:秒），所有信号阶段时长之和")
private int period;
@ApiModelProperty(value = "方案编号")
private int planId;
@ApiModelProperty(value = "数据产生时间戳，精确到毫秒，与北京时间校准务必准确")
private Long signalMachineStamp;
private Integer offset;
private Integer periodCountDown;
@Data
@ApiModel(value = "来自滴滴海信灯态实体类")
public static class LampRealInfos {
@ApiModelProperty(value = "当前灯色剩余时间，单位:秒，动态变化的具体数值，时效性要求高")
private Integer countDown;
@ApiModelProperty(value = "当前灯色，22-黄灯，23-绿灯，21-红灯")
private String lampStatus;
@ApiModelProperty(value = "下一灯色持续时长")
private Integer nextCountDown;
@ApiModelProperty(value = "下一灯色")
private Integer nextLampStatus;
/**
* 0 由北向南
* 1 东北向西南
* 2 由东向西
* 3 由东南向西北
* 4 由南向北 顺时针方向
*/
@ApiModelProperty(value = "交通流方向")
private Integer roadDirection;
@ApiModelProperty(value = "交通流流向，11:直行，12:左转，13:右转, 31:掉头，99:其他")
private Integer roadFlowDirection;
@ApiModelProperty(value = "相位编号")
private String phaseId;
private Integer nextNextCountDown;
private Integer nextNextLampStatus;
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/pojo/convert/HisenseLightStatusPojo.java → signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/pojo/convert/LightStatusPojo.java
View file @ 841c0ee0
......@@ -14,7 +14,7 @@ import java.util.List;
@Data
@ApiModel(value = "来自滴滴海信灯态实体类")
@JsonIgnoreProperties(ignoreUnknown = true)
public class HisenseLightStatusPojo {
public class LightStatusPojo {
private Headers headers;
private String body;
......
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/service/SignalStatusService.java
View file @ 841c0ee0
......@@ -2,8 +2,7 @@ package net.wanji.utc.hisense.service;
import net.wanji.databus.po.SignalStatusLogPO;
import net.wanji.databus.vo.LightsStatusVO;
import net.wanji.utc.hisense.pojo.convert.EhualuLightStatusPojo;
import net.wanji.utc.hisense.pojo.convert.HisenseLightStatusPojo;
import net.wanji.utc.hisense.pojo.convert.LightStatusPojo;
import org.dom4j.DocumentException;
import java.util.List;
......@@ -23,6 +22,6 @@ public interface SignalStatusService {
List<SignalStatusLogPO> runningStatusAlarm(String crossId) throws DocumentException;
List<LightsStatusVO> lightStatus(String crossId);
void receiveLightStatus(List<HisenseLightStatusPojo> hisenseLightStatusPojos) throws Exception;
void receiveLightStatusEhualu(List<EhualuLightStatusPojo> ehualuLightStatusPojos) throws Exception;
void receiveLightStatus(List<LightStatusPojo> lightStatusPojos) throws Exception;
void receiveLightStatusEhualu(List<LightStatusPojo> ehualuLightStatusPojos) throws Exception;
}
signal-utc-service/src/main/java/net/wanji/utc/task/SignalStatusTask.java
View file @ 841c0ee0
......@@ -214,7 +214,10 @@ public class SignalStatusTask {
});
}
if (StringUtils.endsWithIgnoreCase(BasicEnum.ManufacturerEnum.EHULU.getCode(), manufacturerInfoPO.getCode())) {
JsonViewObject jsonViewObject = eHualuFeignClients.lightStatus(crossId);
//JsonViewObject jsonViewObject = eHualuFeignClients.lightStatus(crossId);
//return mapper.convertValue(jsonViewObject.getContent(), new TypeReference<List<LightsStatusVO>>() {
//});
JsonViewObject jsonViewObject = utcHisenseFeignClients.lightStatus(crossId);
return mapper.convertValue(jsonViewObject.getContent(), new TypeReference<List<LightsStatusVO>>() {
});
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment