Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
fill-system
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
廖旭伟
fill-system
Commits
e0ee7bcc
Commit
e0ee7bcc
authored
Mar 24, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加设备相关
parent
1c185a09
Pipeline
#2527
failed with stages
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
fill-manager/db/add.sql
fill-manager/db/add.sql
+7
-1
fill-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java
...a/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java
+2
-2
No files found.
fill-manager/db/add.sql
View file @
e0ee7bcc
...
@@ -10,3 +10,9 @@ ALTER TABLE mortals_xhx_matter_datum_print ADD COLUMN `deviceName` varchar(255)
...
@@ -10,3 +10,9 @@ ALTER TABLE mortals_xhx_matter_datum_print ADD COLUMN `deviceName` varchar(255)
ALTER
TABLE
mortals_xhx_matter_datum_print
ADD
COLUMN
`idCard`
varchar
(
64
)
default
''
COMMENT
'身份证号'
AFTER
deviceName
;
ALTER
TABLE
mortals_xhx_matter_datum_print
ADD
COLUMN
`idCard`
varchar
(
64
)
default
''
COMMENT
'身份证号'
AFTER
deviceName
;
ALTER
TABLE
mortals_xhx_matter_datum_print
ADD
COLUMN
`idName`
varchar
(
64
)
default
''
COMMENT
'身份证名称'
AFTER
idCard
;
ALTER
TABLE
mortals_xhx_matter_datum_print
ADD
COLUMN
`idName`
varchar
(
64
)
default
''
COMMENT
'身份证名称'
AFTER
idCard
;
ALTER
TABLE
mortals_xhx_matter_datum_print
ADD
COLUMN
`mobile`
varchar
(
64
)
default
''
COMMENT
'手机号码'
AFTER
idName
;
ALTER
TABLE
mortals_xhx_matter_datum_print
ADD
COLUMN
`mobile`
varchar
(
64
)
default
''
COMMENT
'手机号码'
AFTER
idName
;
-- ----------------------------
2023
-
03
-
22
-- ----------------------------
INSERT
INTO
`mortals_xhx_task`
(
`id`
,
`name`
,
`taskKey`
,
`status`
,
`excuteService`
,
`excuteParam`
,
`excuteHost`
,
`excuteStrategy`
,
`excuteDate`
,
`excuteTime`
,
`remark`
,
`lastExcuteHost`
,
`lastExcuteTime`
,
`interimExcuteStatus`
,
`createTime`
,
`createUserId`
,
`createUserName`
)
VALUES
(
'4'
,
'同步设备'
,
'SyncSiteDeviceTask'
,
'0'
,
'SyncSiteDeviceTask'
,
NULL
,
NULL
,
'4'
,
'120'
,
'00:00'
,
NULL
,
'127.0.1.1'
,
'2023-02-26 22:15:59'
,
'0'
,
'2023-02-25 14:34:12'
,
'1'
,
NULL
);
fill-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java
View file @
e0ee7bcc
...
@@ -51,13 +51,13 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
...
@@ -51,13 +51,13 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
siteRest
.
getData
().
forEach
(
site
->
{
siteRest
.
getData
().
forEach
(
site
->
{
log
.
info
(
"站点名称:{}"
,
site
.
getSiteName
());
log
.
info
(
"站点名称:{}"
,
site
.
getSiteName
());
DevicePdu
devicePdu
=
new
DevicePdu
();
DevicePdu
devicePdu
=
new
DevicePdu
();
devicePdu
.
setProductCode
(
"
yb
j"
);
devicePdu
.
setProductCode
(
"
td
j"
);
devicePdu
.
setSize
(-
1
);
devicePdu
.
setSize
(-
1
);
Rest
<
RespData
<
List
<
DevicePdu
>>>
deviceRest
=
deviceFeign
.
list
(
devicePdu
);
Rest
<
RespData
<
List
<
DevicePdu
>>>
deviceRest
=
deviceFeign
.
list
(
devicePdu
);
log
.
info
(
"deviceRest:{}"
,
JSON
.
toJSONString
(
deviceRest
));
log
.
info
(
"deviceRest:{}"
,
JSON
.
toJSONString
(
deviceRest
));
if
(
YesNoEnum
.
YES
.
getValue
()
==
deviceRest
.
getCode
())
{
if
(
YesNoEnum
.
YES
.
getValue
()
==
deviceRest
.
getCode
())
{
List
<
DevicePdu
>
devicePduList
=
deviceRest
.
getData
().
getData
();
List
<
DevicePdu
>
devicePduList
=
deviceRest
.
getData
().
getData
();
log
.
info
(
"
样表
机总数量:{}"
,
devicePduList
.
size
());
log
.
info
(
"
填单
机总数量:{}"
,
devicePduList
.
size
());
if
(!
ObjectUtils
.
isEmpty
(
devicePduList
))
{
if
(!
ObjectUtils
.
isEmpty
(
devicePduList
))
{
List
<
DeviceEntity
>
newDeviceList
=
devicePduList
.
stream
().
map
(
newDevice
->
{
List
<
DeviceEntity
>
newDeviceList
=
devicePduList
.
stream
().
map
(
newDevice
->
{
DeviceEntity
deviceEntity
=
new
DeviceEntity
();
DeviceEntity
deviceEntity
=
new
DeviceEntity
();
...
...
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