Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hzjtpushdateService
Project overview
Project overview
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
jianjin
hzjtpushdateService
Commits
a854df3c
Commit
a854df3c
authored
Apr 07, 2021
by
高飞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更改测试数据
parent
cc72ef86
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
15 deletions
+16
-15
src/main/java/com/hzjt/controller/TraffController.java
src/main/java/com/hzjt/controller/TraffController.java
+10
-10
src/main/resources/application.properties
src/main/resources/application.properties
+6
-5
No files found.
src/main/java/com/hzjt/controller/TraffController.java
View file @
a854df3c
...
@@ -533,7 +533,7 @@ public class TraffController {
...
@@ -533,7 +533,7 @@ public class TraffController {
public
void
test
()
{
public
void
test
()
{
String
manualStatus
=
traffAlarmRecordMapper
.
seletManualStatus
();
String
manualStatus
=
traffAlarmRecordMapper
.
seletManualStatus
();
Alarm
alarm
=
new
Alarm
();
Alarm
alarm
=
new
Alarm
();
alarm
.
setVideo_id
(
"
20200305112042989
_0"
);
alarm
.
setVideo_id
(
"
33_65_230_156_554_fbXdTkVe98u_ecvs
_0"
);
alarm
.
setIncident_type
(
"vehicle_ban"
);
alarm
.
setIncident_type
(
"vehicle_ban"
);
String
str
=
"iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAYAAABIdFAMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAHhJREFUeNo8zjsOxCAMBFB/KEAUFFR0Cbng3nQPw68ArZdAlOZppPFIBhH5EAB8b+Tlt9MYQ6i1BuqFaq1CKSVcxZ2Acs6406KUgpt5/LCKuVgz5BDCSb13ZO99ZOdcZGvt4mJjzMVKqcha68iIePB86GAiOv8CDADlIUQBs7MD3wAAAABJRU5ErkJggg=="
;
String
str
=
"iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAYAAABIdFAMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAHhJREFUeNo8zjsOxCAMBFB/KEAUFFR0Cbng3nQPw68ArZdAlOZppPFIBhH5EAB8b+Tlt9MYQ6i1BuqFaq1CKSVcxZ2Acs6406KUgpt5/LCKuVgz5BDCSb13ZO99ZOdcZGvt4mJjzMVKqcha68iIePB86GAiOv8CDADlIUQBs7MD3wAAAABJRU5ErkJggg=="
;
List
arrlist
=
new
ArrayList
();
List
arrlist
=
new
ArrayList
();
...
@@ -542,7 +542,7 @@ public class TraffController {
...
@@ -542,7 +542,7 @@ public class TraffController {
alarm
.
setTs
(
"1345677777"
);
alarm
.
setTs
(
"1345677777"
);
alarm
.
setType
(
"TRAFFIC_INCIDENT_ALARM"
);
alarm
.
setType
(
"TRAFFIC_INCIDENT_ALARM"
);
Map
map
=
new
HashMap
();
Map
map
=
new
HashMap
();
map
.
put
(
"type"
,
"
record
alarm"
);
map
.
put
(
"type"
,
"alarm"
);
map
.
put
(
"data"
,
alarm
);
map
.
put
(
"data"
,
alarm
);
map
.
put
(
"recordid"
,
"33448"
);
map
.
put
(
"recordid"
,
"33448"
);
WebSocket
.
GroupSending
(
JsonUtil
.
beanToString
(
map
));
WebSocket
.
GroupSending
(
JsonUtil
.
beanToString
(
map
));
...
@@ -570,28 +570,28 @@ public class TraffController {
...
@@ -570,28 +570,28 @@ public class TraffController {
@ResponseBody
@ResponseBody
public
void
test2
()
{
public
void
test2
()
{
Alarm
alarm
=
new
Alarm
();
Alarm
alarm
=
new
Alarm
();
alarm
.
setVideo_id
(
"
20200305112042989
_0"
);
alarm
.
setVideo_id
(
"
33_65_230_156_554_fbXdTkVe98u_ecvs
_0"
);
alarm
.
setIncident_type
(
"vehicle_ban"
);
alarm
.
setIncident_type
(
"vehicle_ban"
);
alarm
.
setType
(
"TRAFFIC_INCIDENT_ALARM"
);
alarm
.
setType
(
"TRAFFIC_INCIDENT_ALARM"
);
Map
map
=
new
HashMap
();
Map
map
=
new
HashMap
();
map
.
put
(
"type"
,
"
record
alarm"
);
map
.
put
(
"type"
,
"alarm"
);
map
.
put
(
"data"
,
alarm
);
map
.
put
(
"data"
,
alarm
);
map
.
put
(
"recordid"
,
"33446"
);
map
.
put
(
"recordid"
,
"33446
56
"
);
WebSocket
.
GroupSending
(
JsonUtil
.
beanToString
(
map
));
WebSocket
.
GroupSending
(
JsonUtil
.
beanToString
(
map
));
Traffalarmrecord
traffAlarmRecord
=
new
Traffalarmrecord
();
Traffalarmrecord
traffAlarmRecord
=
new
Traffalarmrecord
();
traffAlarmRecord
.
setRecordid
(
Long
.
parseLong
(
"33446"
));
traffAlarmRecord
.
setRecordid
(
Long
.
parseLong
(
"33446"
));
traffAlarmRecord
.
setChannelid
(
new
Integer
(
1
));
traffAlarmRecord
.
setChannelid
(
new
Integer
(
0
));
traffAlarmRecord
.
setFdid
(
"
20200305112042989
"
);
traffAlarmRecord
.
setFdid
(
"
33_65_230_156_554_fbXdTkVe98u_ecvs
"
);
traffAlarmRecord
.
setRecordtype
(
"vehicle_ban"
);
traffAlarmRecord
.
setRecordtype
(
"vehicle_ban"
);
traffAlarmRecordMapper
.
inserTraffAlarmRecord
(
traffAlarmRecord
);
traffAlarmRecordMapper
.
inserTraffAlarmRecord
(
traffAlarmRecord
);
map
.
put
(
"recordid"
,
"33447"
);
map
.
put
(
"recordid"
,
"33447
66
"
);
WebSocket
.
GroupSending
(
JsonUtil
.
beanToString
(
map
));
WebSocket
.
GroupSending
(
JsonUtil
.
beanToString
(
map
));
Traffalarmrecord
traffAlarmRecord2
=
new
Traffalarmrecord
();
Traffalarmrecord
traffAlarmRecord2
=
new
Traffalarmrecord
();
traffAlarmRecord2
.
setRecordid
(
Long
.
parseLong
(
"33447"
));
traffAlarmRecord2
.
setRecordid
(
Long
.
parseLong
(
"33447"
));
traffAlarmRecord2
.
setChannelid
(
new
Integer
(
1
));
traffAlarmRecord2
.
setChannelid
(
new
Integer
(
0
));
traffAlarmRecord2
.
setFdid
(
"
20200305112042989
"
);
traffAlarmRecord2
.
setFdid
(
"
33_65_230_157_554_pKf3kS8Vo0N_ecvs
"
);
traffAlarmRecord2
.
setRecordtype
(
"vehicle_ban"
);
traffAlarmRecord2
.
setRecordtype
(
"vehicle_ban"
);
traffAlarmRecordMapper
.
inserTraffAlarmRecord
(
traffAlarmRecord2
);
traffAlarmRecordMapper
.
inserTraffAlarmRecord
(
traffAlarmRecord2
);
...
...
src/main/resources/application.properties
View file @
a854df3c
...
@@ -29,12 +29,12 @@ mybatis.configuration.default-statement-timeout=3000
...
@@ -29,12 +29,12 @@ mybatis.configuration.default-statement-timeout=3000
#spring.datasource.dbcp2.connection-properties=characterEncoding=utf8
#spring.datasource.dbcp2.connection-properties=characterEncoding=utf8
# Mysql���ݿ�-����Դ����
# Mysql���ݿ�-����Դ����
#spring.datasource.username=test
#spring.datasource.password=test
#spring.datasource.url=jdbc:oracle:thin:@192.168.168.212:1523:helowin
spring.datasource.username
=
hzjt
spring.datasource.username
=
hzjt
spring.datasource.password
=
hzjt
spring.datasource.password
=
hzjt
spring.datasource.url
=
jdbc:oracle:thin:@33.65.250.179:1521:helowin
spring.datasource.url
=
jdbc:oracle:thin:@192.168.168.212:1523:helowin
#spring.datasource.username=hzjt
#spring.datasource.password=hzjt
#spring.datasource.url=jdbc:oracle:thin:@33.65.250.179:1521:helowin
spring.datasource.driverClassName
=
oracle.jdbc.OracleDriver
spring.datasource.driverClassName
=
oracle.jdbc.OracleDriver
# druid
# druid
spring.datasource.type
=
com.alibaba.druid.pool.DruidDataSource
spring.datasource.type
=
com.alibaba.druid.pool.DruidDataSource
...
@@ -62,7 +62,8 @@ spring.datasource.useGlobalDataSourceStat=true
...
@@ -62,7 +62,8 @@ spring.datasource.useGlobalDataSourceStat=true
#redis
#redis
# Redis��������ַ
# Redis��������ַ
spring.redis.host
=
33.65.250.179
#spring.redis.host=33.65.250.179
spring.redis.host
=
127.0.0.1
# Redis���������Ӷ˿�
# Redis���������Ӷ˿�
spring.redis.port
=
6379
spring.redis.port
=
6379
# Redis�������������루Ĭ��Ϊ�գ�
# Redis�������������루Ĭ��Ϊ�գ�
...
...
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