From 196bb14112448857a885e32dc4149e308e00b01a Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 15 八月 2024 11:57:15 +0800
Subject: [PATCH] 2024.8.15 各项修正
---
src/main/kotlin/cn/flightfeather/supervision/common/net/FumeHttpService.kt | 77 ++++++++++++++++++++++++--------------
1 files changed, 48 insertions(+), 29 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/common/net/FumeHttpService.kt b/src/main/kotlin/cn/flightfeather/supervision/common/net/FumeHttpService.kt
index 0104c3b..ba4f99d 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/common/net/FumeHttpService.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/common/net/FumeHttpService.kt
@@ -1,5 +1,7 @@
package cn.flightfeather.supervision.common.net
+import cn.flightfeather.supervision.bgtask.TaskPushFume.Companion.HZY
+import cn.flightfeather.supervision.bgtask.TaskPushFume.Companion.ZQ
import com.google.gson.Gson
import com.google.gson.JsonObject
import com.google.gson.JsonParser
@@ -13,37 +15,54 @@
private val httpMethod = HttpMethod("xhhb-yy.senzly.top", 80)
- data class PostData(
- val apiKey: String = "hengzhiyuan",
- val pwd: String = "123456",
- val data: MutableList<FumeData> = mutableListOf()
- )
+ class PostData private constructor(
+ val apiKey: String,
+ val pwd: String,
+ val data: MutableList<FumeData> = mutableListOf(),
+ ){
+ companion object {
+ fun newInstance(deviceType: String): PostData {
+ return when (deviceType) {
+ HZY -> {
+ PostData("hengzhiyuan", "123456")
+ }
+ ZQ -> {
+ PostData("zhuoquan", "zq63618889")
+ }
+ else -> {
+ PostData("", "")
+ }
+ }
+ }
+ }
+ }
+
data class FumeData(
- //璁惧缂栧彿锛堜緵搴斿晢鑷畾涔夛紝鏈�澶ч暱搴︼細50锛屽繀椤荤‘淇濆敮涓�鎬э級
- val equipmentShowId: String,
- //鏁版嵁鏃堕棿锛屾牸寮忓繀椤绘槸yyyy/MM/dd HH:mm:ss鎴杫yyy-MM-dd HH:mm:ss
- val dataTime: String?,
- //褰撳墠杩涚儫娴撳害mg/m鲁锛屾暟鍊煎瀷锛屽厑璁稿皬鏁�
- val valIn: Double,
- //褰撳墠鎺掔儫娴撳害mg/m鲁锛屾暟鍊煎瀷锛屽厑璁稿皬鏁�
- val valOut: Double,
- //椋庢満鐘舵��:0:"鏃�",1:"鎹熷潖",2:"寰呮満",3:"鍚姩"
- val fanStatus: Int,
- //椋庢満宸ヤ綔鐢垫祦锛屾暟鍊硷紝鍏佽灏忔暟
- val fanA: Double,
- //椋庢満宸插惎鍔ㄦ椂闀�(鍒嗛挓)
- val fanMinute: Int,
- //鍑�鍖栧櫒鐘舵��:0:"鏃�",1:"鎹熷潖",2:"寰呮満",3:"鍚姩"
- val purifyStatus: Int,
- //鍑�鍖栧櫒宸ヤ綔鐢垫祦锛屾暟鍊硷紝鍏佽灏忔暟
- val purifyA: Double,
- //鍑�鍖栧櫒宸插惎鍔ㄦ椂闀�(鍒嗛挓)锛屾暟鍊硷紝蹇呴』鏁存暟
- val purifyMinute: Int,
- //娓呮磥搴︼紙鍋滅敤锛夛紝0-100鏁板�硷紝鍏佽灏忔暟
- val cleanliness: Int,
- //鍑�鍖栫巼锛�0-100鏁板�硷紝鍏佽灏忔暟
- val purifyRate: Double
+ //璁惧缂栧彿锛堜緵搴斿晢鑷畾涔夛紝鏈�澶ч暱搴︼細50锛屽繀椤荤‘淇濆敮涓�鎬э級
+ val equipmentShowId: String,
+ //鏁版嵁鏃堕棿锛屾牸寮忓繀椤绘槸yyyy/MM/dd HH:mm:ss鎴杫yyy-MM-dd HH:mm:ss
+ val dataTime: String?,
+ //褰撳墠杩涚儫娴撳害mg/m鲁锛屾暟鍊煎瀷锛屽厑璁稿皬鏁�
+ val valIn: Double,
+ //褰撳墠鎺掔儫娴撳害mg/m鲁锛屾暟鍊煎瀷锛屽厑璁稿皬鏁�
+ val valOut: Double,
+ //椋庢満鐘舵��:0:"鏃�",1:"鎹熷潖",2:"寰呮満",3:"鍚姩"
+ val fanStatus: Int,
+ //椋庢満宸ヤ綔鐢垫祦锛屾暟鍊硷紝鍏佽灏忔暟
+ val fanA: Double,
+ //椋庢満宸插惎鍔ㄦ椂闀�(鍒嗛挓)
+ val fanMinute: Int,
+ //鍑�鍖栧櫒鐘舵��:0:"鏃�",1:"鎹熷潖",2:"寰呮満",3:"鍚姩"
+ val purifyStatus: Int,
+ //鍑�鍖栧櫒宸ヤ綔鐢垫祦锛屾暟鍊硷紝鍏佽灏忔暟
+ val purifyA: Double,
+ //鍑�鍖栧櫒宸插惎鍔ㄦ椂闀�(鍒嗛挓)锛屾暟鍊硷紝蹇呴』鏁存暟
+ val purifyMinute: Int,
+ //娓呮磥搴︼紙鍋滅敤锛夛紝0-100鏁板�硷紝鍏佽灏忔暟
+ val cleanliness: Int,
+ //鍑�鍖栫巼锛�0-100鏁板�硷紝鍏佽灏忔暟
+ val purifyRate: Double,
)
fun uploadData(postData: PostData): JsonObject? {
--
Gitblit v1.9.3