Commit 09aed56a authored by 赵啸非's avatar 赵啸非

添加设备黑名单应用

parent a5cd0909
...@@ -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)) {
......
...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment