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
ad01b18a
Commit
ad01b18a
authored
Dec 29, 2020
by
高飞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
重复事件不推送1
parent
63d5614f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
13 deletions
+28
-13
src/main/java/com/hzjt/controller/TraffController.java
src/main/java/com/hzjt/controller/TraffController.java
+18
-13
src/main/java/com/hzjt/mapper/TraffAlarmRecordMapper.java
src/main/java/com/hzjt/mapper/TraffAlarmRecordMapper.java
+2
-0
src/main/resources/mapper/TraffFlow.xml
src/main/resources/mapper/TraffFlow.xml
+1
-0
src/main/resources/mapper/Traffalarmrecord.xml
src/main/resources/mapper/Traffalarmrecord.xml
+7
-0
No files found.
src/main/java/com/hzjt/controller/TraffController.java
View file @
ad01b18a
...
...
@@ -151,6 +151,10 @@ public class TraffController {
// importService.cleanCache();
// 将参数result中的部分数据存入redis中,并把格式校验成功的数据发布至对应频道中
// importService.cacheAndPublish(JsonUtil.beanToString(trffClientMessage));
//判断该事件在规定事件内是否发生过,发生过不需要入库
sendevent
(
trffClientMessage
);
}
catch
(
Exception
e
)
{
log
.
error
(
"MessageController receive putData error:"
+
e
.
toString
());
...
...
@@ -161,6 +165,20 @@ public void sendevent( Alarm trffClientMessage){
List
<
String
>
imgBase64List
=
trffClientMessage
.
getImg_base64
();
Traffalarmrecord
traffAlarmRecord
=
new
Traffalarmrecord
();
String
imgEnumHead
=
"IMG"
;
traffAlarmRecord
.
setAreaid
(
Long
.
valueOf
(
trffClientMessage
.
getDept
()));
traffAlarmRecord
.
setRecordtype
(
trffClientMessage
.
getIncident_type
().
toLowerCase
());
traffAlarmRecord
.
setVideourlfrom
(
trffClientMessage
.
getVideo_record_url
());
traffAlarmRecord
.
setRecordtime
(
new
Date
(
Long
.
valueOf
(
trffClientMessage
.
getTs
())));
traffAlarmRecord
.
setCreatetime
(
new
Date
());
traffAlarmRecord
.
setObjlable
(
trffClientMessage
.
getObjLabel
());
traffAlarmRecord
.
setPushstatus
(
9
);
//设置为未推送
int
exists
=
traffAlarmRecordMapper
.
selectExitsTraffAlarm
(
traffAlarmRecord
);
if
(
exists
>
0
){
//存在直接返回
return
;
}
Ftp
ftp
=
ftpService
.
reloadFtp
();
for
(
int
i
=
0
;
i
<
imgBase64List
.
size
();
i
++)
{
/* 图片上传 */
...
...
@@ -187,14 +205,6 @@ public void sendevent( Alarm trffClientMessage){
int
recordid
=
traffAlarmRecordMapper
.
selectmax
();
traffAlarmRecord
.
setRecordid
((
long
)(
recordid
+
1
));
traffAlarmRecord
.
setProcessstatus
(
"0"
);
traffAlarmRecord
.
setAreaid
(
Long
.
valueOf
(
trffClientMessage
.
getDept
()));
traffAlarmRecord
.
setRecordtype
(
trffClientMessage
.
getIncident_type
().
toLowerCase
());
traffAlarmRecord
.
setVideourlfrom
(
trffClientMessage
.
getVideo_record_url
());
traffAlarmRecord
.
setRecordtime
(
new
Date
(
Long
.
valueOf
(
trffClientMessage
.
getTs
())));
traffAlarmRecord
.
setCreatetime
(
new
Date
());
traffAlarmRecord
.
setObjlable
(
trffClientMessage
.
getObjLabel
());
traffAlarmRecord
.
setPushstatus
(
9
);
//设置为未推送
traffAlarmRecordMapper
.
inserTraffAlarmRecord
(
traffAlarmRecord
);
try
{
...
...
@@ -213,12 +223,7 @@ public void sendevent( Alarm trffClientMessage){
if
(
traffAlarmRecord
!=
null
&&
traffAlarmRecord
.
getRecordid
()
!=
null
)
{
traffAlarmRecordMapper
.
updateTraffAlarmRecordUrl
(
traffAlarmRecord
);
}
if
(
traffAlarmRecord
.
getRecordtype
().
equalsIgnoreCase
(
"roadworks"
)
||
traffAlarmRecord
.
getRecordtype
().
equalsIgnoreCase
(
"roadworks_out_of_line"
))
{
//工程类的更新10分钟之前该videoid 下的 工程类和行人闯入和违停的记录施工纠偏类型为1
traffAlarmRecordMapper
.
updateTraffAlarmRectificationType
(
traffAlarmRecord
);
}
...
...
src/main/java/com/hzjt/mapper/TraffAlarmRecordMapper.java
View file @
ad01b18a
...
...
@@ -25,4 +25,6 @@ public interface TraffAlarmRecordMapper extends BaseMapper<Traffalarmrecord>, Co
int
updateTraffAlarmRectificationType
(
Traffalarmrecord
traffalarmrecord
);
int
selectExitsTraffAlarm
(
Traffalarmrecord
traffalarmrecord
);
}
\ No newline at end of file
src/main/resources/mapper/TraffFlow.xml
View file @
ad01b18a
...
...
@@ -165,4 +165,5 @@
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/Traffalarmrecord.xml
View file @
ad01b18a
...
...
@@ -142,5 +142,12 @@
</update>
<select
id=
"selectExitsTraffAlarm"
parameterType=
"com.hzjt.domain.Traffalarmrecord"
resultType=
"java.lang.Integer"
>
select count(1) from TRAFFALARMRECORD a,t_code b where a.recordtype=#{item.recordtype,jdbcType=VARCHAR}
and a.recordtype=LOWER (b.key)and recordtime>=sysdate-(b.pushchektime)/(24*60)
and a.fdid=#{item.fdid,jdbcType=VARCHAR}
and a.channelid=#{item.channelid,jdbcType=VARCHAR}
</select>
</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