Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
info-publish-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
info-publish-platform
Commits
c2d495d1
Commit
c2d495d1
authored
Dec 06, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改同步逻辑
parent
b8603d2f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
0 deletions
+22
-0
info-publish-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceVo.java
...java/com/mortals/xhx/module/device/model/vo/DeviceVo.java
+10
-0
info-publish-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java
...a/com/mortals/xhx/module/device/web/DeviceController.java
+12
-0
No files found.
info-publish-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceVo.java
View file @
c2d495d1
...
...
@@ -42,4 +42,14 @@ public class DeviceVo extends BaseEntityLong {
private
List
<
DeviceWorkmanEntity
>
deviceWorkmanEntityList
;
/**
* 抬头设置
*/
private
String
lookUp
;
/**
* 播放时间,单位秒
*/
private
Integer
playTime
;
}
\ No newline at end of file
info-publish-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java
View file @
c2d495d1
...
...
@@ -13,6 +13,9 @@ import com.mortals.xhx.common.code.EnabledEnum;
import
com.mortals.xhx.common.pdu.LoginForm
;
import
com.mortals.xhx.common.pdu.device.DeviceReq
;
import
com.mortals.xhx.feign.device.IDeviceFeign
;
import
com.mortals.xhx.module.basic.model.BasicSetEntity
;
import
com.mortals.xhx.module.basic.model.BasicSetQuery
;
import
com.mortals.xhx.module.basic.service.BasicSetService
;
import
com.mortals.xhx.module.device.model.*
;
import
com.mortals.xhx.module.device.service.DeviceFileService
;
import
com.mortals.xhx.module.device.service.DeviceService
;
...
...
@@ -61,6 +64,8 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
private
DeviceFileService
deviceFileService
;
@Autowired
private
DeviceWorkmanService
deviceWorkmanService
;
@Autowired
private
BasicSetService
basicSetService
;
public
DeviceController
()
{
super
.
setModuleDesc
(
"设备"
);
...
...
@@ -109,6 +114,13 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
if
(
rest
.
getCode
()
!=
1
)
{
throw
new
AppException
(
rest
.
getMsg
());
}
BasicSetEntity
basicSetEntity
=
basicSetService
.
selectOne
(
new
BasicSetQuery
());
if
(!
ObjectUtils
.
isEmpty
(
basicSetEntity
))
{
deviceEntity
.
setPlayTime
(
basicSetEntity
.
getPlayTime
());
deviceEntity
.
setLookUp
(
basicSetEntity
.
getLookUp
());
}
recordSysLog
(
request
,
busiDesc
+
" 【成功】"
);
}
catch
(
Exception
e
)
{
log
.
error
(
"设备信息获取"
,
e
);
...
...
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