Commit e5590dad authored by duanruiming's avatar duanruiming

[add] 信号机灯态;环图请求存储redis

parent 64d9b8c2
...@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil; ...@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
...@@ -27,6 +28,7 @@ import net.wanji.utc.common.Result; ...@@ -27,6 +28,7 @@ import net.wanji.utc.common.Result;
import net.wanji.utc.service.control.impl.ControlCommandStrategyServiceImpl; import net.wanji.utc.service.control.impl.ControlCommandStrategyServiceImpl;
import net.wanji.utc.service.staticinfo.WanJiCommonStaticInfoService; import net.wanji.utc.service.staticinfo.WanJiCommonStaticInfoService;
import net.wanji.utc.util.HttpRestUtil; import net.wanji.utc.util.HttpRestUtil;
import net.wanji.utc.util.RedisUtil;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
...@@ -61,6 +63,7 @@ public class WanJiCommonStaticInfoServiceImpl implements WanJiCommonStaticInfoSe ...@@ -61,6 +63,7 @@ public class WanJiCommonStaticInfoServiceImpl implements WanJiCommonStaticInfoSe
private final BaseCrossSchemeMapper baseCrossSchemeMapper; private final BaseCrossSchemeMapper baseCrossSchemeMapper;
private final CrossSchemeStageOptLogMapper crossSchemeStageOptLogMapper; private final CrossSchemeStageOptLogMapper crossSchemeStageOptLogMapper;
private final ControlCommandStrategyServiceImpl controlCommandStrategyService; private final ControlCommandStrategyServiceImpl controlCommandStrategyService;
private final RedisUtil redisUtil;
@Override @Override
...@@ -237,6 +240,15 @@ public class WanJiCommonStaticInfoServiceImpl implements WanJiCommonStaticInfoSe ...@@ -237,6 +240,15 @@ public class WanJiCommonStaticInfoServiceImpl implements WanJiCommonStaticInfoSe
/*if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) { /*if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
throw new Exception("方案环图请求远程服务调用异常,异常信息" + jsonViewObject.getMessage()); throw new Exception("方案环图请求远程服务调用异常,异常信息" + jsonViewObject.getMessage());
}*/ }*/
try {
ObjectMapper mapper = JacksonUtils.getInstance();
CrossSchemeRings crossSchemeRings = mapper.convertValue(jsonViewObject.getContent(), CrossSchemeRings.class); // CrossSchemeRings
redisUtil.setHash("utc_scheme_offset", crossId, mapper.writeValueAsString(crossSchemeRings));
} catch (Exception e) {
log.error("方案换图请求存储redis失败:", e);
throw new RuntimeException(e);
}
return jsonViewObject; return jsonViewObject;
} }
......
...@@ -23,6 +23,7 @@ import net.wanji.utc.common.typeenum.BasicEnum; ...@@ -23,6 +23,7 @@ import net.wanji.utc.common.typeenum.BasicEnum;
import net.wanji.utc.kafka.ProducerHandler; import net.wanji.utc.kafka.ProducerHandler;
import net.wanji.utc.service.runninginfo.HkLightsStatusService; import net.wanji.utc.service.runninginfo.HkLightsStatusService;
import net.wanji.utc.service.runninginfo.SignalStatusService; import net.wanji.utc.service.runninginfo.SignalStatusService;
import net.wanji.utc.util.RedisUtil;
import net.wanji.utc.websocket.RealTimeDataWebSocket; import net.wanji.utc.websocket.RealTimeDataWebSocket;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.index.IndexRequest;
...@@ -85,6 +86,8 @@ public class SignalStatusTask { ...@@ -85,6 +86,8 @@ public class SignalStatusTask {
@Qualifier("net.wanji.feign.service.EHualuFeignClients") @Qualifier("net.wanji.feign.service.EHualuFeignClients")
@Autowired @Autowired
private EHualuFeignClients eHualuFeignClients; private EHualuFeignClients eHualuFeignClients;
@Autowired
private RedisUtil redisUtil;
public static final ConcurrentHashMap<String, List<LightsStatusVO2>> produceListMap = new ConcurrentHashMap<>(); public static final ConcurrentHashMap<String, List<LightsStatusVO2>> produceListMap = new ConcurrentHashMap<>();
...@@ -181,6 +184,7 @@ public class SignalStatusTask { ...@@ -181,6 +184,7 @@ public class SignalStatusTask {
} }
insertIntoHist(crossId, json); insertIntoHist(crossId, json);
produceListMap.put(crossId, listResult); produceListMap.put(crossId, listResult);
redisUtil.setHash("utc_light_status", crossId, mapper.writeValueAsString(listResult));
} catch (Exception e) { } catch (Exception e) {
log.error("RealTimeDataWebSocket发送异常,异常信息:", e); log.error("RealTimeDataWebSocket发送异常,异常信息:", e);
} }
......
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