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
建金
hzjtpushdateService
Commits
5aa5aa09
Commit
5aa5aa09
authored
Mar 15, 2021
by
高飞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复手动筛选功能bug
parent
0fb389f1
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
3 deletions
+13
-3
src/main/java/com/hzjt/config/JMS_Oracle.java
src/main/java/com/hzjt/config/JMS_Oracle.java
+1
-1
src/main/java/com/hzjt/config/JmsConfig.java
src/main/java/com/hzjt/config/JmsConfig.java
+1
-1
src/main/java/com/hzjt/controller/TraffController.java
src/main/java/com/hzjt/controller/TraffController.java
+7
-0
src/main/java/com/hzjt/domain/Traffalarmrecord.java
src/main/java/com/hzjt/domain/Traffalarmrecord.java
+1
-0
src/main/resources/mapper/Traffalarmrecord.xml
src/main/resources/mapper/Traffalarmrecord.xml
+3
-1
No files found.
src/main/java/com/hzjt/config/JMS_Oracle.java
View file @
5aa5aa09
...
...
@@ -22,7 +22,7 @@ import javax.jms.Message;
import
javax.jms.Queue
;
import
java.util.*
;
//
@Component
//
@Component
@Slf4j
public
class
JMS_Oracle
implements
CommandLineRunner
{
@Autowired
...
...
src/main/java/com/hzjt/config/JmsConfig.java
View file @
5aa5aa09
...
...
@@ -5,7 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
import
org.springframework.stereotype.Component
;
@Component
//
@Component
@Data
public
class
JmsConfig
{
@Value
(
"${spring.datasource.username}"
)
...
...
src/main/java/com/hzjt/controller/TraffController.java
View file @
5aa5aa09
...
...
@@ -225,9 +225,11 @@ public class TraffController {
String
manualStatus
=
traffAlarmRecordMapper
.
seletManualStatus
();
if
(
manualStatus
.
equalsIgnoreCase
(
"1"
))
{
map
.
put
(
"type"
,
"recordalarm"
);
traffAlarmRecord
.
setManualstatus
(
0
);
}
else
{
map
.
put
(
"type"
,
"alarm"
);
traffAlarmRecord
.
setManualstatus
(
1
);
}
map
.
put
(
"data"
,
trffClientMessage
);
...
...
@@ -509,9 +511,14 @@ public class TraffController {
@GetMapping
(
"/test"
)
@ResponseBody
public
void
test
()
{
String
manualStatus
=
traffAlarmRecordMapper
.
seletManualStatus
();
Alarm
alarm
=
new
Alarm
();
alarm
.
setVideo_id
(
"20200305112042989_0"
);
alarm
.
setIncident_type
(
"vehicle_ban"
);
String
str
=
"iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAYAAABIdFAMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAHhJREFUeNo8zjsOxCAMBFB/KEAUFFR0Cbng3nQPw68ArZdAlOZppPFIBhH5EAB8b+Tlt9MYQ6i1BuqFaq1CKSVcxZ2Acs6406KUgpt5/LCKuVgz5BDCSb13ZO99ZOdcZGvt4mJjzMVKqcha68iIePB86GAiOv8CDADlIUQBs7MD3wAAAABJRU5ErkJggg=="
;
List
arrlist
=
new
ArrayList
();
arrlist
.
add
(
str
);
alarm
.
setImg_base64
(
arrlist
);
alarm
.
setTs
(
"1345677777"
);
alarm
.
setType
(
"TRAFFIC_INCIDENT_ALARM"
);
Map
map
=
new
HashMap
();
...
...
src/main/java/com/hzjt/domain/Traffalarmrecord.java
View file @
5aa5aa09
...
...
@@ -47,6 +47,7 @@ public class Traffalarmrecord implements java.io.Serializable {
private
String
processstatus
;
//����״̬;
private
String
objlable
;
private
String
rectificationtype
;
private
Integer
manualstatus
;
@Override
public
String
toString
()
{
...
...
src/main/resources/mapper/Traffalarmrecord.xml
View file @
5aa5aa09
...
...
@@ -64,6 +64,7 @@
<if
test=
"processstatus != null"
>
processstatus,
</if>
<if
test=
"objlable != null"
>
objlable,
</if>
<if
test=
"rectificationtype != null"
>
rectificationtype ,
</if>
<if
test=
"manualstatus != null"
>
manualstatus ,
</if>
</trim>
<trim
prefix=
"select"
suffix=
"from dual"
suffixOverrides=
","
>
...
...
@@ -103,6 +104,7 @@
<if
test=
"processstatus != null"
>
#{processstatus},
</if>
<if
test=
"objlable != null"
>
#{objlable},
</if>
<if
test=
"rectificationtype != null"
>
#{rectificationtype},
</if>
<if
test=
"manualstatus != null"
>
#{manualstatus,jdbcType=INTEGER},
</if>
</trim>
...
...
@@ -174,7 +176,7 @@
and recordtype in ('illegal_parking','no_motor_ban')
</update>
<select
id=
"seletManualStatus"
>
<select
id=
"seletManualStatus"
resultType=
"java.lang.String"
>
select name from t_code where type=4
</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