From 086471ed4d9d22cc7a775c916a7fbf3eb2fd280c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=9E=97?= <320730042@qq.com> Date: Wed, 28 Aug 2024 16:56:40 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=95=85=E9=9A=9C=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bellmann/common/enums/RemoteOperateMsgEnum.java | 1 + .../bellmann/controller/DeviceStaticController.java | 9 +++++++-- .../com/bellmann/controller/FaultController.java | 5 +++-- .../com/bellmann/service/DeviceStaticService.java | 1 + .../bellmann/service/OperateResultArgsService.java | 3 +++ .../service/impl/DeviceStaticServiceImpl.java | 1 + .../com/bellmann/service/impl/FaultServiceImpl.java | 2 +- .../service/impl/OperateResultArgsServiceImpl.java | 13 +++++++++++++ 8 files changed, 30 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/bellmann/common/enums/RemoteOperateMsgEnum.java b/src/main/java/com/bellmann/common/enums/RemoteOperateMsgEnum.java index bf3891e..922152e 100644 --- a/src/main/java/com/bellmann/common/enums/RemoteOperateMsgEnum.java +++ b/src/main/java/com/bellmann/common/enums/RemoteOperateMsgEnum.java @@ -80,6 +80,7 @@ public enum RemoteOperateMsgEnum implements IBaseEnum { 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; diff --git a/src/main/java/com/bellmann/controller/DeviceStaticController.java b/src/main/java/com/bellmann/controller/DeviceStaticController.java index 33476cb..191ef20 100644 --- a/src/main/java/com/bellmann/controller/DeviceStaticController.java +++ b/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 remoteIpPing(@RequestBody @Valid PingForm form) { + public Result> remoteIpPing(@RequestBody @Valid PingForm form) { Long taskId = deviceStaticService.remoteIpPing(form); boolean isSuccess = deviceStaticService.taskIsSuccess(taskId); - return Result.judge(isSuccess); + Map map = new HashMap<>(); + if (isSuccess) { + map = operateResultArgsService.getPingResult(taskId); + } + return Result.success(map); } @GetMapping("/remote/upload-log/{devId}") @Operation(summary = "远程操作-获取设备日志文件") diff --git a/src/main/java/com/bellmann/controller/FaultController.java b/src/main/java/com/bellmann/controller/FaultController.java index dfa0e6e..df42f17 100644 --- a/src/main/java/com/bellmann/controller/FaultController.java +++ b/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> serviceStatus(@RequestParam Long devId, @RequestParam String remote){ -// Long taskId = remoteOperateTaskService.sendTaskByDevId(devId, SecurityUtils.getUsername(),remote); - Map map = faultService.getServiceStatusResult(17675921L); + Long taskId = remoteOperateTaskService.sendTaskByDevId(devId, SecurityUtils.getUsername(),remote); + Map map = faultService.getServiceStatusResult(taskId); return Result.success(map); } @Operation(summary = "修改ALG功能") diff --git a/src/main/java/com/bellmann/service/DeviceStaticService.java b/src/main/java/com/bellmann/service/DeviceStaticService.java index 8d82a8a..d8b0ffe 100644 --- a/src/main/java/com/bellmann/service/DeviceStaticService.java +++ b/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); + } diff --git a/src/main/java/com/bellmann/service/OperateResultArgsService.java b/src/main/java/com/bellmann/service/OperateResultArgsService.java index 98b88c3..f3d6e0a 100644 --- a/src/main/java/com/bellmann/service/OperateResultArgsService.java +++ b/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; /** *

@@ -21,4 +22,6 @@ public interface OperateResultArgsService { List getServiceInfo(Long devId, String serviceName); List getFTTRPrimaryGateway(Long devId); + + Map getPingResult(Long taskId); } diff --git a/src/main/java/com/bellmann/service/impl/DeviceStaticServiceImpl.java b/src/main/java/com/bellmann/service/impl/DeviceStaticServiceImpl.java index 1ee1ad7..672cbde 100644 --- a/src/main/java/com/bellmann/service/impl/DeviceStaticServiceImpl.java +++ b/src/main/java/com/bellmann/service/impl/DeviceStaticServiceImpl.java @@ -1541,4 +1541,5 @@ public class DeviceStaticServiceImpl implements DeviceStaticService { } return taskIsSuccess(task2DetailStructHolder.value.operTask.operTaskId); } + } diff --git a/src/main/java/com/bellmann/service/impl/FaultServiceImpl.java b/src/main/java/com/bellmann/service/impl/FaultServiceImpl.java index 6e0a438..fee1dbf 100644 --- a/src/main/java/com/bellmann/service/impl/FaultServiceImpl.java +++ b/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; diff --git a/src/main/java/com/bellmann/service/impl/OperateResultArgsServiceImpl.java b/src/main/java/com/bellmann/service/impl/OperateResultArgsServiceImpl.java index f9a2b23..d48bb90 100644 --- a/src/main/java/com/bellmann/service/impl/OperateResultArgsServiceImpl.java +++ b/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; /** *

@@ -115,6 +117,17 @@ public class OperateResultArgsServiceImpl implements OperateResultArgsService { compare.add(build); return compare; + } + @Override + public Map getPingResult(Long taskId) { + List list = operateResultArgsMapper.selectList(new LambdaQueryWrapper() + .eq(OperateResultArgs::getOperTaskId, taskId) + ); + Map map = new HashMap<>(); + list.forEach(obj->{ + map.put(obj.getArgsName(),obj.getArgsValue()); + }); + return map; } }