Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
smart_gov_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
赵啸非
smart_gov_platform
Commits
09aed56a
Commit
09aed56a
authored
May 07, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加设备黑名单应用
parent
a5cd0909
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
2 deletions
+15
-2
base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java
...a/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java
+1
-2
common-lib/src/main/java/com/mortals/xhx/common/pdu/device/DevicePdu.java
...ain/java/com/mortals/xhx/common/pdu/device/DevicePdu.java
+14
-0
No files found.
base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java
View file @
09aed56a
...
@@ -58,7 +58,6 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
...
@@ -58,7 +58,6 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
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
());
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
();
...
@@ -104,7 +103,7 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
...
@@ -104,7 +103,7 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
if
(!
ObjectUtils
.
isEmpty
(
updateDeviceLsit
))
{
if
(!
ObjectUtils
.
isEmpty
(
updateDeviceLsit
))
{
log
.
info
(
"设备更新,size:{}"
,
updateDeviceLsit
.
size
());
log
.
info
(
"设备更新,size:{}"
,
updateDeviceLsit
.
size
());
deviceService
.
update
(
updateDeviceLsit
);
//
deviceService.update(updateDeviceLsit);
}
}
if
(!
ObjectUtils
.
isEmpty
(
saveDeviceList
))
{
if
(!
ObjectUtils
.
isEmpty
(
saveDeviceList
))
{
...
...
common-lib/src/main/java/com/mortals/xhx/common/pdu/device/DevicePdu.java
View file @
09aed56a
...
@@ -51,6 +51,10 @@ public class DevicePdu extends BaseEntityLong {
...
@@ -51,6 +51,10 @@ public class DevicePdu extends BaseEntityLong {
* 产品Id
* 产品Id
*/
*/
private
Long
productId
;
private
Long
productId
;
/**
* 产品编码
*/
private
String
productCode
;
/**
/**
* 产品名称
* 产品名称
*/
*/
...
@@ -172,6 +176,14 @@ public class DevicePdu extends BaseEntityLong {
...
@@ -172,6 +176,14 @@ public class DevicePdu extends BaseEntityLong {
*/
*/
private
String
deviceSN
;
private
String
deviceSN
;
public
String
getProductCode
()
{
return
productCode
;
}
public
void
setProductCode
(
String
productCode
)
{
this
.
productCode
=
productCode
;
}
/** 开始 主键ID,主键,自增长 */
/** 开始 主键ID,主键,自增长 */
private
Long
idStart
;
private
Long
idStart
;
...
@@ -2909,6 +2921,8 @@ public class DevicePdu extends BaseEntityLong {
...
@@ -2909,6 +2921,8 @@ public class DevicePdu extends BaseEntityLong {
return
this
;
return
this
;
}
}
/**
/**
* 设置 产品名称
* 设置 产品名称
* @param productNameList
* @param productNameList
...
...
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