Merge remote-tracking branch 'origin/master'

MercuryZ

2022-03-31 ef270bd1855b5ce3f398c5df024840a498e33a8f

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingController.java

@@ -15,7 +15,7 @@
import java.util.List;

/**
 * 灯杆倾斜
 * 灯杆倾斜警告列表
 */
@RestController
@AllArgsConstructor
@@ -64,11 +64,13 @@
     */
    @PostMapping("/RestartLightPoleHeeling")
    public ResponseVO<Object> RestartLightPoleHeeling(@RequestBody @Validated LightPoleHeelingParam lightPoleHeelingParam) {
        if ("操作成功".equals(lightPoleHeelingService.RestartLightPoleHeeling(lightPoleHeelingParam.getDeviceName()))) {
            return ResponseUtil.success(lightPoleHeelingService.RestartLightPoleHeeling(lightPoleHeelingParam.getDeviceName()));
        String result = lightPoleHeelingService.RestartLightPoleHeeling(lightPoleHeelingParam.getDeviceName());
        if ("操作成功".equals(result)) {
            return ResponseUtil.success(result);
        } else {
            return ResponseUtil.fail(lightPoleHeelingService.RestartLightPoleHeeling(lightPoleHeelingParam.getDeviceName()));
            return ResponseUtil.fail(result);
        }

    }

    /**
@@ -76,11 +78,13 @@
     */
    @PostMapping("/SetHeartbeatPacketTime")
    public ResponseVO<Object> SetHeartbeatPacketTime(@RequestBody @Validated LightPoleHeelingParam lightPoleHeelingParam) {
        if ("操作成功".equals(lightPoleHeelingService.RestartLightPoleHeeling(lightPoleHeelingParam.getDeviceName()))) {
            return ResponseUtil.success(lightPoleHeelingService.SetHeartbeatPacketTime(lightPoleHeelingParam.getDeviceName(), lightPoleHeelingParam.getTime()));
        String result = lightPoleHeelingService.SetHeartbeatPacketTime(lightPoleHeelingParam.getDeviceName(), lightPoleHeelingParam.getTime());
        if ("操作成功".equals(result)) {
            return ResponseUtil.success(result);
        } else {
            return ResponseUtil.fail(lightPoleHeelingService.SetHeartbeatPacketTime(lightPoleHeelingParam.getDeviceName(), lightPoleHeelingParam.getTime()));
            return ResponseUtil.fail(result);
        }

    }

    /**
@@ -88,11 +92,11 @@
     */
    @PostMapping("/SetSensorState")
    public ResponseVO<Object> SetSensorState(@RequestBody @Validated LightPoleHeelingParam lightPoleHeelingParam) {
        if ("操作成功".equals(lightPoleHeelingService.RestartLightPoleHeeling(lightPoleHeelingParam.getDeviceName()))) {
            return ResponseUtil.success(lightPoleHeelingService.SetSensorState(lightPoleHeelingParam.getDeviceName()));
        String result = lightPoleHeelingService.SetSensorState(lightPoleHeelingParam.getDeviceName());
        if ("操作成功".equals(result)) {
            return ResponseUtil.success(result);
        } else {
            return ResponseUtil.fail(lightPoleHeelingService.SetSensorState(lightPoleHeelingParam.getDeviceName()));
            return ResponseUtil.fail(result);
        }

    }
}