Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zhongtong-avi-service
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
中通客车项目
zhongtong-avi-service
Commits
a6f07db4
Commit
a6f07db4
authored
Oct 29, 2019
by
喻训浩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: avi修改
parent
c543bd77
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
11 deletions
+16
-11
PDAController.java
...ar/zhongtong/avi/monitoring/controller/PDAController.java
+12
-7
RfidMessageHandler.java
.../vtstar/zhongtong/avi/mqtt/handle/RfidMessageHandler.java
+1
-1
application-mqtt.properties
src/main/resources/config/application-mqtt.properties
+1
-1
application-quartz.properties
src/main/resources/config/application-quartz.properties
+1
-1
application.properties
src/main/resources/config/application.properties
+1
-1
No files found.
src/main/java/net/vtstar/zhongtong/avi/monitoring/controller/PDAController.java
View file @
a6f07db4
package
net
.
vtstar
.
zhongtong
.
avi
.
monitoring
.
controller
;
import
com.alibaba.fastjson.JSONObject
;
import
io.jsonwebtoken.lang.Assert
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.extern.slf4j.Slf4j
;
import
net.vtstar.utils.asserts.ParamAssert
;
import
net.vtstar.utils.domain.Return
;
import
net.vtstar.zhongtong.avi.monitoring.service.PDAService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.*
;
@Slf4j
@Api
(
description
=
"PDA相关操作模块"
)
...
...
@@ -22,22 +22,27 @@ public class PDAController {
@ApiOperation
(
value
=
"焊装车间钣金上撬请求"
)
@PostMapping
(
"/hanzhuang/bound"
)
private
Return
hanZhuangBound
(
@Request
Param
(
"vehicleNo"
)
String
vehicleNo
,
@RequestParam
(
"busNo"
)
String
busNo
)
{
private
Return
hanZhuangBound
(
@Request
Body
JSONObject
json
)
{
ParamAssert
.
notNull
(
json
.
get
(
"vehicleNo"
),
"param is null"
);
ParamAssert
.
notNull
(
json
.
get
(
"busNo"
),
"param is null"
);
return
Return
.
success
();
}
@ApiOperation
(
value
=
"换撬请求"
)
@PostMapping
(
"/change/skid"
)
private
Return
changeSkid
(
@Request
Param
(
"sourceStation"
)
String
sourceStation
,
@RequestParam
(
"targetStation"
)
String
targetStati
on
)
{
private
Return
changeSkid
(
@Request
Body
JSONObject
js
on
)
{
ParamAssert
.
notNull
(
json
.
get
(
"sourceStation"
),
"param is null"
);
ParamAssert
.
notNull
(
json
.
get
(
"sourceStation"
),
"param is null"
);
return
Return
.
success
();
}
@ApiOperation
(
value
=
"返修车请求"
)
@PostMapping
(
"/repair"
)
private
Return
repair
(
@Request
Param
(
"busNo"
)
String
busNo
)
{
private
Return
repair
(
@Request
Body
JSONObject
json
)
{
ParamAssert
.
notNull
(
json
.
get
(
"busNo"
),
"param is null"
);
return
Return
.
success
();
}
}
src/main/java/net/vtstar/zhongtong/avi/mqtt/handle/RfidMessageHandler.java
View file @
a6f07db4
...
...
@@ -21,7 +21,7 @@ public class RfidMessageHandler extends AbstractTesterMessageHandler {
private
ValueOperations
valueOperations
;
public
RfidMessageHandler
()
{
super
(
"
translation
"
,
"data/all"
);
super
(
"
skid
"
,
"data/all"
);
}
@Override
...
...
src/main/resources/config/application-mqtt.properties
View file @
a6f07db4
...
...
@@ -9,7 +9,7 @@ mqtt.password=public
mqtt.subscribe.completion-timeout
=
5000
mqtt.subscribe.qos
=
2
mqtt.subscribe.topic-prefix
=
iot
mqtt.subscribe.equipment-name
=
+
mqtt.subscribe.equipment-name
=
+
mqtt.subscribe.equipment-number
=
+
mqtt.subscribe.data-topic-key
=
data
mqtt.subscribe.data-system-topic-suffix
=
system
...
...
src/main/resources/config/application-quartz.properties
View file @
a6f07db4
...
...
@@ -31,7 +31,7 @@ quartz.job.taskInfos[1].jobGroup=CleanStatusDataJob
quartz.job.taskInfos[1]
.jobDescription
=
\u
6E05
\u
6D17
\u
8BBE
\u5907\u
72B6
\u6001
Job
#quartz.job.taskInfos[1].cronExpression=0 0 0 * * ?
quartz.job.taskInfos[1]
.cronExpression
=
0/15 * * * * ?
quartz.job.taskInfos[1]
.start
=
tru
e
quartz.job.taskInfos[1]
.start
=
fals
e
quartz.job.taskInfos[2]
.jobName
=
net.vtstar.zhongtong.avi.equipment.job.StatisticsTimeJob
quartz.job.taskInfos[2]
.jobGroup
=
StatisticsTimeJob
...
...
src/main/resources/config/application.properties
View file @
a6f07db4
...
...
@@ -9,7 +9,7 @@ spring.aop.auto=true
spring.main.allow-bean-definition-overriding
=
true
# server
server.port
=
808
0
server.port
=
808
6
spring.servlet.multipart.max-file-size
=
1000MB
spring.servlet.multipart.max-request-size
=
2000MB
spring.servlet.multipart.enabled
=
true
...
...
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