From 8b1a247b32f7a9bcbaeb4c81e03dd05f24d7971c Mon Sep 17 00:00:00 2001 From: chenlinghy Date: Fri, 29 Jan 2021 16:20:09 +0800 Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=E4=BC=98=E5=8C=96=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=AE=BE=E5=A4=87=E8=8A=82=E7=82=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dispose/manager/impl/DisposeDeviceManagerImpl.java | 4 ++++ .../dispose/service/impl/DisposeDeviceManagerServiceImpl.java | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java b/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java index 99a15e27..5f6a350d 100644 --- a/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java +++ b/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java @@ -157,6 +157,10 @@ public class DisposeDeviceManagerImpl implements DisposeDeviceManager { // 更新值 upgradeDisposeDeviceProperties(tDev, dev); + dev.setUrlType(tDev.getUrlType()); + dev.setIpAddr(tDev.getIpAddr()); + dev.setIpPort(tDev.getIpPort()); + // 更新设备数据库 disposeDeviceMapper.upgradeDisposeDevice(tDev); diff --git a/src/main/java/com/dispose/service/impl/DisposeDeviceManagerServiceImpl.java b/src/main/java/com/dispose/service/impl/DisposeDeviceManagerServiceImpl.java index e8128f7e..e92e62ad 100644 --- a/src/main/java/com/dispose/service/impl/DisposeDeviceManagerServiceImpl.java +++ b/src/main/java/com/dispose/service/impl/DisposeDeviceManagerServiceImpl.java @@ -43,8 +43,7 @@ public class DisposeDeviceManagerServiceImpl implements DisposeDeviceManagerServ try { MulReturnType ret = disposeDeviceManager.addDisposeDevice(v); v.setId(ret.getSecondParam()); - DisposeDevice dev = disposeDeviceManager.getDisposeDevices(v.getId(),v.getAreaCode()).get(0); - rspList.add(new MulReturnType<>(ret.getFirstParam(), dev)); + rspList.add(new MulReturnType<>(ret.getFirstParam(), v)); } catch (Exception e) { rspList.add(new MulReturnType<>(ErrorCode.ERR_SYSTEMEXCEPTION, v)); }