Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
traffic-signal-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
signal
traffic-signal-platform
Commits
e5590dad
Commit
e5590dad
authored
Mar 18, 2025
by
duanruiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[add] 信号机灯态;环图请求存储redis
parent
64d9b8c2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
0 deletions
+16
-0
WanJiCommonStaticInfoServiceImpl.java
...ice/staticinfo/impl/WanJiCommonStaticInfoServiceImpl.java
+12
-0
SignalStatusTask.java
...ce/src/main/java/net/wanji/utc/task/SignalStatusTask.java
+4
-0
No files found.
signal-utc-service/src/main/java/net/wanji/utc/service/staticinfo/impl/WanJiCommonStaticInfoServiceImpl.java
View file @
e5590dad
...
@@ -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
;
}
}
...
...
signal-utc-service/src/main/java/net/wanji/utc/task/SignalStatusTask.java
View file @
e5590dad
...
@@ -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
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment