开发庭与科技详情相关接口。
优化PppoE查询接口。
This commit is contained in:
@@ -1296,6 +1296,8 @@ public class MessageHandler {
|
||||
private void updateNetworkInterface(NetworkInfo networkInfo, String clientId,
|
||||
RmNetworkInterface oldInterfaceMsg, boolean isSingleInterface, boolean isRegister) {
|
||||
RmNetworkInterface updateData = new RmNetworkInterface();
|
||||
BeanUtils.copyProperties(oldInterfaceMsg, updateData);
|
||||
|
||||
boolean needUpdate = false;
|
||||
|
||||
// 逐个字段比较是否需要更新
|
||||
@@ -1318,14 +1320,6 @@ public class MessageHandler {
|
||||
if (!StringUtils.equals(networkInfo.getPublicIp(), oldInterfaceMsg.getPublicIp())) {
|
||||
updateData.setPublicIp(networkInfo.getPublicIp());
|
||||
needUpdate = true;
|
||||
// 特殊处理:非注册消息且多网卡时,更新公网IP状态
|
||||
if (!isSingleInterface && !isRegister) {
|
||||
updateData.setBindIp("0");
|
||||
RmResourceRegistrationRemote updateParam = new RmResourceRegistrationRemote();
|
||||
updateParam.setClientId(clientId);
|
||||
updateParam.setMultiPublicIpStatus("0");
|
||||
remoteRevenueConfigService.updateStatusByResource(updateParam, SecurityConstants.INNER);
|
||||
}
|
||||
}
|
||||
if (!StringUtils.equals(networkInfo.getCarrier(), oldInterfaceMsg.getIsp())) {
|
||||
updateData.setIsp(networkInfo.getCarrier());
|
||||
@@ -1340,7 +1334,7 @@ public class MessageHandler {
|
||||
if (needUpdate) {
|
||||
updateData.setClientId(clientId);
|
||||
updateData.setMacAddress(oldInterfaceMsg.getMacAddress());
|
||||
rmNetworkInterfaceService.updateRmNetworkInterfaceByMac(updateData);
|
||||
rmNetworkInterfaceService.updateNetMsgByMac(updateData);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user