From 59e18cfbe1c440f3d0f7ffaa675c127bf82f2414 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 01 三月 2023 17:38:02 +0800
Subject: [PATCH] 油烟接口
---
ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DataIntimeParamDto.java | 37 ++++++
ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocaleCustomer.java | 57 +++++++++
ycl-smoke/src/main/java/com/ycl/smoke/remote/service/ISmokeDetectionService.java | 2
ycl-platform/src/main/java/com/ycl/entity/video/VideoAlarmReport.java | 8 +
ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DataIntimeResponseDto.java | 30 +++++
ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DataIntimeParamChildDto.java | 21 +++
ycl-platform/src/main/java/com/ycl/dto/video/AlarmDataParam.java | 8 +
ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsInTime.java | 40 +++++-
ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocale.java | 97 ++++++++++++---
ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java | 3
10 files changed, 274 insertions(+), 29 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/dto/video/AlarmDataParam.java b/ycl-platform/src/main/java/com/ycl/dto/video/AlarmDataParam.java
index 458f73c..92a12b4 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/video/AlarmDataParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/video/AlarmDataParam.java
@@ -1,6 +1,8 @@
package com.ycl.dto.video;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -32,6 +34,12 @@
*/
@JsonProperty("AlgoName")
private String algoName;
+
+ @JsonProperty("AlarmType")
+ private Integer alarmType;
+
+ @JsonProperty("AlarmName")
+ private String alarmName;
/**
* 绠楁硶妫�鍑哄璞′俊鎭紙閫氬父涓�涓棰戝垎鏋愭湇鍔℃姤璀﹀彧鍖呭惈涓�涓洰鏍囦俊鎭�傚浘鐗囩被澶氱洰鏍囨娴嬬被绠楁硶闄ゅ銆傦級
*/
diff --git a/ycl-platform/src/main/java/com/ycl/entity/video/VideoAlarmReport.java b/ycl-platform/src/main/java/com/ycl/entity/video/VideoAlarmReport.java
index 57049bf..77d88b9 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/video/VideoAlarmReport.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/video/VideoAlarmReport.java
@@ -76,6 +76,14 @@
@TableField("algo_name")
private String algoName;
+ @ApiModelProperty("鎶ヨ绫诲瀷鐮�")
+ @TableField("alarm_type")
+ private Integer alarmType;
+
+ @ApiModelProperty("鎶ヨ绫诲瀷鍚嶇О")
+ @TableField("alarm_name")
+ private String alarmName;
+
@ApiModelProperty("绠楁硶妫�鍑哄璞″湪鍥剧墖涓殑鍧愭爣")
@TableField("alarm_obj")
private String alarmObj;
diff --git a/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java
index e80d31d..acd2ce6 100644
--- a/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java
@@ -72,7 +72,7 @@
if (!StringUtils.isEmpty(alarmObject)) {
BufferedImage image = ImageIO.read(inputStream);
- Graphics2D g2 = (Graphics2D)image.getGraphics();
+ Graphics2D g2 = (Graphics2D) image.getGraphics();
g2.setColor(Color.RED);
g2.setStroke(new BasicStroke(3.0f));
List<AlarmObject> alarmObjects = JSON.parseArray(alarmObject, AlarmObject.class);
@@ -105,6 +105,7 @@
.channel(cameraInf.getChannel()).platResourceId(cameraInf.getPlatResourceID())
.picData(picData).alarmTime(instant.atZone(zoneId).toLocalDateTime())
.alarmId(alarmData.getAlarmID()).algoType(alarmData.getAlgoType())
+ .alarmType(alarmData.getAlarmType()).alarmName(alarmData.getAlarmName())
.algoName(alarmData.getAlgoName()).alarmObj(JSON.toJSONString(alarmData.getAlarmObject()))
.build();
if (list.size() == 0) {
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsInTime.java b/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsInTime.java
index 68f7dd9..76eff33 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsInTime.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsInTime.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -28,78 +30,84 @@
* 瀹炴椂鏁版嵁鐨勮澶囩紪鍙凤紙涓棿鏈夆��-鈥濊繛鎺ヤ唬琛ㄨ鐩戞祴鐐规湁澶氫釜璁惧缁戝畾锛�
*/
@TableId("id")
+ @JsonProperty("Id")
private String id;
-
- /**
- * 鎶ユ枃淇℃伅
- */
- @TableField("string")
- private String string;
/**
* 閲囬泦鏃堕棿
*/
@TableField("acquit_at")
+ @JsonProperty("AcquitAt")
private Long acquitAt;
/**
* 鏈�鍚庣‘璁ゆ椂闂�
*/
@TableField("last_at")
+ @JsonProperty("LastAt")
private Long lastAt;
/**
* 鎺掓斁鐗╂姌绠楁祿搴�
*/
@TableField("c_emissions")
+ @JsonProperty("CEmissions")
private String cEmissions;
/**
* 棰楃矑鐗╂姌绠楁祿搴�
*/
@TableField("c_granule")
+ @JsonProperty("CGranule")
private String cGranule;
/**
* 闈炵敳鐑锋�荤儍鎶樼畻娴撳害
*/
@TableField("c_hydrocarbon")
+ @JsonProperty("CHydrocarbon")
private BigDecimal cHydrocarbon;
/**
* 瀹炴椂鎺掓斁閲�
*/
@TableField("emissions_conc")
+ @JsonProperty("EmissionsConc")
private BigDecimal emissionsConc;
/**
* 棰楃矑鐗╁惈閲�
*/
@TableField("granule_conc")
+ @JsonProperty("GranuleConc")
private BigDecimal granuleConc;
/**
* 闈炵敳鐑锋�荤儍鍚噺
*/
@TableField("hydrocarbon_conc")
+ @JsonProperty("HydrocarbonConc")
private BigDecimal hydrocarbonConc;
/**
* 椋庢満鐘舵�侊紙1:寮�2:鍏�3锛氬紓甯革級
*/
@TableField("fan_status")
+ @JsonProperty("FanStatus")
private Integer fanStatus;
/**
* 鍑�鍖栧櫒鐘舵�侊紙1:寮�2:鍏�3锛氬紓甯革級
*/
@TableField("filter_status")
+ @JsonProperty("FilterStatus")
private Integer filterStatus;
/**
* 绫诲瀷[1锛氱洃鎺�:2锛氱洃娴媇
*/
@TableField("typ")
+ @JsonProperty("Typ")
private Integer typ;
/**
@@ -108,115 +116,133 @@
*/
@TableField("status")
+ @JsonProperty("Status")
private String status;
/**
* 娴侀��
*/
@TableField("velocity")
+ @JsonProperty("Velocity")
private Double velocity;
/**
* 娓╁害
*/
@TableField("temperature")
+ @JsonProperty("Temperature")
private Double temperature;
/**
* 婀垮害
*/
@TableField("moisture")
+ @JsonProperty("Moisture")
private Double moisture;
/**
* 鐩戞祴鐐瑰悕绉�
*/
@TableField("locale")
+ @JsonProperty("Locale")
private String locale;
/**
* 鐩戞祴鐐笽D
*/
@TableField("lid")
+ @JsonProperty("Lid")
private String lid;
/**
* 鎵�灞炲崟浣�
*/
@TableField("owner")
+ @JsonProperty("Owner")
private String owner;
/**
* 瀹夎鍦板潃
*/
@TableField("addr")
+ @JsonProperty("Addr")
private String addr;
/**
* 瓒呮爣闃堝��
*/
@TableField("emissions_sill")
+ @JsonProperty("EmissionsSill")
private Double emissionsSill;
/**
* 棰楃矑鐗╄秴鏍囬槇鍊�
*/
@TableField("granule_sill")
+ @JsonProperty("GranuleSill")
private Double granuleSill;
/**
* 闈炵敳鐑锋�荤儍瓒呮爣闃堝��
*/
@TableField("hydrocarbon_sill")
+ @JsonProperty("HydrocarbonSill")
private Double hydrocarbonSill;
/**
* 鏄惁鑱斿姩(0:鍚�1:鏄�)
*/
@TableField("link_status")
+ @JsonProperty("LinkStatus")
private Integer linkStatus;
/**
* 鑱旂郴鐢佃瘽
*/
@TableField("customer_mobile")
+ @JsonProperty("CustomerMobile")
private String customerMobile;
/**
* 缁忓害
*/
@TableField("locale_lng")
+ @JsonProperty("LocaleLng")
private String localeLng;
/**
* 绾害
*/
@TableField("localelat")
+ @JsonProperty("LocaleLat")
private String localelat;
/**
* 椋庢満鐢垫祦鍊�
*/
@TableField("fan_current")
+ @JsonProperty("fan_current")
private Double fanCurrent;
/**
* 鍑�鍖栧櫒鐢垫祦鍊�
*/
@TableField("pur_current")
+ @JsonProperty("pur_current")
private Double purCurrent;
/**
* 鏁翠綋鐘舵�侊紙1:鍦ㄧ嚎2:绂荤嚎3:寮傚父绂荤嚎锛�
*/
@TableField("online_status")
+ @JsonProperty("OnlineStatus")
private Integer onlineStatus;
/**
* 锛圢ORMAL:姝ｅ父銆丱FFLINE:涓嬬嚎銆丄BANDONED:搴熷純锛�
*/
@TableField("status_of_record")
+ @JsonProperty("StatusOfRecord")
private String statusOfRecord;
-
}
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 f7ea472..e885681 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
@@ -2,11 +2,12 @@
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableId;
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;
@@ -29,346 +30,402 @@
* Id
*/
@TableId("id")
+ @JsonProperty("Id")
private String id;
/**
* 鐑熼亾鍚嶇О
*/
@TableField("n_name")
+ @JsonProperty("Name")
private String nName;
/**
* 鍗曚綅[绾ц仈]
*/
@TableField("owner")
+ @JsonProperty("Owner")
private String owner;
/**
* 鑿滅郴
*/
@TableField("cuisine")
+ @JsonProperty("Cuisine")
private Integer cuisine;
/**
* 缁勭粐ID
*/
@TableField("customer_id")
+ @JsonProperty("CustomerId")
private String customerId;
-
- /**
- * 鎵�灞炲崟浣嶄俊鎭�
- */
- @TableField("customer")
- private String customer;
/**
* 椋庨��
*/
@TableField("fan_speed")
+ @JsonProperty("FanSpeed")
private BigDecimal fanSpeed;
/**
* 椋庨噺
*/
@TableField("fan_quantity")
+ @JsonProperty("FanQuantity")
private BigDecimal fanQuantity;
/**
* 绠￠亾鎴潰闈㈢Н
*/
@TableField("pipe_area")
+ @JsonProperty("PipeArea")
private BigDecimal pipeArea;
/**
* 鐏跺ご鏁伴噺
*/
@TableField("stove_num")
+ @JsonProperty("StoveNum")
private Integer stoveNum;
/**
* 绂荤嚎鍒ゅ畾[灏忔椂]
*/
@TableField("offline_judge")
+ @JsonProperty("OfflineJudge")
private Integer offlineJudge;
/**
* 椋庢満鐘舵��
*/
@TableField("fan_status")
+ @JsonProperty("FanStatus")
private Integer fanStatus;
/**
* 鍑�鍖栧櫒淇℃伅
*/
@TableField("filter_info")
+ @JsonProperty("FilterInfo")
private String filterInfo;
/**
* 鍑�鍖栧櫒鐘舵��
*/
@TableField("filter_status")
+ @JsonProperty("FilterStatus")
private Integer filterStatus;
/**
* 鎶芥牱娆℃暟
*/
@TableField("samplings")
+ @JsonProperty("Samplings")
private Integer samplings;
/**
* 鏄惁鑱斿姩
*/
@TableField("link_status")
+ @JsonProperty("LinkStatus")
private Boolean linkStatus;
/**
* 瓒呮爣闃堝��
*/
@TableField("emissions_sill")
+ @JsonProperty("EmissionsSill")
private BigDecimal emissionsSill;
/**
* 闆嗘皵鐏堕潰绉痆璋冪爺]
*/
@TableField("stove_area")
+ @JsonProperty("StoveArea")
private BigDecimal stoveArea;
/**
* 鏃ュ潎鎺掔儫鏃堕棿[璋冪爺]
*/
@TableField("exhaust_time")
+ @JsonProperty("ExhaustTime")
private String exhaustTime;
/**
* 澶囨敞[璋冪爺]
*/
@TableField("remark")
+ @JsonProperty("Remark")
private String remark;
/**
* 鍦板潃
*/
@TableField("addr")
+ @JsonProperty("Addr")
private String addr;
/**
* 鍦板尯[绾ц仈]
*/
@TableField("area_id")
+ @JsonProperty("AreaId")
private String areaId;
/**
* 缁忓害
*/
@TableField("lng")
+ @JsonProperty("Lng")
private String lng;
/**
* 绾害
*/
@TableField("lat")
+ @JsonProperty("Lat")
private String lat;
/**
* 鍒涘缓鑰�
*/
@TableField("creator")
+ @JsonProperty("Creator")
private String creator;
/**
* 鍒涘缓鏃ユ湡
*/
@TableField("create_at")
+ @JsonProperty("CreateAt")
private Long createAt;
/**
* 鐘舵�乕1:涓�鑸洃娴嬬偣,2:鐗规畩鐩戞祴鐐�,99:搴熷純鐩戞祴鐐筣
*/
@TableField("status")
+ @JsonProperty("Status")
private Integer status;
/**
* 棰楃矑鐗╁惈閲忚秴鏍囬槇鍊�
*/
@TableField("granule_sill")
+ @JsonProperty("GranuleSill")
private BigDecimal granuleSill;
/**
* 闈炵敳鐑锋�荤儍瓒呮爣闃堝��
*/
@TableField("hydrocarbon_sill")
+ @JsonProperty("HydrocarbonSill")
private BigDecimal hydrocarbonSill;
/**
* 鍋ュ悍鐮侀鑹�
*/
@TableField("health_code_color")
+ @JsonProperty("HealthCodeColor")
private String healthCodeColor;
/**
* 鏈�鍚庣粦瀹氳澶噈n
*/
@TableField("mn_last")
+ @JsonProperty("MnLast")
private String mnLast;
/**
* 鐩戞祴鐐瑰浘鐗�
*/
@TableField("locale_pics")
+ @JsonProperty("LocalePics")
private String localePics;
/**
* 璁惧绫诲瀷 鏈�鍚庝竴娆＄粦瀹�
*/
@TableField("mn_typ_last")
+ @JsonProperty("MnTypLast")
private Integer mnTypLast;
/**
* 椋庢満淇℃伅
*/
@TableField("fan_info")
+ @JsonProperty("FanInfo")
private String fanInfo;
/**
* 鍙栫數鏂瑰紡
*/
@TableField("power_supply_mode")
+ @JsonProperty("PowerSupplyMode")
private String powerSupplyMode;
/**
* 鍑�鍖栧櫒椋庢満鑱斿姩姣旈槇鍊�
*/
@TableField("link_ratio_sill")
+ @JsonProperty("LinkRatioSill")
private BigDecimal linkRatioSill;
/**
* 杩愮淮浜哄憳ID
*/
@TableField("maintainer_id")
+ @JsonProperty("MaintainerId")
private String maintainerId;
/**
* 缁跨爜锛氭渶杩慩澶╁唴锛岃搴楀瓒呮爣娆℃暟灏忕瓑浜嶸alue1锛堥粯璁�3锛夋鐨勶紝涓斿噣鍖栧櫒涓嶆甯镐娇鐢ㄥぉ鏁板皬绛変簬Value2锛堥粯璁�3锛夊ぉ鐨勶紝涓旂绾垮ぉ鏁皗闈炴瓏涓氥�侀潪鐩戞祴浠晠闅溿�愭暟鎹潵婧愯繍缁翠汉鍛樺～鍐欑殑鈥濆紓甯稿鐞嗏�溿�憓灏忕瓑浜嶸alue3锛堥粯璁�3锛夈��
*/
@TableField("health_code_x")
+ @JsonProperty("HealthCodeX")
private Integer healthCodeX;
@TableField("health_code_value1")
+ @JsonProperty("HealthCodeValue1")
private Integer healthCodeValue1;
@TableField("health_code_value2")
+ @JsonProperty("HealthCodeValue2")
private Integer healthCodeValue2;
@TableField("health_code_value3")
+ @JsonProperty("HealthCodeValue3")
private Integer healthCodeValue3;
/**
* 绾㈢爜锛氭渶杩慩澶╁唴锛岃搴楀瓒呮爣娆℃暟澶т簬Value4锛堥粯璁�5锛夋鐨勶紝鎴栬�呭噣鍖栧櫒涓嶆甯镐娇鐢ㄥぉ鏁板ぇ浜嶸alue5锛堥粯璁�5锛夊ぉ鐨勶紝涓旂绾垮ぉ鏁板皬浜嶸alue6锛堥粯璁�5锛夈��
*/
@TableField("health_code_value4")
+ @JsonProperty("HealthCodeValue4")
private Integer healthCodeValue4;
@TableField("health_code_value5")
+ @JsonProperty("HealthCodeValue5")
private Integer healthCodeValue5;
- @TableField("health_code_valuee6")
- private Integer healthCodeValuee6;
+ @TableField("health_code_value6")
+ @JsonProperty("HealthCodeValue6")
+ private Integer healthCodeValue6;
/**
* 0~24鐐归棿娌圭儫娴撳害锛堥绮掔墿銆侀潪鐢茬兎鎬荤儍锛変笁涓�间腑鐨勪竴椤瑰�间竴鐩村皬浜嶸alue7(榛樿0.05锛塵g/M3鐨勶紝瑙嗕负鏁版嵁寮傚父鍋忓皬锛�
*/
@TableField("abnormal_value7")
+ @JsonProperty("AbnormalValue7")
private BigDecimal abnormalValue7;
/**
* 0~24鐐归棿娌圭儫娴撳害锛堥绮掔墿銆侀潪鐢茬兎鎬荤儍锛変笁涓�间腑鐨勪竴椤瑰�间竴鐩村ぇ浜嶸alue8(榛樿30锛塵g/M3鐨勶紝瑙嗕负鏁版嵁寮傚父鍋忓ぇ锛�
*/
- @TableField("abnormal_value78")
- private BigDecimal abnormalValue78;
+ @TableField("abnormal_value8")
+ @JsonProperty("AbnormalValue8")
+ private BigDecimal abnormalValue8;
/**
* 0~24鐐归棿娌圭儫娴撳害锛堥绮掔墿銆侀潪鐢茬兎鎬荤儍锛変笁涓�间腑鐨勪竴椤瑰�间竴鐩撮潪Value9(榛樿0锛塵g/M3鐨勶紝瑙嗕负鏁版嵁婕傜Щ寮傚父
*/
- @TableField("abnormal_value79")
- private BigDecimal abnormalValue79;
+ @TableField("abnormal_value9")
+ @JsonProperty("AbnormalValue9")
+ private BigDecimal abnormalValue9;
/**
* 0~24鐐归棿涓婄嚎鏃堕棿灏忎簬Value10(榛樿60锛夊垎閽熺殑锛岃涓轰笂绾挎椂闂磋繃鐭紓甯革紱
*/
- @TableField("abnormal_value710")
- private BigDecimal abnormalValue710;
+ @TableField("abnormal_value10")
+ @JsonProperty("AbnormalValue10")
+ private BigDecimal abnormalValue10;
/**
* Ali璁惧鍚嶇О
*/
- @TableField("aliIot_device_name")
- private String aliiotDeviceName;
+ @TableField("ali_iot_device_name")
+ @JsonProperty("AliIotDeviceName")
+ private String aliIotDeviceName;
/**
* Ali璁惧
*/
- @TableField("aliIot")
+ @TableField("ali_iot")
+ @JsonProperty("AliIot")
private String aliIot;
/**
* 鍒涘缓鏃堕棿
*/
@TableField("created_at")
+ @JsonProperty("CreatedAt")
private LocalDateTime createdAt;
/**
* 鏇存柊鏃堕棿
*/
@TableField("updated_at")
+ @JsonProperty("UpdatedAt")
private LocalDateTime updatedAt;
@TableField("health_code_value11")
+ @JsonProperty("HealthCodeValue11")
private Integer healthCodeValue11;
@TableField("health_code_value12")
+ @JsonProperty("HealthCodeValue12")
private Integer healthCodeValue12;
/**
* 鐩戞祴鏂瑰紡銆�1:鍚堝苟浼犺緭 2:鐙珛浼犺緭銆�
*/
@TableField("send_mode")
+ @JsonProperty("SendMode")
private Integer sendMode;
/**
* 瓒呮爣璁＄畻鏂瑰紡銆�1锛氭娊鏍疯绠� 2锛氭粦鍔ㄨ绠椼��
*/
@TableField("surpass_calc_method")
+ @JsonProperty("SurpassCalcMethod")
private Integer surpassCalcMethod;
/**
* 椋庢満姝ｅ父鐢垫祦鍊�
*/
- @TableField("fan_standardurrent")
- private Integer fanStandardurrent;
+ @TableField("fan_standard_current")
+ @JsonProperty("FanStandardCurrent")
+ private Integer fanStandardCurrent;
/**
* 鍑�鍖栧櫒姝ｅ父鐢垫祦鍊�
*/
@TableField("filter_standard_current")
+ @JsonProperty("FilterStandardCurrent")
private Integer filterStandardCurrent;
/**
* 璁惧鐘舵�乕姝ｅ父NORMAL銆佷笅绾縊FFLINE銆佸簾寮傾BANDON]
*/
@TableField("status_of_record")
+ @JsonProperty("StatusOfRecord")
private String statusOfRecord;
/**
* 瀹℃牳澶囨敞
*/
@TableField("remark_of_record")
+ @JsonProperty("RemarkOfRecord")
private String remarkOfRecord;
/**
* 瀹℃牳鍘熷洜
*/
@TableField("cause")
+ @JsonProperty("Cause")
private String cause;
+ @JsonProperty("Customer")
+ private OdsLocaleCustomer customer;
}
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocaleCustomer.java b/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocaleCustomer.java
new file mode 100644
index 0000000..466e75a
--- /dev/null
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsLocaleCustomer.java
@@ -0,0 +1,57 @@
+package com.ycl.smoke.entity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class OdsLocaleCustomer {
+
+ @JsonProperty("Id")
+ private int id;
+ @JsonProperty("Pid")
+ private String pid;
+ @JsonProperty("BlNo")
+ private String blNo;
+ @JsonProperty("BlName")
+ private String blName;
+ @JsonProperty("Org")
+ private String org;
+ @JsonProperty("Name")
+ private String name;
+ @JsonProperty("Contact")
+ private String contact;
+ @JsonProperty("Mobile")
+ private String mobile;
+ @JsonProperty("Telephone")
+ private String telephone;
+ @JsonProperty("Typ")
+ private int typ;
+ @JsonProperty("CreateAt")
+ private String creator;
+ @JsonProperty("CreateAt")
+ private long createAt;
+ @JsonProperty("Status")
+ private int status;
+ @JsonProperty("Address")
+ private String address;
+ @JsonProperty("Logo")
+ private String logo;
+ @JsonProperty("BusinessHour")
+ private String businessHour;
+ @JsonProperty("Desc")
+ private String desc;
+ @JsonProperty("MaintainerId")
+ private String maintainerId;
+ @JsonProperty("AreaIds")
+ private String areaIds;
+ @JsonProperty("AreaIdCascades")
+ private String areaIdCascades;
+ @JsonProperty("Areas")
+ private String areas;
+ @JsonProperty("PerPage")
+ private int perPage;
+ @JsonProperty("Page")
+ private int page;
+}
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
new file mode 100644
index 0000000..d66a3b3
--- /dev/null
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DataIntimeParamChildDto.java
@@ -0,0 +1,21 @@
+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/DataIntimeParamDto.java b/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DataIntimeParamDto.java
new file mode 100644
index 0000000..5543ffa
--- /dev/null
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DataIntimeParamDto.java
@@ -0,0 +1,37 @@
+package com.ycl.smoke.remote.dto;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+public class DataIntimeParamDto {
+ /**
+ * 鍚� 璧峰浣嶇疆
+ */
+ private Integer StartAt;
+
+ /**
+ * 鏄� 璇锋眰鏁伴噺
+ */
+ private Integer Size;
+ /**
+ * 鏄� 1:鐩戞帶璁惧2:鐩戞祴璁惧
+ */
+ private Integer Typ;
+ /**
+ * 鍚� 鎺掑簭渚濇嵁
+ */
+ private String SortBy;
+ /**
+ * 鏄� 鍗囧簭/闄嶅簭
+ */
+ private String SortMode;
+ /**
+ * 鍚�
+ */
+ 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/remote/dto/DataIntimeResponseDto.java
new file mode 100644
index 0000000..75ef117
--- /dev/null
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/remote/dto/DataIntimeResponseDto.java
@@ -0,0 +1,30 @@
+package com.ycl.smoke.remote.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;
+
+import java.util.List;
+
+@Data
+@Builder
+public class DataIntimeResponseDto {
+
+
+ @JsonProperty("content")
+ private List<OdsInTime> content;
+
+ @JsonProperty("total")
+ private Integer total;
+
+ @JsonProperty("deviceNum")
+ private Integer deviceNum;
+
+ @JsonProperty("localeNum")
+ private Integer localeNum;
+
+ @JsonProperty("onlineNum")
+ private Integer onlineNum;
+}
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 c46ed14..4d093a8 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
@@ -31,7 +31,7 @@
@RequestHeader("Auth") String token);
@PostMapping(value = "/admin/listDataIntime")
- SmokeResultResponseDto<DetectorDailyResponseDto> listDataIntime(@RequestBody DetectorDailyParamDto paramDto,
+ SmokeResultResponseDto<DataIntimeResponseDto> listDataIntime(@RequestBody DataIntimeParamDto paramDto,
@RequestHeader("Auth") String token);
@PostMapping(value = "/admin/listLocale")
--
Gitblit v1.8.0