From ead280567beb29e26e0980c6b3770815e6fe86d9 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期日, 12 十一月 2023 10:09:14 +0800
Subject: [PATCH] 油烟统计
---
ycl-smoke/src/main/java/com/ycl/smoke/remote/service/ISmokeDetectionService.java | 68 +++++++++++++++++++++++----------
1 files changed, 47 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 4d093a8..123c83c 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;
@@ -11,47 +10,74 @@
import java.util.List;
-@FeignClient(url = "http://116.62.234.187:8088", name = "smokeApi")
+@FeignClient(url = "116.62.234.187:8120", 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 DetectorDailyParamDto paramDto,
- @RequestHeader("Auth") String token);
+ String listLocale(@RequestBody LocaleParamDto paramDto,
+ @RequestHeader("Auth") String token);
@PostMapping(value = "/admin/queryCustomer")
- SmokeResultResponseDto<DetectorDailyResponseDto> queryCustomer(@RequestBody DetectorDailyParamDto 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);
+ /**
+ * 鎬讳綋鎯呭喌
+ *
+ * @param {"Typ":1,"WithAreaLocaleReport":false,"AcquitDateBegin":"2023-10-12","AcquitDateEnd":"2023-11-11"}:
+ * @param token
+ * @return
+ */
+ @PostMapping(value = "/admin/listDataDetectorDailyStats")
+ String getListDataDetectorDailyStats(@RequestBody DataDetectorDailyStatsParamDto paramDto,
+ @RequestHeader("Auth") String token);
+ /**
+ * 娌圭儫鍑忔帓
+ *
+ * @param {"StartAt":0,"Size":20,"Param":{"startAt":1697040000,"endAt":1699631999}}:
+ * @param token
+ * @return
+ */
+ @PostMapping(value = "/admin/listDetectorDaily")
+ String getListDetectorDaily(@RequestBody CurAlarmParam2Dto paramDto,
+ @RequestHeader("Auth") String token);
+
+ /**
+ * 鐩戞祴鎶ヨ缁熻 杩愮淮鎯呭喌鎶ヨ〃
+ *
+ * @param {"StartAt":0,"Size":20,"Typ":2,"SortBy":"status","SortMode":"asc","Param":{"StartAt":1696953600,"EndAt":1699545600,"LocaleWithDevice":true}}:
+ * @param token
+ * @return
+ */
@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