From 1ded71f8fe1b7ac7746e6ea6e09b7db4a4000340 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 03 三月 2023 14:54:06 +0800
Subject: [PATCH] 油烟对外接口
---
ycl-smoke/src/main/java/com/ycl/smoke/remote/service/ISmokeDetectionService.java | 24 +-
ycl-smoke/src/main/resources/mapper/smoke/OdsLocaleMapper.xml | 13
ycl-smoke/src/main/java/com/ycl/smoke/dto/SmokeResultResponseDto.java | 2
ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCurAlarm.java | 49 ++++
ycl-smoke/src/main/java/com/ycl/smoke/dto/CustomerResponseDto.java | 3
ycl-smoke/src/main/java/com/ycl/smoke/dto/CustomerParamDto.java | 14 +
ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmMsgResponseDto.java | 2
ycl-smoke/src/main/java/com/ycl/smoke/dto/LoginParamDto.java | 30 +++
ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmMsgDataVo.java | 2
ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmMsgParamDto.java | 9
ycl-smoke/src/main/java/com/ycl/smoke/controller/smoke/SmokeController.java | 73 ++++++++
ycl-smoke/src/main/java/com/ycl/smoke/dto/CurAlarmParamChildDto.java | 43 ++++
ycl-smoke/src/main/java/com/ycl/smoke/dto/CurAlarmParamDto.java | 46 +++++
ycl-smoke/src/main/java/com/ycl/smoke/dto/DataIntimeParamChildDto.java | 27 +++
ycl-smoke/src/main/java/com/ycl/smoke/dto/LocaleParamOwnerDto.java | 19 ++
ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocale.java | 1
ycl-smoke/src/main/java/com/ycl/smoke/dto/CurAlarmResponseDto.java | 8
ycl-smoke/src/main/java/com/ycl/smoke/dto/LocaleParamDto.java | 32 +++
ycl-smoke/src/main/java/com/ycl/smoke/dto/DataIntimeParamDto.java | 12 +
ycl-smoke/src/main/java/com/ycl/smoke/dto/LocaleResponseDto.java | 3
ycl-smoke/src/main/java/com/ycl/smoke/dto/DetectorDailyResponseDto.java | 3
ycl-smoke/src/main/java/com/ycl/smoke/dto/DataIntimeResponseDto.java | 3
ycl-smoke/src/main/java/com/ycl/smoke/dto/DetectorDailyParamDto.java | 12 +
/dev/null | 22 --
ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java | 4
ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmRecordResponseDto.java | 8
ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmMsgParamDateDto.java | 10 +
ycl-smoke/src/main/java/com/ycl/smoke/dto/LoginResponseDto.java | 2
ycl-smoke/src/main/java/com/ycl/smoke/dto/TenMinParamDto.java | 28 +++
ycl-smoke/src/main/java/com/ycl/smoke/dto/ResultsPageInfo.java | 2
30 files changed, 426 insertions(+), 80 deletions(-)
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/controller/smoke/SmokeController.java b/ycl-smoke/src/main/java/com/ycl/smoke/controller/smoke/SmokeController.java
new file mode 100644
index 0000000..3939151
--- /dev/null
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/controller/smoke/SmokeController.java
@@ -0,0 +1,73 @@
+package com.ycl.smoke.controller.smoke;
+
+import com.ycl.service.redis.RedisService;
+import com.ycl.smoke.dto.*;
+import com.ycl.smoke.entity.OdsTenMinData;
+import com.ycl.smoke.remote.service.ISmokeDetectionService;
+import com.ycl.utils.redis.RedisKey;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Api(tags = "椹鹃┒鑸辨暟鎹帴鍙�-AI鐗╄仈")
+@RestController
+@RequestMapping("/api/smoke")
+public class SmokeController {
+ ISmokeDetectionService smokeDetectionService;
+
+ @Autowired
+ public void setSmokeDetectionService(ISmokeDetectionService smokeDetectionService) {
+ this.smokeDetectionService = smokeDetectionService;
+ }
+
+ @Resource
+ private RedisService redisService;
+
+ @PostMapping(value = "/listAlarmMsg")
+ public SmokeResultResponseDto<AlarmMsgResponseDto> getListAlarmMsg(@RequestBody AlarmMsgParamDto params) {
+
+ return smokeDetectionService.getListAlarmMsg(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
+ }
+
+ @PostMapping(value = "/queryDataDetectorDaily2")
+ public SmokeResultResponseDto<DetectorDailyResponseDto> queryDataDetectorDaily2(@RequestBody DetectorDailyParamDto params) {
+
+ return smokeDetectionService.queryDataDetectorDaily2(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
+ }
+
+ @PostMapping(value = "/queryTenMinData")
+ public SmokeResultResponseDto<List<OdsTenMinData>> queryTenMinData(@RequestBody TenMinParamDto params) {
+ return smokeDetectionService.queryTenMinData(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
+ }
+
+ @PostMapping(value = "/listDataIntime")
+ public SmokeResultResponseDto<DataIntimeResponseDto> listDataIntime(@RequestBody DataIntimeParamDto params) {
+ return smokeDetectionService.listDataIntime(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
+ }
+
+ @PostMapping(value = "/listLocale")
+ public SmokeResultResponseDto<LocaleResponseDto> listLocale(@RequestBody LocaleParamDto params) {
+ return smokeDetectionService.listLocale(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
+ }
+
+ @PostMapping(value = "/queryCustomer")
+ public SmokeResultResponseDto<CustomerResponseDto> queryCustomer(@RequestBody CustomerParamDto params) {
+ return smokeDetectionService.queryCustomer(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
+ }
+
+
+ @PostMapping(value = "/listAlarmRecord")
+ public SmokeResultResponseDto<AlarmRecordResponseDto> getListAlarmRecord(@RequestBody AlarmMsgParamDto params) {
+ return smokeDetectionService.getListAlarmRecord(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
+ }
+
+ @PostMapping(value = "/listCurAlarm")
+ public SmokeResultResponseDto<CurAlarmResponseDto> getListCurAlarm(@RequestBody CurAlarmParamDto params) {
+ return smokeDetectionService.getListCurAlarm(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
+ }
+
+}
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgDataVo.java b/ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmMsgDataVo.java
similarity index 93%
rename from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgDataVo.java
rename to ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmMsgDataVo.java
index f62c071..b712228 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgDataVo.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmMsgDataVo.java
@@ -1,4 +1,4 @@
-package com.ycl.smoke.remote.dto;
+package com.ycl.smoke.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgParamDateDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmMsgParamDateDto.java
similarity index 61%
rename from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgParamDateDto.java
rename to ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmMsgParamDateDto.java
index 07bec89..8c0382b 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgParamDateDto.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmMsgParamDateDto.java
@@ -1,31 +1,39 @@
-package com.ycl.smoke.remote.dto;
+package com.ycl.smoke.dto;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
@Builder
+@EqualsAndHashCode(callSuper = false)
public class AlarmMsgParamDateDto {
/**
* 鏌ヨ鍒涘缓鎶ヨ鏃ユ湡
*/
+ @JsonProperty("CreatedAt")
private String CreatedAt;
/**
* ExceedStandard瓒呮爣,AbnormalOffline 寮傚父绂荤嚎
*/
+ @JsonProperty("msg_type")
private String msg_type;
/**
* 璧峰鏃堕棿鎴�
*/
+ @JsonProperty("Begin")
private Long Begin;
/**
* 缁撴潫鏃堕棿鎴�
*/
+ @JsonProperty("End")
private Long End;
/**
* 璁惧缂栫爜
*/
+ @JsonProperty("mn")
private String mn;
}
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgParamDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmMsgParamDto.java
similarity index 61%
rename from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgParamDto.java
rename to ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmMsgParamDto.java
index 159524a..7fc27a1 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgParamDto.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmMsgParamDto.java
@@ -1,27 +1,34 @@
-package com.ycl.smoke.remote.dto;
+package com.ycl.smoke.dto;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
@Builder
+@EqualsAndHashCode(callSuper = false)
public class AlarmMsgParamDto {
/**
* 璧峰浣嶇疆 - 蹇呭～
*/
+ @JsonProperty("StartAt")
private Integer StartAt;
/**
* 璇锋眰鏁伴噺 - 蹇呭～
*/
+ @JsonProperty("Size")
private Integer Size;
/**
* 1锛氳秴鏍�2锛氬紓甯� - 蹇呭～
*/
+ @JsonProperty("Typ")
private Integer Typ;
/**
* 鏌ヨ鍒涘缓鎶ヨ鏃ユ湡
*/
+ @JsonProperty("Param")
private AlarmMsgParamDateDto Param;
}
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgResponseDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmMsgResponseDto.java
similarity index 91%
rename from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgResponseDto.java
rename to ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmMsgResponseDto.java
index 425532d..c52020d 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgResponseDto.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmMsgResponseDto.java
@@ -1,4 +1,4 @@
-package com.ycl.smoke.remote.dto;
+package com.ycl.smoke.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.ycl.smoke.entity.OdsAlarmMsg;
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgResponseDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmRecordResponseDto.java
similarity index 62%
copy from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgResponseDto.java
copy to ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmRecordResponseDto.java
index 425532d..5f1c99d 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgResponseDto.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/dto/AlarmRecordResponseDto.java
@@ -1,7 +1,7 @@
-package com.ycl.smoke.remote.dto;
+package com.ycl.smoke.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ycl.smoke.entity.OdsAlarmMsg;
+import com.ycl.smoke.entity.OdsAlarmRecord;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -9,10 +9,10 @@
@Data
@NoArgsConstructor
-public class AlarmMsgResponseDto {
+public class AlarmRecordResponseDto {
@JsonProperty("content")
- private List<OdsAlarmMsg> content;
+ private List<OdsAlarmRecord> content;
@JsonProperty("total")
private Integer total;
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/dto/CurAlarmParamChildDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/dto/CurAlarmParamChildDto.java
new file mode 100644
index 0000000..96dae28
--- /dev/null
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/dto/CurAlarmParamChildDto.java
@@ -0,0 +1,43 @@
+package com.ycl.smoke.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@Builder
+@EqualsAndHashCode(callSuper = false)
+public class CurAlarmParamChildDto {
+ /**
+ * 鏄� 鏄惁闇�瑕佹渶楂樻祿搴︽棩鏈�
+ */
+ @JsonProperty("WithCEmissionsMaxDate")
+ public Boolean WithCEmissionsMaxDate;
+ /**
+ * 鏄� 鏌ヨ璧峰鏃堕棿
+ */
+ @JsonProperty("StartAt")
+ public Long StartAt;
+ /**
+ * 鏄� 鏌ヨ缁撴潫鏃堕棿
+ */
+ @JsonProperty("EndAt")
+ public Long EndAt;
+ /**
+ * 鍚� 鍋ュ悍鐮侀鑹�
+ */
+ @JsonProperty("HealthCodeColor")
+ public String HealthCodeColor;
+ /**
+ * 鍚� 璁惧缂栫爜
+ */
+ @JsonProperty("mn")
+ public String mn;
+ /**
+ * 25 鍚� 鎵�灞炲崟浣�
+ */
+ @JsonProperty("Owner")
+ public String Owner;
+
+}
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/dto/CurAlarmParamDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/dto/CurAlarmParamDto.java
new file mode 100644
index 0000000..c5fc479
--- /dev/null
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/dto/CurAlarmParamDto.java
@@ -0,0 +1,46 @@
+package com.ycl.smoke.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@Builder
+@EqualsAndHashCode(callSuper = false)
+public class CurAlarmParamDto {
+ /**
+ * 璧峰浣嶇疆 - 蹇呭～
+ */
+ @JsonProperty("StartAt")
+ private Integer StartAt;
+ /**
+ * 璇锋眰鏁伴噺 - 蹇呭～
+ */
+ @JsonProperty("Size")
+ private Integer Size;
+ /**
+ * 1锛氳秴鏍�2锛氬紓甯� - 蹇呭～
+ */
+ @JsonProperty("Typ")
+ private Integer Typ;
+
+ /**
+ * 鎺掑簭渚濇嵁 - 鍚�
+ */
+ @JsonProperty("SortBy")
+ private String SortBy;
+ /**
+ * 鍗囧簭銆侀檷搴�
+ */
+ @JsonProperty("SortMode")
+ private String SortMode;
+ /**
+ *
+ */
+ @JsonProperty("Param")
+ private CurAlarmParamChildDto Param;
+}
+
+
+
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgResponseDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/dto/CurAlarmResponseDto.java
similarity index 62%
copy from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgResponseDto.java
copy to ycl-smoke/src/main/java/com/ycl/smoke/dto/CurAlarmResponseDto.java
index 425532d..da56249 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/AlarmMsgResponseDto.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/dto/CurAlarmResponseDto.java
@@ -1,7 +1,7 @@
-package com.ycl.smoke.remote.dto;
+package com.ycl.smoke.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ycl.smoke.entity.OdsAlarmMsg;
+import com.ycl.smoke.entity.OdsCurAlarm;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -9,10 +9,10 @@
@Data
@NoArgsConstructor
-public class AlarmMsgResponseDto {
+public class CurAlarmResponseDto {
@JsonProperty("content")
- private List<OdsAlarmMsg> content;
+ private List<OdsCurAlarm> content;
@JsonProperty("total")
private Integer total;
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/CustomerParamDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/dto/CustomerParamDto.java
similarity index 64%
rename from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/CustomerParamDto.java
rename to ycl-smoke/src/main/java/com/ycl/smoke/dto/CustomerParamDto.java
index 99097fe..710284a 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/CustomerParamDto.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/dto/CustomerParamDto.java
@@ -1,43 +1,53 @@
-package com.ycl.smoke.remote.dto;
+package com.ycl.smoke.dto;
-import cn.hutool.core.lang.Pid;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
@Builder
+@EqualsAndHashCode(callSuper = false)
public class CustomerParamDto {
/**
* 蹇呭～ 璧峰浣嶇疆
*/
+ @JsonProperty("page")
private Integer page;
/**
* 鏄� 璇锋眰鏁伴噺
*/
+ @JsonProperty("perpage")
private Integer perpage;
/**
* 鏄� 1:绯荤粺鐢ㄦ埛2:缁忛攢鍗曚綅3:琛屾斂鍗曚綅4:椁愰ギ鍗曚綅
*/
+ @JsonProperty("Typ")
private Integer Typ;
/**
* 鍚� 鍗曚綅鍚嶇О
*/
+ @JsonProperty("Org")
private String Org;
/**
* 鍚� 璐熻矗浜�
*/
+ @JsonProperty("Name")
private String Name;
/**
* 鍚� 鑱旂郴鐢佃瘽
*/
+ @JsonProperty("Mobile")
private String Mobile;
/**
* 鍚� 涓婄骇鍗曚綅
*/
+ @JsonProperty("Pid")
private String Pid;
/**
* 鍚� 鍖哄煙
*/
+ @JsonProperty("AreaId")
private String AreaId;
}
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/CustomerResponseDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/dto/CustomerResponseDto.java
similarity index 82%
rename from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/CustomerResponseDto.java
rename to ycl-smoke/src/main/java/com/ycl/smoke/dto/CustomerResponseDto.java
index cfef7d5..e204cdf 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/CustomerResponseDto.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/dto/CustomerResponseDto.java
@@ -1,8 +1,7 @@
-package com.ycl.smoke.remote.dto;
+package com.ycl.smoke.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.ycl.smoke.entity.OdsCustomer;
-import com.ycl.smoke.entity.OdsDetectorDaily;
import lombok.Data;
import lombok.NoArgsConstructor;
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/dto/DataIntimeParamChildDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/dto/DataIntimeParamChildDto.java
new file mode 100644
index 0000000..0ce5b3a
--- /dev/null
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/dto/DataIntimeParamChildDto.java
@@ -0,0 +1,27 @@
+package com.ycl.smoke.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@Builder
+@EqualsAndHashCode(callSuper = false)
+public class DataIntimeParamChildDto {
+ /**
+ * 鍚� 绛涢�夌粍缁囷紙Param鍐咃級
+ */
+ @JsonProperty("Owner")
+ private String Owner;
+ /**
+ * 绛涢�夌姸鎬侊紙Param鍐咃級
+ */
+ @JsonProperty("Status")
+ private String Status;
+ /**
+ * 鐩戞祴鐐瑰鏍哥姸鎬侊紙Param鍐咃級
+ */
+ @JsonProperty("StatusOfRecord")
+ private String StatusOfRecord;
+}
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DataIntimeParamDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/dto/DataIntimeParamDto.java
similarity index 62%
rename from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DataIntimeParamDto.java
rename to ycl-smoke/src/main/java/com/ycl/smoke/dto/DataIntimeParamDto.java
index 5543ffa..25f482d 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DataIntimeParamDto.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/dto/DataIntimeParamDto.java
@@ -1,36 +1,44 @@
-package com.ycl.smoke.remote.dto;
+package com.ycl.smoke.dto;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
@Data
@Builder
+@EqualsAndHashCode(callSuper = false)
public class DataIntimeParamDto {
/**
* 鍚� 璧峰浣嶇疆
*/
+ @JsonProperty("StartAt")
private Integer StartAt;
/**
* 鏄� 璇锋眰鏁伴噺
*/
+ @JsonProperty("Size")
private Integer Size;
/**
* 鏄� 1:鐩戞帶璁惧2:鐩戞祴璁惧
*/
+ @JsonProperty("Typ")
private Integer Typ;
/**
* 鍚� 鎺掑簭渚濇嵁
*/
+ @JsonProperty("SortBy")
private String SortBy;
/**
* 鏄� 鍗囧簭/闄嶅簭
*/
+ @JsonProperty("SortMode")
private String SortMode;
/**
* 鍚�
*/
+ @JsonProperty("Param")
private DataIntimeParamChildDto Param;
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DataIntimeResponseDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/dto/DataIntimeResponseDto.java
similarity index 87%
rename from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DataIntimeResponseDto.java
rename to ycl-smoke/src/main/java/com/ycl/smoke/dto/DataIntimeResponseDto.java
index 75ef117..5b4542e 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DataIntimeResponseDto.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/dto/DataIntimeResponseDto.java
@@ -1,7 +1,6 @@
-package com.ycl.smoke.remote.dto;
+package com.ycl.smoke.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ycl.smoke.entity.OdsAlarmMsg;
import com.ycl.smoke.entity.OdsInTime;
import lombok.Builder;
import lombok.Data;
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DetectorDailyParamDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/dto/DetectorDailyParamDto.java
similarity index 62%
rename from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DetectorDailyParamDto.java
rename to ycl-smoke/src/main/java/com/ycl/smoke/dto/DetectorDailyParamDto.java
index fac3961..e3a347c 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DetectorDailyParamDto.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/dto/DetectorDailyParamDto.java
@@ -1,35 +1,43 @@
-package com.ycl.smoke.remote.dto;
+package com.ycl.smoke.dto;
-import com.baomidou.mybatisplus.annotation.OrderBy;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
@Builder
+@EqualsAndHashCode(callSuper = false)
public class DetectorDailyParamDto {
/**
* 鐘舵�乕1:姝ｅ父,2:瓒呮爣,3:姝ｅ父绂荤嚎,4寮傚父绂籡
*/
+ @JsonProperty("Status")
private Integer Status;
/**
* 鏁版嵁鑾峰彇鏃ユ湡
*/
+ @JsonProperty("AcquitDate")
private String AcquitDate;
/**
* 鎺掑簭瀛楁
*/
+ @JsonProperty("OrderBy")
private String OrderBy;
/**
* 椤靛簭鍙�
*/
+ @JsonProperty("Page")
private Integer Page;
/**
* 姣忛〉璁板綍鏁�
*/
+ @JsonProperty("Perpage")
private Integer Perpage;
/**
* 妫�鏌ユ槸鍚﹀畨瑁呮湁璁惧
*/
+ @JsonProperty("LocaleWithDevice")
private Boolean LocaleWithDevice;
}
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DetectorDailyResponseDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/dto/DetectorDailyResponseDto.java
similarity index 84%
rename from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DetectorDailyResponseDto.java
rename to ycl-smoke/src/main/java/com/ycl/smoke/dto/DetectorDailyResponseDto.java
index e169e57..a498d18 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DetectorDailyResponseDto.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/dto/DetectorDailyResponseDto.java
@@ -1,7 +1,6 @@
-package com.ycl.smoke.remote.dto;
+package com.ycl.smoke.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ycl.smoke.entity.OdsAlarmMsg;
import com.ycl.smoke.entity.OdsDetectorDaily;
import lombok.Data;
import lombok.NoArgsConstructor;
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/dto/LocaleParamDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/dto/LocaleParamDto.java
new file mode 100644
index 0000000..3347fca
--- /dev/null
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/dto/LocaleParamDto.java
@@ -0,0 +1,32 @@
+package com.ycl.smoke.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@Builder
+@EqualsAndHashCode(callSuper = false)
+public class LocaleParamDto {
+ /**
+ * 璧峰浣嶇疆 - 蹇呭～
+ */
+ @JsonProperty("StartAt")
+ private Integer StartAt;
+ /**
+ * 璇锋眰鏁伴噺 - 蹇呭～
+ */
+ @JsonProperty("Size")
+ private Integer Size;
+
+
+ /**
+ *
+ */
+ @JsonProperty("Param")
+ private LocaleParamOwnerDto Param;
+}
+
+
+
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/dto/LocaleParamOwnerDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/dto/LocaleParamOwnerDto.java
new file mode 100644
index 0000000..da3c7e2
--- /dev/null
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/dto/LocaleParamOwnerDto.java
@@ -0,0 +1,19 @@
+package com.ycl.smoke.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@Builder
+@EqualsAndHashCode(callSuper = false)
+public class LocaleParamOwnerDto {
+ @JsonProperty("id")
+ private String id;
+ @JsonProperty("owner")
+ private String owner;
+}
+
+
+
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/LocaleResponseDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/dto/LocaleResponseDto.java
similarity index 83%
rename from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/LocaleResponseDto.java
rename to ycl-smoke/src/main/java/com/ycl/smoke/dto/LocaleResponseDto.java
index 1f305ae..dfce4cb 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/LocaleResponseDto.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/dto/LocaleResponseDto.java
@@ -1,7 +1,6 @@
-package com.ycl.smoke.remote.dto;
+package com.ycl.smoke.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ycl.smoke.entity.OdsDetectorDaily;
import com.ycl.smoke.entity.OdsLocale;
import lombok.Data;
import lombok.NoArgsConstructor;
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/dto/LoginParamDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/dto/LoginParamDto.java
new file mode 100644
index 0000000..687635f
--- /dev/null
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/dto/LoginParamDto.java
@@ -0,0 +1,30 @@
+package com.ycl.smoke.dto;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@Builder
+@EqualsAndHashCode(callSuper = false)
+public class LoginParamDto {
+
+ /**
+ * 璐﹀彿 - 蹇呭～
+ */
+ @JsonProperty("username")
+ private String username;
+ /**
+ * 瀵嗙爜 - 蹇呭～
+ */
+ @JsonProperty("password")
+ private String password;
+ /**
+ * 閫夋嫨true鍒欐棤闇�楠岃瘉鐮�
+ */
+ @JsonProperty("noCode")
+ private Boolean noCode;
+
+}
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/LoginResponseDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/dto/LoginResponseDto.java
similarity index 88%
rename from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/LoginResponseDto.java
rename to ycl-smoke/src/main/java/com/ycl/smoke/dto/LoginResponseDto.java
index 572421e..c329073 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/LoginResponseDto.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/dto/LoginResponseDto.java
@@ -1,4 +1,4 @@
-package com.ycl.smoke.remote.dto;
+package com.ycl.smoke.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/ResultsPageInfo.java b/ycl-smoke/src/main/java/com/ycl/smoke/dto/ResultsPageInfo.java
similarity index 85%
rename from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/ResultsPageInfo.java
rename to ycl-smoke/src/main/java/com/ycl/smoke/dto/ResultsPageInfo.java
index 9145e2c..bf2bd72 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/ResultsPageInfo.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/dto/ResultsPageInfo.java
@@ -1,4 +1,4 @@
-package com.ycl.smoke.remote.dto;
+package com.ycl.smoke.dto;
import lombok.Data;
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/SmokeResultResponseDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/dto/SmokeResultResponseDto.java
similarity index 91%
rename from ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/SmokeResultResponseDto.java
rename to ycl-smoke/src/main/java/com/ycl/smoke/dto/SmokeResultResponseDto.java
index c0bf540..005449e 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/SmokeResultResponseDto.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/dto/SmokeResultResponseDto.java
@@ -1,4 +1,4 @@
-package com.ycl.smoke.remote.dto;
+package com.ycl.smoke.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/dto/TenMinParamDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/dto/TenMinParamDto.java
new file mode 100644
index 0000000..9ebae94
--- /dev/null
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/dto/TenMinParamDto.java
@@ -0,0 +1,28 @@
+package com.ycl.smoke.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@Builder
+@EqualsAndHashCode(callSuper = false)
+public class TenMinParamDto {
+ /**
+ * 璁惧鐨勭紪鍙�
+ */
+ @JsonProperty("mn")
+ private String mn;
+ /**
+ * 鏁版嵁鑾峰彇璧峰鏃ユ湡锛�2021-11-01锛�
+ */
+ @JsonProperty("AcquitAtTimeBegin")
+ private String AcquitAtTimeBegin;
+ /**
+ * 鏁版嵁鑾峰彇鎴鏃ユ湡
+ */
+ @JsonProperty("AcquitAtTimeEnd")
+ private String AcquitAtTimeEnd;
+
+}
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCurAlarm.java b/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCurAlarm.java
index b94fb81..b6713fc 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCurAlarm.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCurAlarm.java
@@ -7,6 +7,8 @@
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -26,210 +28,243 @@
private static final long serialVersionUID = 1L;
@TableId("id")
+ @JsonProperty("")
private Integer id;
/**
* 寮傚父绂荤嚎澶╂暟
*/
@TableField("abnormal_off_line_days")
+ @JsonProperty("AbnormalOfflineDays")
private Integer abnormalOffLineDays;
/**
* 澶勭悊鐜�
*/
@TableField("abnormal_off_line_process_ratio")
+ @JsonProperty("AbnormalOfflineProcessRatio")
private Integer abnormalOffLineProcessRatio;
/**
* 寮傚父绂荤嚎寰呭鐞嗗ぉ鏁�
*/
@TableField("abnormal_off_line_to_process_days")
+ @JsonProperty("AbnormalOfflineToProcessDays")
private Integer abnormalOffLineToProcessDays;
/**
* 鍦板潃
*/
@TableField("addr")
+ @JsonProperty("Addr")
private String addr;
/**
* 鎺掓斁鐗╂祿搴︽姌绠�(鏄ㄦ棩)
*/
@TableField("c_emissions")
+ @JsonProperty("CEmissions")
private BigDecimal cEmissions;
/**
* 鍦ㄧ嚎鏃ュ钩鍧囨帓鏀炬祿搴�
*/
@TableField("c_emissions_avg_online")
+ @JsonProperty("CEmissionsAvgOnline")
private BigDecimal cEmissionsAvgOnline;
/**
* 鏃ユ渶楂樻帓鏀炬祿搴�
*/
@TableField("c_emissions_max")
+ @JsonProperty("CEmissionsMax")
private BigDecimal cEmissionsMax;
/**
* 鏃ユ渶楂樻帓鏀炬祿搴︽棩鏈�
*/
@TableField("c_emissions_max_date")
+ @JsonProperty("CEmissionsMaxDate")
private LocalDateTime cEmissionsMaxDate;
/**
* 棰楃矑鐗╂祿搴︽姌绠�(鏄ㄦ棩)
*/
@TableField("c_granule")
+ @JsonProperty("CGranule")
private BigDecimal cGranule;
/**
* 闈炵敳鐑锋�荤儍娴撳害鎶樼畻 (鏄ㄦ棩)
*/
@TableField("c_hydrocarbon")
+ @JsonProperty("CHydrocarbon")
private BigDecimal cHydrocarbon;
/**
* 鑿滅郴鍚�
*/
@TableField("cuisine_name")
+ @JsonProperty("CuisineName")
private String cuisineName;
/**
* 钀ヤ笟鎵х収
*/
@TableField("customer_bl_no")
+ @JsonProperty("CustomerBlNo")
private String customerBlNo;
/**
* 鑱旂郴浜�
*/
@TableField("customer_contact")
+ @JsonProperty("CustomerContact")
private String customerContact;
/**
* 鐢佃瘽
*/
@TableField("customer_mobile")
+ @JsonProperty("CustomerMobile")
private String customerMobile;
/**
* 搴楀悕绉�
*/
@TableField("customer_name")
+ @JsonProperty("CustomerName")
private String customerName;
/**
* 鐩戞祴浠晠闅滃ぉ鏁�
*/
@TableField("detector_failure_days")
+ @JsonProperty("DetectorFailureDays")
private Integer detectorFailureDays;
/**
* 瓒呮爣闃堝��
*/
@TableField("emissions_sill")
+ @JsonProperty("EmissionsSill")
private Double emissionsSill;
/**
* 瓒呮爣鏁�
*/
@TableField("excess_num")
+ @JsonProperty("ExcessNum")
private Integer excessNum;
/**
* 瓒呮爣寰呭鐞嗗ぉ鏁�
*/
@TableField("excess_to_process_days")
+ @JsonProperty("ExcessToProcessDays")
private Integer excessToProcessDays;
/**
* 鍑�鍖栧櫒涓嶆甯镐娇鐢ㄥぉ鏁�
*/
@TableField("filter_abnormally_used_days")
+ @JsonProperty("FilterAbnormallyUsedDays")
private Integer filterAbnormallyUsedDays;
/**
* 鍑�鍖栧櫒娓呮礂娆℃暟
*/
@TableField("filter_wash_times")
+ @JsonProperty("FilterWashTimes")
private Integer filterWashTimes;
-
- /**
- * 棰楃矑鐗╄秴鏍囬槇鍊�
- */
- @TableField("granuli_sill")
- private Double granuliSill;
/**
* 鍋ュ悍鐮侀鑹�
*/
@TableField("health_code_color")
+ @JsonProperty("HealthCodeColor")
private String healthCodeColor;
/**
* 闈炵敳鐑锋�荤儍瓒呮爣闃堝��
*/
@TableField("hydrocarbon_sill")
+ @JsonProperty("HydrocarbonSill")
private Double hydrocarbonSill;
-
+ /**
+ * 闈炵敳鐑锋�荤儍瓒呮爣闃堝��
+ */
+ @TableField("granule_sill")
+ @JsonProperty("GranuleSill")
+ private Double granuleSill;
/**
* 鐩戞祴鐐笽d
*/
@TableField("locale_id")
+ @JsonProperty("LocaleId")
private String localeId;
/**
* 绾害
*/
@TableField("local_lat")
+ @JsonProperty("LocaleLat")
private String localLat;
/**
* 缁忓害
*/
@TableField("local_lng")
+ @JsonProperty("LocaleLng")
private String localLng;
/**
* 璁惧鐨刴n鏁版嵁
*/
@TableField("mn")
+ @JsonProperty("MN")
private String mn;
/**
* 鍚嶇О
*/
@TableField("name")
+ @JsonProperty("Name")
private String name;
/**
* 搴楀鍘熷洜瀵艰嚧绂荤嚎澶╂暟
*/
@TableField("off_line_cause_by_shop_days")
+ @JsonProperty("OfflineCausedByShopDays")
private Integer offLineCauseByShopDays;
/**
* 鎵�灞炲崟浣�
*/
@TableField("owner")
+ @JsonProperty("Owner")
private String owner;
/**
* 姝囦笟澶╂暟
*/
@TableField("shop_close_days")
+ @JsonProperty("ShopClosedDays")
private Integer shopCloseDays;
/**
* 鐘舵�乕1:涓�鑸洃娴嬬偣,2:鐗规畩鐩戞祴鐐�,99:搴熷純鐩戞祴鐐筣
*/
@TableField("status")
+ @JsonProperty("Status")
private Integer status;
/**
* 鐘舵�佹弿杩�
*/
@TableField("status_desc")
+ @JsonProperty("StatusDesc")
private String statusDesc;
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocale.java b/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocale.java
index 51f8ca3..a67ea69 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocale.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocale.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DataIntimeParamChildDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DataIntimeParamChildDto.java
deleted file mode 100644
index d66a3b3..0000000
--- a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DataIntimeParamChildDto.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ycl.smoke.remote.dto;
-
-import lombok.Builder;
-import lombok.Data;
-
-@Data
-@Builder
-public class DataIntimeParamChildDto {
- /**
- * 鍚� 绛涢�夌粍缁囷紙Param鍐咃級
- */
- private String Owner;
- /**
- * 绛涢�夌姸鎬侊紙Param鍐咃級
- */
- private String Status;
- /**
- * 鐩戞祴鐐瑰鏍哥姸鎬侊紙Param鍐咃級
- */
- private String StatusOfRecord;
-}
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/LocaleParamDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/LocaleParamDto.java
deleted file mode 100644
index b5c1eee..0000000
--- a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/LocaleParamDto.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.ycl.smoke.remote.dto;
-
-import lombok.Builder;
-import lombok.Data;
-
-@Data
-@Builder
-public class LocaleParamDto {
- /**
- * 璧峰浣嶇疆 - 蹇呭～
- */
- private Integer StartAt;
- /**
- * 璇锋眰鏁伴噺 - 蹇呭～
- */
- private Integer Size;
-
-
- /**
- *
- */
- private LocaleParamOwnerDto Param;
-}
-
-
-
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/LocaleParamOwnerDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/LocaleParamOwnerDto.java
deleted file mode 100644
index 9dbe8a7..0000000
--- a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/LocaleParamOwnerDto.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.ycl.smoke.remote.dto;
-
-import lombok.Builder;
-import lombok.Data;
-
-@Data
-@Builder
-public class LocaleParamOwnerDto {
- private String id;
- private String owner;
-}
-
-
-
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/LoginParamDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/LoginParamDto.java
deleted file mode 100644
index 8d56f62..0000000
--- a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/LoginParamDto.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.ycl.smoke.remote.dto;
-
-
-import lombok.Builder;
-import lombok.Data;
-
-@Data
-@Builder
-public class LoginParamDto {
-
- /**
- * 璐﹀彿 - 蹇呭～
- */
- private String username;
- /**
- * 瀵嗙爜 - 蹇呭～
- */
- private String password;
- /**
- * 閫夋嫨true鍒欐棤闇�楠岃瘉鐮�
- */
- private Boolean noCode;
-
-}
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/TenMinParamDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/TenMinParamDto.java
deleted file mode 100644
index 4b34882..0000000
--- a/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/TenMinParamDto.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.ycl.smoke.remote.dto;
-
-import lombok.Builder;
-import lombok.Data;
-
-@Data
-@Builder
-public class TenMinParamDto {
- /**
- * 璁惧鐨勭紪鍙�
- */
- private String mn;
- /**
- * 鏁版嵁鑾峰彇璧峰鏃ユ湡锛�2021-11-01锛�
- */
- private String AcquitAtTimeBegin;
- /**
- * 鏁版嵁鑾峰彇鎴鏃ユ湡
- */
- private String AcquitAtTimeEnd;
-
-}
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 80e5b54..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,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;
@@ -32,25 +32,25 @@
@PostMapping(value = "/admin/listDataIntime")
SmokeResultResponseDto<DataIntimeResponseDto> listDataIntime(@RequestBody DataIntimeParamDto paramDto,
@RequestHeader("Auth") String token);
-//
-// @PostMapping(value = "/admin/listLocale")
-// SmokeResultResponseDto<DetectorDailyResponseDto> listLocale(@RequestBody LocaleParamDto paramDto,
-// @RequestHeader("Auth") String token);
-//
-// @PostMapping(value = "/admin/queryCustomer")
-// SmokeResultResponseDto<DetectorDailyResponseDto> queryCustomer(@RequestBody CustomerParamDto paramDto,
-// @RequestHeader("Auth") String token);
-//
+
+ @PostMapping(value = "/admin/listLocale")
+ SmokeResultResponseDto<LocaleResponseDto> listLocale(@RequestBody LocaleParamDto 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);
}
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java b/ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java
index e93607e..be83a71 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java
@@ -2,15 +2,13 @@
import com.ycl.service.redis.RedisService;
import com.ycl.smoke.entity.OdsAlarmMsg;
-import com.ycl.smoke.remote.dto.*;
+import com.ycl.smoke.dto.*;
import com.ycl.smoke.remote.service.ISmokeDetectionService;
import com.ycl.smoke.service.IOdsAlarmMsgService;
import com.ycl.utils.redis.RedisKey;
-import org.apache.velocity.runtime.directive.Foreach;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
diff --git a/ycl-smoke/src/main/resources/mapper/smoke/OdsLocaleMapper.xml b/ycl-smoke/src/main/resources/mapper/smoke/OdsLocaleMapper.xml
index c316654..e9d85b5 100644
--- a/ycl-smoke/src/main/resources/mapper/smoke/OdsLocaleMapper.xml
+++ b/ycl-smoke/src/main/resources/mapper/smoke/OdsLocaleMapper.xml
@@ -9,7 +9,6 @@
<result column="owner" property="owner" />
<result column="cuisine" property="cuisine" />
<result column="customer_id" property="customerId" />
- <result column="customer" property="customer" />
<result column="fan_speed" property="fanSpeed" />
<result column="fan_quantity" property="fanQuantity" />
<result column="pipe_area" property="pipeArea" />
@@ -47,12 +46,12 @@
<result column="health_code_value3" property="healthCodeValue3" />
<result column="health_code_value4" property="healthCodeValue4" />
<result column="health_code_value5" property="healthCodeValue5" />
- <result column="health_code_valuee6" property="healthCodeValuee6" />
+ <result column="health_code_value6" property="healthCodeValue6" />
<result column="abnormal_value7" property="abnormalValue7" />
- <result column="abnormal_value78" property="abnormalValue78" />
- <result column="abnormal_value79" property="abnormalValue79" />
- <result column="abnormal_value710" property="abnormalValue710" />
- <result column="aliIot_device_name" property="aliiotDeviceName" />
+ <result column="abnormal_value78" property="abnormalValue8" />
+ <result column="abnormal_value79" property="abnormalValue9" />
+ <result column="abnormal_value710" property="abnormalValue10" />
+ <result column="ali_iot_device_name" property="aliIotDeviceName" />
<result column="aliIot" property="aliIot" />
<result column="created_at" property="createdAt" />
<result column="updated_at" property="updatedAt" />
@@ -60,7 +59,7 @@
<result column="health_code_value12" property="healthCodeValue12" />
<result column="send_mode" property="sendMode" />
<result column="surpass_calc_method" property="surpassCalcMethod" />
- <result column="fan_standardurrent" property="fanStandardurrent" />
+ <result column="fan_standard_current" property="fanStandardCurrent" />
<result column="filter_standard_current" property="filterStandardCurrent" />
<result column="status_of_record" property="statusOfRecord" />
<result column="remark_of_record" property="remarkOfRecord" />
--
Gitblit v1.8.0