From 2b59293282a3245208531a924173e87518f5a1c1 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 15 八月 2023 21:14:34 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-smoke/src/main/java/com/ycl/smoke/remote/service/ISmokeDetectionService.java | 40 +++++++++++++++++++---------------------
1 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/remote/service/ISmokeDetectionService.java b/ycl-smoke/src/main/java/com/ycl/smoke/remote/service/ISmokeDetectionService.java
index 99ea1a1..3cd8410 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/remote/service/ISmokeDetectionService.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/remote/service/ISmokeDetectionService.java
@@ -1,7 +1,7 @@
package com.ycl.smoke.remote.service;
import com.ycl.smoke.entity.OdsTenMinData;
-import com.ycl.smoke.remote.dto.*;
+import com.ycl.smoke.dto.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -10,47 +10,45 @@
import java.util.List;
-@FeignClient(url = "http://116.62.234.187:8088", name = "smokeApi")
+@FeignClient(url = "116.62.234.187:8088", name = "smokeApi")
public interface ISmokeDetectionService {
@PostMapping(value = "/loginAction")
- SmokeResultResponseDto<LoginResponseDto> loginAction(@RequestBody LoginParamDto paramDto);
+ String loginAction(@RequestBody LoginParamDto paramDto);
@PostMapping(value = "/admin/listAlarmMsg")
- SmokeResultResponseDto<AlarmMsgResponseDto> getListAlarmMsg(@RequestBody AlarmMsgParamDto paramDto,
- @RequestHeader("Auth") String token);
+ String getListAlarmMsg(@RequestBody AlarmMsgParamDto paramDto,
+ @RequestHeader("Auth") String token);
@PostMapping(value = "/admin/queryDataDetectorDaily2")
- SmokeResultResponseDto<DetectorDailyResponseDto> queryDataDetectorDaily2(@RequestBody DetectorDailyParamDto paramDto,
- @RequestHeader("Auth") String token);
+ String queryDataDetectorDaily2(@RequestBody DetectorDailyParamDto paramDto,
+ @RequestHeader("Auth") String token);
@PostMapping(value = "/admin/queryTenMinData")
- SmokeResultResponseDto<List<OdsTenMinData>> queryTenMinData(@RequestBody TenMinParamDto paramDto,
- @RequestHeader("Auth") String token);
+ String queryTenMinData(@RequestBody TenMinParamDto paramDto,
+ @RequestHeader("Auth") String token);
@PostMapping(value = "/admin/listDataIntime")
- SmokeResultResponseDto<DataIntimeResponseDto> listDataIntime(@RequestBody DataIntimeParamDto paramDto,
- @RequestHeader("Auth") String token);
+ String listDataIntime(@RequestBody DataIntimeParamDto paramDto,
+ @RequestHeader("Auth") String token);
@PostMapping(value = "/admin/listLocale")
- SmokeResultResponseDto<DetectorDailyResponseDto> listLocale(@RequestBody LocaleParamDto paramDto,
- @RequestHeader("Auth") String token);
+ String listLocale(@RequestBody LocaleParamDto paramDto,
+ @RequestHeader("Auth") String token);
@PostMapping(value = "/admin/queryCustomer")
- SmokeResultResponseDto<DetectorDailyResponseDto> queryCustomer(@RequestBody CustomerParamDto paramDto,
- @RequestHeader("Auth") String token);
-
+ String queryCustomer(@RequestBody CustomerParamDto paramDto,
+ @RequestHeader("Auth") String token);
@PostMapping(value = "/admin/listAlarmRecord")
- SmokeResultResponseDto<AlarmMsgResponseDto> getListAlarmRecord(@RequestBody AlarmMsgParamDto paramDto,
- @RequestHeader("Auth") String token);
-
+ String getListAlarmRecord(@RequestBody AlarmMsgParamDto paramDto,
+ @RequestHeader("Auth") String token);
@PostMapping(value = "/admin/listCurAlarm")
- SmokeResultResponseDto<AlarmMsgResponseDto> getListCurAlarm(@RequestBody AlarmMsgParamDto paramDto,
- @RequestHeader("Auth") String token);
+ String getListCurAlarm(@RequestBody CurAlarmParamDto paramDto,
+ @RequestHeader("Auth") String token);
}
--
Gitblit v1.8.0