feat: 故障管理

src/main/java/com/bellmann/common/enums/RemoteOperateMsgEnum.java

@@ -80,6 +80,7 @@ public enum RemoteOperateMsgEnum implements IBaseEnum<String> {
     LINK_INFO_QUERY_DSL("LinkInfoQueryDSL","LinkInfoQueryDSL"),
     Digital_home_Query_DSL("DigitalhomeQueryDSL","DigitalhomeQueryDSL"),
     LAN_ACTIVE_QUERY("LanActiveQuery","LanActiveQuery"),
+    IPTV_QUERY_DSL("IptvQueryDSL","IptvQueryDSL"),
     ;
     @Getter
     private String value;

src/main/java/com/bellmann/controller/DeviceStaticController.java

@@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -201,10 +202,14 @@ public class DeviceStaticController {
     @Operation(summary = "远程操作-设备Ping测试")
     @PreAuthorize("@ss.hasPerm('family:remote:ping:test')")
     @PreventDuplicateSubmit
-    public Result<String> remoteIpPing(@RequestBody @Valid PingForm form) {
+    public Result<Map<String, String>> remoteIpPing(@RequestBody @Valid PingForm form) {
         Long taskId = deviceStaticService.remoteIpPing(form);
         boolean isSuccess = deviceStaticService.taskIsSuccess(taskId);
-        return Result.judge(isSuccess);
+        Map<String, String> map = new HashMap<>();
+        if (isSuccess) {
+             map = operateResultArgsService.getPingResult(taskId);
+        }
+        return Result.success(map);
     }
     @GetMapping("/remote/upload-log/{devId}")
     @Operation(summary = "远程操作-获取设备日志文件")

src/main/java/com/bellmann/controller/FaultController.java

@@ -10,6 +10,7 @@ import com.bellmann.model.vo.FaultBasicInfoVO;
 import com.bellmann.model.vo.FaultDiagnosisResult;
 import com.bellmann.model.vo.FaultQueryVO;
 import com.bellmann.plugin.dupsubmit.annotation.PreventDuplicateSubmit;
+import com.bellmann.security.util.SecurityUtils;
 import com.bellmann.service.DeviceStaticService;
 import com.bellmann.service.FaultService;
 import com.bellmann.service.RemoteOperateTaskService;
@@ -58,8 +59,8 @@ public class FaultController {
     @Operation(summary = "业务/终端状态")
     @GetMapping("/basic_info/service_status")
     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(17675921L);
+        Map<String,String> map = faultService.getServiceStatusResult(taskId);
         return Result.success(map);
     }
     @Operation(summary = "修改ALG功能")

src/main/java/com/bellmann/service/DeviceStaticService.java

@@ -82,4 +82,5 @@ public interface DeviceStaticService {
 
     boolean deleteInstanceNode(Long devId, String nodePath);
     boolean taskIsSuccess(Long taskId);
+
 }

src/main/java/com/bellmann/service/OperateResultArgsService.java

@@ -5,6 +5,7 @@ import com.bellmann.model.vo.FTTRInfoVO;
 import com.bellmann.model.vo.ServiceCompareVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +22,6 @@ public interface OperateResultArgsService {
     List<ServiceCompareVO> getServiceInfo(Long devId, String serviceName);
 
     List<FTTRInfoVO> getFTTRPrimaryGateway(Long devId);
+
+    Map<String, String> getPingResult(Long taskId);
 }

src/main/java/com/bellmann/service/impl/DeviceStaticServiceImpl.java

@@ -1541,4 +1541,5 @@ public class DeviceStaticServiceImpl implements DeviceStaticService {
         }
         return taskIsSuccess(task2DetailStructHolder.value.operTask.operTaskId);
     }
+
 }

src/main/java/com/bellmann/service/impl/FaultServiceImpl.java

@@ -234,7 +234,7 @@ public class FaultServiceImpl implements FaultService {
         PingForm pingForm = new PingForm();
         pingForm.setDeviceId(devId);
         pingForm.setHost(deviceDynamic.getDevIp());
-        pingForm.setPackSize("30");
+        pingForm.setPackSize("32");
         pingForm.setPingNumber("3");
         pingForm.setPingInterface("INTERNET");
         return pingForm;

src/main/java/com/bellmann/service/impl/OperateResultArgsServiceImpl.java

@@ -20,7 +20,9 @@ import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -115,6 +117,17 @@ public class OperateResultArgsServiceImpl implements OperateResultArgsService {
         compare.add(build);
         return compare;
 
+    }
 
+    @Override
+    public Map<String, String> getPingResult(Long taskId) {
+        List<OperateResultArgs> list = operateResultArgsMapper.selectList(new LambdaQueryWrapper<OperateResultArgs>()
+                .eq(OperateResultArgs::getOperTaskId, taskId)
+        );
+        Map<String,String> map = new HashMap<>();
+        list.forEach(obj->{
+            map.put(obj.getArgsName(),obj.getArgsValue());
+        });
+        return map;
     }
 }