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
88e44e38
Commit
88e44e38
authored
Nov 20, 2024
by
duanruiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[add] 绿波时序图功能提交
parent
3a3921e0
Changes
10
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
473 additions
and
201 deletions
+473
-201
Constants.java
...service/src/main/java/net/wanji/opt/common/Constants.java
+5
-0
RedisUtils.java
...ervice/src/main/java/net/wanji/opt/common/RedisUtils.java
+28
-0
StrategyGreenOptHistMapper.java
.../net/wanji/opt/dao/mapper/StrategyGreenOptHistMapper.java
+12
-0
KafkaListeners.java
...ice/src/main/java/net/wanji/opt/kafka/KafkaListeners.java
+16
-199
StrategyGreenOptHistEntity.java
...ain/java/net/wanji/opt/po/StrategyGreenOptHistEntity.java
+52
-0
GreenBeltInfoService.java
...main/java/net/wanji/opt/service/GreenBeltInfoService.java
+24
-0
GreenBeltInfoServiceImpl.java
.../net/wanji/opt/service/impl/GreenBeltInfoServiceImpl.java
+271
-0
StrategyGreenBeltController.java
...opt/synthesis/controller/StrategyGreenBeltController.java
+57
-0
GreenBeltInfoVO.java
...rvice/src/main/java/net/wanji/opt/vo/GreenBeltInfoVO.java
+1
-2
StrategyGreenOptHistMapper.xml
.../src/main/resources/mapper/StrategyGreenOptHistMapper.xml
+7
-0
No files found.
signal-optimize-service/src/main/java/net/wanji/opt/common/Constants.java
View file @
88e44e38
...
...
@@ -52,4 +52,9 @@ public class Constants {
*/
public
static
final
Integer
CANCEL_STEP_CONTROL
=
11
;
/**
* 绿波优化查询缓存key
*/
public
static
final
String
GREEN_ID_OPT_KEY
=
"green_opt_"
;
}
\ No newline at end of file
signal-optimize-service/src/main/java/net/wanji/opt/common/RedisUtils.java
View file @
88e44e38
...
...
@@ -47,4 +47,32 @@ public class RedisUtils {
}
return
null
;
}
/**
* @description: 判断是否存在Key
* @param key redis的Key
* @return boolean true:有 false:无
*/
public
boolean
hasKey
(
String
key
)
{
return
redis7Template
.
hasKey
(
key
);
}
/**
* @description: 添加字符串
* @param key redis的Key
* @param value 添加redis的value
*/
public
void
set
(
String
key
,
String
value
)
{
redis7Template
.
opsForValue
().
set
(
key
,
value
);
}
/**
* @description: 获取对象
* @param key redis的Key
* @return Object 返回对象
*/
public
Object
get
(
String
key
)
{
return
redis7Template
.
opsForValue
().
get
(
key
);
}
}
signal-optimize-service/src/main/java/net/wanji/opt/dao/mapper/StrategyGreenOptHistMapper.java
0 → 100644
View file @
88e44e38
package
net
.
wanji
.
opt
.
dao
.
mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
net.wanji.opt.po.StrategyGreenOptHistEntity
;
/**
* @author duanruiming
* @date 2024/11/19 18:02
* @description 神思推送绿波时序图信息
*/
public
interface
StrategyGreenOptHistMapper
extends
BaseMapper
<
StrategyGreenOptHistEntity
>
{
}
signal-optimize-service/src/main/java/net/wanji/opt/kafka/KafkaListeners.java
View file @
88e44e38
This diff is collapsed.
Click to expand it.
signal-optimize-service/src/main/java/net/wanji/opt/po/StrategyGreenOptHistEntity.java
0 → 100644
View file @
88e44e38
package
net
.
wanji
.
opt
.
po
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
lombok.Data
;
import
java.util.Date
;
/**
* @author duanruiming
* @date 2024/11/19 17:48
*/
@Data
@TableName
(
"t_strategy_green_opt_hist"
)
public
class
StrategyGreenOptHistEntity
{
@TableId
(
value
=
"id"
,
type
=
IdType
.
AUTO
)
private
Integer
id
;
@TableField
(
"green_id"
)
private
String
greenId
;
@TableField
(
"length"
)
private
Double
length
;
@TableField
(
"cycle"
)
private
Integer
cycle
;
@TableField
(
"control_time"
)
private
String
controlTime
;
@TableField
(
"control_duration"
)
private
Integer
controlDuration
;
@TableField
(
"control_method"
)
private
Integer
controlMethod
;
@TableField
(
"type"
)
private
Integer
type
;
@TableField
(
"dynamic"
)
private
Integer
dynamic
;
@TableField
(
"dir_type"
)
private
Integer
dirType
;
@TableField
(
"dir"
)
private
String
dir
;
@TableField
(
"max_speed"
)
private
Double
maxSpeed
;
@TableField
(
"min_speed"
)
private
Double
minSpeed
;
@TableField
(
"green_width_time"
)
private
Double
greenWidthTime
;
@TableField
(
"cross_green_detail"
)
private
String
crossGreenDetail
;
@TableField
(
"create_time"
)
private
Date
createTime
;
@TableField
(
"modify_time"
)
private
Date
modifyTime
;
}
signal-optimize-service/src/main/java/net/wanji/opt/service/GreenBeltInfoService.java
0 → 100644
View file @
88e44e38
package
net
.
wanji
.
opt
.
service
;
import
net.wanji.opt.vo.GreenBeltInfoVO
;
/**
* @author duanruiming
* @date 2024/11/19 18:07
*/
public
interface
GreenBeltInfoService
{
/**
* 数据转换
* @param message
* @return
* @throws Exception
*/
GreenBeltInfoVO
convertData
(
String
message
)
throws
Exception
;
/**
* 存储
* @param infoVO
* @throws Exception
*/
void
save
(
GreenBeltInfoVO
infoVO
)
throws
Exception
;
}
signal-optimize-service/src/main/java/net/wanji/opt/service/impl/GreenBeltInfoServiceImpl.java
0 → 100644
View file @
88e44e38
This diff is collapsed.
Click to expand it.
signal-optimize-service/src/main/java/net/wanji/opt/synthesis/controller/StrategyGreenBeltController.java
0 → 100644
View file @
88e44e38
package
net
.
wanji
.
opt
.
synthesis
.
controller
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiResponse
;
import
io.swagger.annotations.ApiResponses
;
import
net.wanji.common.framework.rest.JsonViewObject
;
import
net.wanji.common.utils.tool.JacksonUtils
;
import
net.wanji.opt.common.Constants
;
import
net.wanji.opt.common.RedisUtils
;
import
net.wanji.opt.service.GreenBeltInfoService
;
import
net.wanji.opt.synthesis.pojo.StrategyControlVO
;
import
net.wanji.opt.vo.GreenBeltInfoVO
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
javax.annotation.Resource
;
import
javax.ws.rs.core.MediaType
;
/**
* @author duanruiming
* @date 2024/11/19 20:10
* @description 神思推送绿波时序图
*/
@Api
(
value
=
"StrategyGreenBeltController"
,
description
=
"策略绿波带"
)
@RequestMapping
(
"/strategyBelt"
)
@RestController
public
class
StrategyGreenBeltController
{
@Resource
private
RedisUtils
redisUtils
;
@Resource
private
GreenBeltInfoService
greenBeltInfoService
;
@ApiOperation
(
value
=
"绿波时序图查询"
,
notes
=
"绿波时序图查询"
,
response
=
JsonViewObject
.
class
,
produces
=
MediaType
.
APPLICATION_JSON
,
consumes
=
MediaType
.
APPLICATION_JSON
)
@PostMapping
(
value
=
"/strategyInfoOperation"
,
produces
=
MediaType
.
APPLICATION_JSON
,
consumes
=
MediaType
.
APPLICATION_JSON
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
GreenBeltInfoVO
.
class
),
})
public
JsonViewObject
strategyInfoOperation
(
@RequestBody
String
greenId
)
throws
Exception
{
// todo 测试
GreenBeltInfoVO
greenBeltInfoVO1
=
greenBeltInfoService
.
convertData
(
null
);
greenBeltInfoService
.
save
(
greenBeltInfoVO1
);
String
key
=
Constants
.
GREEN_ID_OPT_KEY
.
concat
(
greenId
);
redisUtils
.
set
(
key
,
JacksonUtils
.
getInstance
().
writeValueAsString
(
greenBeltInfoVO1
));
Object
obj
=
redisUtils
.
get
(
key
);
JsonViewObject
jsonViewObject
=
JsonViewObject
.
newInstance
();
GreenBeltInfoVO
greenBeltInfoVO
=
JacksonUtils
.
getInstance
().
readValue
(
String
.
valueOf
(
obj
),
GreenBeltInfoVO
.
class
);
return
jsonViewObject
.
success
(
greenBeltInfoVO
);
}
}
signal-optimize-service/src/main/java/net/wanji/opt/vo/GreenBeltInfoVO.java
View file @
88e44e38
...
...
@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModel;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.time.LocalDateTime
;
import
java.util.List
;
/**
...
...
@@ -47,7 +46,7 @@ public class GreenBeltInfoVO {
@ApiModelProperty
(
"最小速度"
)
private
Double
minSpeed
;
@ApiModelProperty
(
"绿波带宽"
)
private
Double
greenWithTime
;
private
Double
greenWi
d
thTime
;
@ApiModelProperty
(
"绿波路口详情"
)
private
List
<
CrossGreenDetail
>
crossGreenDetailList
;
}
...
...
signal-optimize-service/src/main/resources/mapper/StrategyGreenOptHistMapper.xml
0 → 100644
View file @
88e44e38
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"net.wanji.opt.dao.mapper.StrategyGreenOptHistMapper"
>
</mapper>
\ No newline at end of file
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