feat: 故障管理-有线无法上网

master
李小林 6 months ago
parent 2febdb4218
commit 6c40f63ccf
  1. 4
      src/main/java/com/bellmann/common/enums/RemoteOperateMsgEnum.java
  2. 4
      src/main/java/com/bellmann/common/result/ResultCode.java
  3. 16
      src/main/java/com/bellmann/controller/FaultController.java
  4. 3
      src/main/java/com/bellmann/service/FaultService.java
  5. 30
      src/main/java/com/bellmann/service/impl/FaultServiceImpl.java

@ -76,6 +76,10 @@ public enum RemoteOperateMsgEnum implements IBaseEnum<String> {
ALG_QUERY("AlgQuery","AlgQuery"), ALG_QUERY("AlgQuery","AlgQuery"),
CPE_NUMBER_QUERY("CpeNumberQuery","CpeNumberQuery"), CPE_NUMBER_QUERY("CpeNumberQuery","CpeNumberQuery"),
LINK_INFO_QUERY_DSL("LinkInfoQueryDSL","LinkInfoQueryDSL"),
Digital_home_Query_DSL("DigitalhomeQueryDSL","DigitalhomeQueryDSL"),
LAN_ACTIVE_QUERY("LanActiveQuery","LanActiveQuery"),
; ;
@Getter @Getter
private String value; private String value;

@ -138,8 +138,8 @@ public enum ResultCode implements IResultCode, Serializable {
FAILED_TO_CHANGE_THE_PASSWORD("F0044","修改密码失败"), FAILED_TO_CHANGE_THE_PASSWORD("F0044","修改密码失败"),
FAILED_TO_READ_DEVICE_SEQUENCE_FILE("F0045","读取设备序列号文件失败"), FAILED_TO_READ_DEVICE_SEQUENCE_FILE("F0045","读取设备序列号文件失败"),
PLEASE_UPLOAD_THE_TXT_FILE_TYPE("F0046","请上传txt文件类型" ), PLEASE_UPLOAD_THE_TXT_FILE_TYPE("F0046","请上传txt文件类型" ),
THE_INTERFACE_CONNECTION_TIMED_OUT("F0047","接口连接超时,请检查设备是否在线") THE_INTERFACE_CONNECTION_TIMED_OUT("F0047","接口连接超时,请检查设备是否在线"),
; IP_IS_NULL("F0048","设备IP为null" );
@Override @Override
public String getCode() { public String getCode() {

@ -4,10 +4,12 @@ import com.bellmann.common.result.Result;
import com.bellmann.common.result.ResultCode; import com.bellmann.common.result.ResultCode;
import com.bellmann.model.form.AlgForm; import com.bellmann.model.form.AlgForm;
import com.bellmann.model.form.CpeForm; import com.bellmann.model.form.CpeForm;
import com.bellmann.model.form.PingForm;
import com.bellmann.model.query.FaultQuery; import com.bellmann.model.query.FaultQuery;
import com.bellmann.model.vo.FaultBasicInfoVO; import com.bellmann.model.vo.FaultBasicInfoVO;
import com.bellmann.model.vo.FaultDiagnosisResult; import com.bellmann.model.vo.FaultDiagnosisResult;
import com.bellmann.model.vo.FaultQueryVO; import com.bellmann.model.vo.FaultQueryVO;
import com.bellmann.plugin.dupsubmit.annotation.PreventDuplicateSubmit;
import com.bellmann.service.DeviceStaticService; import com.bellmann.service.DeviceStaticService;
import com.bellmann.service.FaultService; import com.bellmann.service.FaultService;
import com.bellmann.service.RemoteOperateTaskService; import com.bellmann.service.RemoteOperateTaskService;
@ -57,7 +59,7 @@ public class FaultController {
@GetMapping("/basic_info/service_status") @GetMapping("/basic_info/service_status")
public Result<Map<String,String>> serviceStatus(@RequestParam Long devId, @RequestParam String remote){ public Result<Map<String,String>> serviceStatus(@RequestParam Long devId, @RequestParam String remote){
// Long taskId = remoteOperateTaskService.sendTaskByDevId(devId, SecurityUtils.getUsername(),remote); // Long taskId = remoteOperateTaskService.sendTaskByDevId(devId, SecurityUtils.getUsername(),remote);
Map<String,String> map = faultService.getServiceStatusResult(17675863L); Map<String,String> map = faultService.getServiceStatusResult(17675921L);
return Result.success(map); return Result.success(map);
} }
@Operation(summary = "修改ALG功能") @Operation(summary = "修改ALG功能")
@ -81,4 +83,16 @@ public class FaultController {
} }
return Result.failed(ResultCode.THE_INTERFACE_CONNECTION_TIMED_OUT); return Result.failed(ResultCode.THE_INTERFACE_CONNECTION_TIMED_OUT);
} }
@Operation(summary = "ping一个特定的DNS")
@GetMapping("/ping-dns")
@PreventDuplicateSubmit
public Result<Map<String,String>> pingDns(@RequestParam Long devId, @RequestParam String remote){
PingForm pingForm = faultService.pingDnsForm(devId);
Long taskId = deviceStaticService.remoteIpPing(pingForm);
Map<String,String> map = faultService.getServiceStatusResult(taskId);
map.put("IP",pingForm.getHost());
map.put("PackSize",pingForm.getPackSize());
map.put("Number",pingForm.getPingNumber());
return Result.success(map);
}
} }

