liuyupeng/saas-houduan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复pppoe配置界面异常bug

Browse Source
This commit is contained in:
gaoyutao
2026-01-13 18:43:56 +08:00
parent 2b2f70a910
commit ac406d88fe
1 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmPppoeConfigMainServiceImpl.java
+33 -28
View File
@@ -55,6 +55,9 @@ public class RmPppoeConfigMainServiceImpl implements IRmPppoeConfigMainService
RmPppoeConfigSub rmPppoeConfigSub = new RmPppoeConfigSub(); RmPppoeConfigSub rmPppoeConfigSub = new RmPppoeConfigSub();
rmPppoeConfigSub.setClientId(rmPppoeConfigMain.getClientId()); rmPppoeConfigSub.setClientId(rmPppoeConfigMain.getClientId());
List<RmPppoeConfigSub> subList = rmPppoeConfigSubMapper.selectRmPppoeConfigSubList(rmPppoeConfigSub); List<RmPppoeConfigSub> subList = rmPppoeConfigSubMapper.selectRmPppoeConfigSubList(rmPppoeConfigSub);
if(subList == null){
subList = new ArrayList<>();
}
if("1".equals(pppoeConfigMain.getPppoeConfigMode())){ if("1".equals(pppoeConfigMain.getPppoeConfigMode())){
for (RmPppoeConfigSub pppoeConfigSub : subList) { for (RmPppoeConfigSub pppoeConfigSub : subList) {
// 查询流量信息 // 查询流量信息
@@ -129,7 +132,7 @@ public class RmPppoeConfigMainServiceImpl implements IRmPppoeConfigMainService
*/ */
public String convert(String bitStr, String toUnit) { public String convert(String bitStr, String toUnit) {
if (bitStr == null || bitStr.trim().isEmpty()) { if (bitStr == null || bitStr.trim().isEmpty()) {
throw new IllegalArgumentException("bit值不能为空"); return null;
} }
double bits = Double.parseDouble(bitStr.trim()); double bits = Double.parseDouble(bitStr.trim());
@@ -185,42 +188,44 @@ public class RmPppoeConfigMainServiceImpl implements IRmPppoeConfigMainService
.map(RmPppoeConfigSub::toVo) .map(RmPppoeConfigSub::toVo)
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
// 构建pppoe策略
PppoeVo pppoeVo = new PppoeVo();
BeanUtils.copyProperties(rmPppoeConfigMain, pppoeVo);
pppoeVo.setSubList(voList);
String pppoeStr = JSONObject.toJSONString(pppoeVo);
PolicyTypeVo policyTypeVo = new PolicyTypeVo();
policyTypeVo.setPppoeConfig(pppoeStr);
MessageProducer messageProducer = new MessageProducer();
String configJson = JSONObject.toJSONString(policyTypeVo);
DeviceMessage message = new DeviceMessage();
message.setClientId(rmPppoeConfigMain.getClientId());
message.setData(configJson);
message.setDataType(MsgEnum.获取最新策略应答.getValue());
messageProducer.sendAsyncProducerMessage(
producerMode.getAgentTopic(),
"",
"",
JSONObject.toJSONString(message)
);
}else if("2".equals(rmPppoeConfigMain.getPppoeConfigMode())) { }else if("2".equals(rmPppoeConfigMain.getPppoeConfigMode())) {
processBandwidthResult(subList); processBandwidthResult(subList);
} }
// 构建pppoe策略
PppoeVo pppoeVo = new PppoeVo();
BeanUtils.copyProperties(rmPppoeConfigMain, pppoeVo);
pppoeVo.setSubList(voList);
String pppoeStr = JSONObject.toJSONString(pppoeVo);
PolicyTypeVo policyTypeVo = new PolicyTypeVo();
policyTypeVo.setPppoeConfig(pppoeStr);
MessageProducer messageProducer = new MessageProducer();
String configJson = JSONObject.toJSONString(policyTypeVo);
DeviceMessage message = new DeviceMessage();
message.setClientId(rmPppoeConfigMain.getClientId());
message.setData(configJson);
message.setDataType(MsgEnum.获取最新策略应答.getValue());
messageProducer.sendAsyncProducerMessage(
producerMode.getAgentTopic(),
"",
"",
JSONObject.toJSONString(message)
);
return 1; return 1;
} }
public void processBandwidthResult(List<RmPppoeConfigSub> subList){ public void processBandwidthResult(List<RmPppoeConfigSub> subList){
if(subList != null && !subList.isEmpty()){ if(subList != null && !subList.isEmpty()){
for (RmPppoeConfigSub rmPppoeConfigSub : subList) { for (RmPppoeConfigSub rmPppoeConfigSub : subList) {
RmNetworkInterfaceChild insertData = new RmNetworkInterfaceChild(); if(rmPppoeConfigSub.getClientId() != null){
insertData.setBandwidthResult(rmPppoeConfigSub.getBandwidthResult()); RmNetworkInterfaceChild insertData = new RmNetworkInterfaceChild();
insertData.setMacAddress(rmPppoeConfigSub.getMacAddress()); insertData.setBandwidthResult(rmPppoeConfigSub.getBandwidthResult());
insertData.setInterfaceName(rmPppoeConfigSub.getInterfaceName()); insertData.setMacAddress(rmPppoeConfigSub.getMacAddress());
insertData.setClientId(rmPppoeConfigSub.getClientId()); insertData.setInterfaceName(rmPppoeConfigSub.getInterfaceName());
insertData.setNewFlag(1); insertData.setClientId(rmPppoeConfigSub.getClientId());
rmNetworkInterfaceChildMapper.insertRmNetworkInterfaceChild(insertData); insertData.setNewFlag(1);
rmNetworkInterfaceChildMapper.insertRmNetworkInterfaceChild(insertData);
}
} }
} }
} }