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
141927d1
Commit
141927d1
authored
Oct 15, 2019
by
喻训浩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: PDA
parent
4cbf1859
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
44 additions
and
8 deletions
+44
-8
RunRecordService.java
...tar/zhongtong/avi/equipment/service/RunRecordService.java
+0
-5
PDAController.java
...ar/zhongtong/avi/monitoring/controller/PDAController.java
+30
-0
PDAService.java
...t/vtstar/zhongtong/avi/monitoring/service/PDAService.java
+11
-0
application-default.properties
src/main/resources/config/application-default.properties
+1
-1
application-dev-yxh.properties
src/main/resources/config/application-dev-yxh.properties
+1
-1
application-mqtt.properties
src/main/resources/config/application-mqtt.properties
+1
-1
No files found.
src/main/java/net/vtstar/zhongtong/avi/equipment/service/RunRecordService.java
View file @
141927d1
...
@@ -90,14 +90,9 @@ public class RunRecordService {
...
@@ -90,14 +90,9 @@ public class RunRecordService {
EquipmentData
laser
=
new
LaserCuttingMachine
();
EquipmentData
laser
=
new
LaserCuttingMachine
();
((
LaserCuttingMachine
)
laser
).
setCuttingSpeed
(
new
BigDecimal
(
500
));
((
LaserCuttingMachine
)
laser
).
setCuttingSpeed
(
new
BigDecimal
(
500
));
RuntimeRecord
runtimeRecord
=
new
RuntimeRecord
();
RuntimeRecord
runtimeRecord
=
new
RuntimeRecord
();
runtimeRecord
.
setWorkshopCode
(
"23232"
);
runtimeRecord
.
setWorkshopCode
(
"23232"
);
equipmentData
.
insert
(
runtimeRecord
);
equipmentData
.
insert
(
runtimeRecord
);
}
}
public
static
void
main
(
String
[]
args
)
{
}
}
}
src/main/java/net/vtstar/zhongtong/avi/monitoring/controller/PDAController.java
0 → 100644
View file @
141927d1
package
net
.
vtstar
.
zhongtong
.
avi
.
monitoring
.
controller
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.extern.slf4j.Slf4j
;
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
;
@Slf4j
@Api
(
description
=
"PDA相关操作模块"
)
@RestController
@RequestMapping
(
"/PDA"
)
public
class
PDAController
{
@Autowired
private
PDAService
pdaService
;
@ApiOperation
(
value
=
"pda扫码请求"
)
@PostMapping
(
"/bound"
)
private
Return
Bound
(
@RequestParam
(
"busOrderNo"
)
String
busOrderNo
){
pdaService
.
bound
(
busOrderNo
);
return
Return
.
success
();
}
}
src/main/java/net/vtstar/zhongtong/avi/monitoring/service/PDAService.java
0 → 100644
View file @
141927d1
package
net
.
vtstar
.
zhongtong
.
avi
.
monitoring
.
service
;
import
org.springframework.stereotype.Service
;
@Service
public
class
PDAService
{
public
void
bound
(
String
busOrderNo
)
{
}
}
src/main/resources/config/application-default.properties
View file @
141927d1
spring.profiles.include
=
datasource,mybatis,quartz,swagger,security
spring.profiles.include
=
datasource,mybatis,quartz,swagger,security,mqtt
\ No newline at end of file
\ No newline at end of file
src/main/resources/config/application-dev-yxh.properties
View file @
141927d1
spring.profiles.include
=
mybatis,quartz,swagger,security
spring.profiles.include
=
mybatis,quartz,swagger,security
,mqtt
# Mysql
# Mysql
#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
...
...
src/main/resources/config/application-mqtt.properties
View file @
141927d1
# Mqtt
# Mqtt
mqtt.server-uri
=
tcp://1
0.168.1.72
:1883
mqtt.server-uri
=
tcp://1
27.0.0.1
:1883
mqtt.connection-timeout-second
=
10
mqtt.connection-timeout-second
=
10
mqtt.username
=
huaying
mqtt.username
=
huaying
mqtt.password
=
huaying-2018
mqtt.password
=
huaying-2018
...
...
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