From 43b6ab16ed0480a09dce7b7c5a3ecdfbef3e41a5 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期六, 04 三月 2023 12:07:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-smoke/src/main/java/com/ycl/smoke/remote/service/ISmokeDetectionService.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 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 4d093a8..4b893a0 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,8 +1,7 @@
package com.ycl.smoke.remote.service;
-import com.ycl.smoke.entity.OdsDetectorDaily;
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;
@@ -34,24 +33,24 @@
SmokeResultResponseDto<DataIntimeResponseDto> listDataIntime(@RequestBody DataIntimeParamDto paramDto,
@RequestHeader("Auth") String token);
- @PostMapping(value = "/admin/listLocale")
- SmokeResultResponseDto<DetectorDailyResponseDto> listLocale(@RequestBody DetectorDailyParamDto paramDto,
- @RequestHeader("Auth") String token);
+ @PostMapping(value = "/admin/listLocale")
+ SmokeResultResponseDto<LocaleResponseDto> listLocale(@RequestBody LocaleParamDto paramDto,
+ @RequestHeader("Auth") String token);
- @PostMapping(value = "/admin/queryCustomer")
- SmokeResultResponseDto<DetectorDailyResponseDto> queryCustomer(@RequestBody DetectorDailyParamDto paramDto,
- @RequestHeader("Auth") String token);
+ @PostMapping(value = "/admin/queryCustomer")
+ SmokeResultResponseDto<CustomerResponseDto> queryCustomer(@RequestBody CustomerParamDto paramDto,
+ @RequestHeader("Auth") String token);
@PostMapping(value = "/admin/listAlarmRecord")
- SmokeResultResponseDto<AlarmMsgResponseDto> getListAlarmRecord(@RequestBody AlarmMsgParamDto paramDto,
+ SmokeResultResponseDto<AlarmRecordResponseDto> getListAlarmRecord(@RequestBody AlarmMsgParamDto paramDto,
@RequestHeader("Auth") String token);
@PostMapping(value = "/admin/listCurAlarm")
- SmokeResultResponseDto<AlarmMsgResponseDto> getListCurAlarm(@RequestBody AlarmMsgParamDto paramDto,
+ SmokeResultResponseDto<CurAlarmResponseDto> getListCurAlarm(@RequestBody CurAlarmParamDto paramDto,
@RequestHeader("Auth") String token);
}
--
Gitblit v1.8.0