@ -1,5 +1,6 @@
package com.bellmann.service; package com.bellmann.service;
import com.bellmann.model.form.PingForm;
import com.bellmann.model.query.FaultQuery; import com.bellmann.model.query.FaultQuery;
import com.bellmann.model.vo.FaultBasicInfoVO; import com.bellmann.model.vo.FaultBasicInfoVO;
import com.bellmann.model.vo.FaultDiagnosisResult; import com.bellmann.model.vo.FaultDiagnosisResult;
@ -16,4 +17,6 @@ public interface FaultService {
FaultDiagnosisResult basicInfoDiagnosis(Long devId, String remote); FaultDiagnosisResult basicInfoDiagnosis(Long devId, String remote);
Map<String, String> getServiceStatusResult(Long taskId); Map<String, String> getServiceStatusResult(Long taskId);
PingForm pingDnsForm(Long devId);
} }

@ -10,15 +10,10 @@ import com.bellmann.common.result.ResultCode;
import com.bellmann.common.util.CommonUtils; import com.bellmann.common.util.CommonUtils;
import com.bellmann.manger.CustomerManager; import com.bellmann.manger.CustomerManager;
import com.bellmann.manger.impl.DataDictManager; import com.bellmann.manger.impl.DataDictManager;
import com.bellmann.mapper.DeviceStaticMapper; import com.bellmann.mapper.*;
import com.bellmann.mapper.DeviceTypeVerDetailMapper;
import com.bellmann.mapper.OperateResult2Mapper;
import com.bellmann.mapper.OperateResultArgsMapper;
import com.bellmann.model.dto.OperationTask; import com.bellmann.model.dto.OperationTask;
import com.bellmann.model.entity.Customer; import com.bellmann.model.entity.*;
import com.bellmann.model.entity.DeviceTypeVerDetail; import com.bellmann.model.form.PingForm;
import com.bellmann.model.entity.OperateResult2;
import com.bellmann.model.entity.OperateResultArgs;
import com.bellmann.model.query.FaultQuery; import com.bellmann.model.query.FaultQuery;
import com.bellmann.model.vo.FaultBasicInfoVO; import com.bellmann.model.vo.FaultBasicInfoVO;
import com.bellmann.model.vo.FaultDiagnosisResult; import com.bellmann.model.vo.FaultDiagnosisResult;
@ -56,6 +51,8 @@ public class FaultServiceImpl implements FaultService {
private final OperateResultArgsMapper operateResultArgsMapper; private final OperateResultArgsMapper operateResultArgsMapper;
private final DeviceDynamicMapper deviceDynamicMapper;
@Override @Override
public List<FaultQueryVO> queryList(FaultQuery query) { public List<FaultQueryVO> queryList(FaultQuery query) {
return deviceStaticMapper.faultQueryList(query.getLabel(), query.getValue()); return deviceStaticMapper.faultQueryList(query.getLabel(), query.getValue());
@ -225,4 +222,21 @@ public class FaultServiceImpl implements FaultService {
} }
} }
@Override
public PingForm pingDnsForm(Long devId) {
DeviceDynamic deviceDynamic = deviceDynamicMapper.selectOne(new LambdaQueryWrapper<DeviceDynamic>()
.eq(DeviceDynamic::getDevId, devId)
);
if (deviceDynamic==null|| deviceDynamic.getDevIp()==null){
throw new BusinessException(ResultCode.IP_IS_NULL);
}
PingForm pingForm = new PingForm();
pingForm.setDeviceId(devId);
pingForm.setHost(deviceDynamic.getDevIp());
pingForm.setPackSize("30");
pingForm.setPingNumber("3");
pingForm.setPingInterface("INTERNET");
return pingForm;
}
} }

Loading…
Cancel
Save