From 7dc2cde6ed92a77a63f7de492825374d5aff5661 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Wed, 24 Jul 2024 11:08:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=BC=95=E5=85=A5=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/test/java/DataTest.java | 86 +++++- .../com/njcn/energy/pojo/dto/ACtrlDTO.java | 2 +- .../com/njcn/energy/pojo/dto/AccessDTO.java | 2 +- .../njcn/energy/pojo/dto/AccessParamDTO.java | 3 +- .../java/com/njcn/energy/pojo/dto/AlmDTO.java | 2 +- .../com/njcn/energy/pojo/dto/AskDataDTO.java | 2 +- .../com/njcn/energy/pojo/dto/CpuInfoDTO.java | 2 +- .../com/njcn/energy/pojo/dto/CtrlDTO.java | 2 +- .../njcn/energy/pojo/dto/DataArrayDTO.java | 2 +- .../energy/pojo/dto/DataArrayListDTO.java | 2 +- .../com/njcn/energy/pojo/dto/DataSetDTO.java | 2 +- .../com/njcn/energy/pojo/dto/DevCfgDTO.java | 2 +- .../java/com/njcn/energy/pojo/dto/DevDTO.java | 2 +- .../com/njcn/energy/pojo/dto/DevInfoDTO.java | 2 +- .../com/njcn/energy/pojo/dto/DeviceDTO.java | 2 +- .../energy/pojo/dto/DeviceOperateDTO.java | 2 - .../java/com/njcn/energy/pojo/dto/DiDTO.java | 2 +- .../com/njcn/energy/pojo/dto/DiskInfoDTO.java | 2 +- .../java/com/njcn/energy/pojo/dto/DoDTO.java | 2 +- .../com/njcn/energy/pojo/dto/EpdPqdDTO.java | 2 +- .../java/com/njcn/energy/pojo/dto/EvtDTO.java | 2 +- .../com/njcn/energy/pojo/dto/EvtParam.java | 2 +- .../com/njcn/energy/pojo/dto/LineDTO.java | 2 +- .../java/com/njcn/energy/pojo/dto/MdDTO.java | 2 +- .../com/njcn/energy/pojo/dto/MemInfoDTO.java | 2 +- .../com/njcn/energy/pojo/dto/NetDevDTO.java | 2 +- .../com/njcn/energy/pojo/dto/ParamDTO.java | 2 +- .../njcn/energy/pojo/dto/PublicParamDTO.java | 2 +- .../com/njcn/energy/pojo/dto/RegisterDTO.java | 2 +- .../energy/pojo/dto/RegisterParamDTO.java | 11 +- .../com/njcn/energy/pojo/dto/SoftInfoDTO.java | 2 +- .../java/com/njcn/energy/pojo/dto/StsDTO.java | 2 +- .../com/njcn/energy/pojo/dto/TemplateDTO.java | 2 +- .../energy/pojo/dto/TemplateDataArrayDTO.java | 2 +- .../com/njcn/energy/pojo/dto/TopicDTO.java | 2 +- .../njcn/energy/pojo/dto/TopicParamDTO.java | 3 +- .../com/njcn/energy/pojo/dto/TpListDTO.java | 2 +- .../energy/handler/MqttMessageHandler.java | 265 ++++++++---------- 38 files changed, 242 insertions(+), 192 deletions(-) diff --git a/pqs-common/common-influxdb/src/test/java/DataTest.java b/pqs-common/common-influxdb/src/test/java/DataTest.java index a8fa6f1d1..4bbcf3a20 100644 --- a/pqs-common/common-influxdb/src/test/java/DataTest.java +++ b/pqs-common/common-influxdb/src/test/java/DataTest.java @@ -61,7 +61,7 @@ public class DataTest { } public static void main(String[] args) { - InfluxDbUtils influxDBUtil = new InfluxDbUtils("admin", "123456", "http://192.168.1.18:8086", "pqsbase_sjzx", ""); + InfluxDbUtils influxDBUtil = new InfluxDbUtils("root", "123456", "http://127.0.0.1:8086", "pqsadmin_jb", ""); insert(influxDBUtil); } @@ -72,16 +72,88 @@ public class DataTest { //单条数据插入 public static void insert(InfluxDbUtils influxDBUtil) { + +// Map tags = new HashMap<>(); +// long time = Long.parseLong("1719921600000"); +// tags.put("line_id", "82a9bad93e784c37135db4589794e6b0"); +// tags.put("phasic_type", "A"); +// tags.put("value_type","CP95"); +// tags.put("quality_flag","0"); +// +// Map fields = new HashMap<>(); +// fields.put("i_2",0); +// fields.put("i_3",0); +// fields.put("i_4",0); +// fields.put("i_5",6.02); +// fields.put("i_6",0); +// fields.put("i_7",0); +// fields.put("i_8",0); +// fields.put("i_9",0); +// fields.put("i_10",0); +// fields.put("i_11",0); +// fields.put("i_12",0); +// fields.put("i_13",0); +// fields.put("i_14",0); +// fields.put("i_15",3.25); +// fields.put("i_16",0); +// fields.put("i_17",0); +// fields.put("i_18",0); +// fields.put("i_19",0); +// fields.put("i_20",0); +// fields.put("i_21",0); +// fields.put("i_22",0); +// fields.put("i_23",0); +// fields.put("i_24",3.52); +// fields.put("i_25",0); +// influxDBUtil.insert("data_i", tags, fields, time, TimeUnit.MILLISECONDS); + Map tags = new HashMap<>(); - long time = Long.parseLong("1675958400000"); - tags.put("dev_id", "57d121d45a26f3cc1d7b6ba541f895c0"); + long time = Long.parseLong("1719842400000"); + tags.put("line_id", "ebdf6cbc275c5d7ed8104fcb3792fb0a"); + tags.put("phasic_type", "A"); + tags.put("value_type","CP95"); + tags.put("quality_flag","0"); + Map fields = new HashMap<>(); + fields.put("v_1",10.0); + fields.put("v_2",0); + fields.put("v_3",0); + fields.put("v_4",0); + fields.put("v_5",6.02); + fields.put("v_6",0); + fields.put("v_7",0); + fields.put("v_8",0); + fields.put("v_9",0); + fields.put("v_10",0); + fields.put("v_11",0); + fields.put("v_12",0); + fields.put("v_13",0); + fields.put("v_14",0); + fields.put("v_15",3.25); + fields.put("v_16",0); + fields.put("v_17",0); + fields.put("v_18",0); + fields.put("v_19",0); + fields.put("v_20",0); + fields.put("v_21",0); + fields.put("v_22",0); + fields.put("v_23",0); + fields.put("v_24",3.52); + fields.put("v_25",0); + influxDBUtil.insert("data_inharm_v", tags, fields, time, TimeUnit.MILLISECONDS); + + + +// Map tags = new HashMap<>(); +// long time = Long.parseLong("1675958400000"); +// tags.put("dev_id", "57d121d45a26f3cc1d7b6ba541f895c0"); +// Map fields = new HashMap<>(); // fields.put("due",1440); // fields.put("real",1200); - fields.put("online_min", 0); - fields.put("offline_min", 1440); - fields.put("online_rate", 0.0000); - influxDBUtil.insert("pqs_onlinerate", tags, fields, time, TimeUnit.MILLISECONDS); +// fields.put("online_min", 0); +// fields.put("offline_min", 1440); +// fields.put("online_rate", 0.0000); +// influxDBUtil.insert("pqs_onlinerate", tags, fields, time, TimeUnit.MILLISECONDS); // long time = Long.parseLong("1655135328135"); // Map tags = new HashMap<>(); // // tags.put("line_id", "127fad1dcb0077ac2979141b8473a5e4"); diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/ACtrlDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/ACtrlDTO.java index 22847ef5c..77cd0bf21 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/ACtrlDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/ACtrlDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/AccessDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/AccessDTO.java index 852cc0a0b..d6d3f5d76 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/AccessDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/AccessDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName;; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/AccessParamDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/AccessParamDTO.java index 747f02c5d..1d07b0133 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/AccessParamDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/AccessParamDTO.java @@ -1,6 +1,7 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName; + +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/AlmDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/AlmDTO.java index afd2264eb..03e2de4a0 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/AlmDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/AlmDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName;; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/AskDataDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/AskDataDTO.java index 14364ce3c..4e6756971 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/AskDataDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/AskDataDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName;; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/CpuInfoDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/CpuInfoDTO.java index 2bff2d710..ef1af9f5f 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/CpuInfoDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/CpuInfoDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName;; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/CtrlDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/CtrlDTO.java index 015ec7e53..5bee5ef50 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/CtrlDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/CtrlDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DataArrayDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DataArrayDTO.java index a9681ebae..dcea916af 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DataArrayDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DataArrayDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName;; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DataArrayListDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DataArrayListDTO.java index 93b1c4313..42bb3f8d1 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DataArrayListDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DataArrayListDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName;; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; /** diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DataSetDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DataSetDTO.java index efffaa60a..ad970b83c 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DataSetDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DataSetDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DevCfgDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DevCfgDTO.java index 684306c35..be337d429 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DevCfgDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DevCfgDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DevDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DevDTO.java index b23c4377f..6b907ae66 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DevDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DevDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName;; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DevInfoDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DevInfoDTO.java index 330e6b010..57e293021 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DevInfoDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DevInfoDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName;; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DeviceDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DeviceDTO.java index a0bf2dc70..76ef5331b 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DeviceDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DeviceDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName;; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DeviceOperateDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DeviceOperateDTO.java index 2be5ddb96..68189160b 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DeviceOperateDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DeviceOperateDTO.java @@ -3,8 +3,6 @@ package com.njcn.energy.pojo.dto; import lombok.Data; import java.io.Serializable; -import java.sql.Timestamp; -import java.time.LocalDateTime; import java.util.List; /** diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DiDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DiDTO.java index ac2b9c45f..8acadea46 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DiDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DiDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName;; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DiskInfoDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DiskInfoDTO.java index 75a4ca947..1a80967d4 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DiskInfoDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DiskInfoDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName;; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DoDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DoDTO.java index b06ec7325..e7c48dc22 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DoDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/DoDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName;; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/EpdPqdDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/EpdPqdDTO.java index c4bef5678..80d08d237 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/EpdPqdDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/EpdPqdDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName;; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/EvtDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/EvtDTO.java index 7466ceb3b..abf384f51 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/EvtDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/EvtDTO.java @@ -1,7 +1,7 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/EvtParam.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/EvtParam.java index e0a9c0c67..de75f0407 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/EvtParam.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/EvtParam.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName;; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/LineDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/LineDTO.java index 702e2d0e4..55e9886f0 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/LineDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/LineDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/MdDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/MdDTO.java index f2fa1adf2..5776eaa45 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/MdDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/MdDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName;; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/MemInfoDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/MemInfoDTO.java index 1adccddcd..f3809fe12 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/MemInfoDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/MemInfoDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName;; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/NetDevDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/NetDevDTO.java index 60234d0ec..04cf3375c 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/NetDevDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/NetDevDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName;; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/ParamDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/ParamDTO.java index f27d81c3c..618d17339 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/ParamDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/ParamDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/PublicParamDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/PublicParamDTO.java index 6b72fbaca..f617afd3a 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/PublicParamDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/PublicParamDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName;; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/RegisterDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/RegisterDTO.java index 825a781a5..916c9eed2 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/RegisterDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/RegisterDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName;; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/RegisterParamDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/RegisterParamDTO.java index 0863a590c..384ce2390 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/RegisterParamDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/RegisterParamDTO.java @@ -1,18 +1,15 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName;; -import com.njcn.common.pojo.constant.PatternRegex; -import com.njcn.energy.pojo.param.LineParam; -import com.njcn.web.constant.ValidMessage; -import io.swagger.annotations.ApiModelProperty; + +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; import java.io.Serializable; import java.util.List; +; + /** * 类的介绍： * diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/SoftInfoDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/SoftInfoDTO.java index 2324a703f..bc06238a4 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/SoftInfoDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/SoftInfoDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName;; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/StsDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/StsDTO.java index c3382ae17..afab4aa54 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/StsDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/StsDTO.java @@ -1,7 +1,7 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/TemplateDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/TemplateDTO.java index 7859309fd..109e25e7a 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/TemplateDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/TemplateDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName;; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/TemplateDataArrayDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/TemplateDataArrayDTO.java index ef1394493..1346ec637 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/TemplateDataArrayDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/TemplateDataArrayDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/TopicDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/TopicDTO.java index e8410d1a4..097bb11e6 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/TopicDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/TopicDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName;; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/TopicParamDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/TopicParamDTO.java index a47647dd6..7ca6083a5 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/TopicParamDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/TopicParamDTO.java @@ -1,10 +1,9 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName;; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; -import java.util.List; /** * 类的介绍： diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/TpListDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/TpListDTO.java index 9a80605ce..ac598359f 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/TpListDTO.java +++ b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/TpListDTO.java @@ -1,6 +1,6 @@ package com.njcn.energy.pojo.dto; -import com.google.gson.annotations.SerializedName;; +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; diff --git a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/handler/MqttMessageHandler.java b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/handler/MqttMessageHandler.java index 11cb64c26..0547ed784 100644 --- a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/handler/MqttMessageHandler.java +++ b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/handler/MqttMessageHandler.java @@ -1,39 +1,27 @@ package com.njcn.energy.handler; -import cn.hutool.json.JSONObject; import com.alibaba.nacos.shaded.com.google.gson.Gson; import com.github.tocrhz.mqtt.annotation.MqttSubscribe; import com.github.tocrhz.mqtt.annotation.NamedValue; import com.github.tocrhz.mqtt.annotation.Payload; import com.github.tocrhz.mqtt.publisher.MqttPublisher; import com.njcn.energy.pojo.constant.ApiParam; -import com.njcn.energy.pojo.dto.AirStrategyDTO; import com.njcn.energy.pojo.dto.DeviceOperateDTO; import com.njcn.energy.pojo.dto.RegisterDTO; import com.njcn.energy.pojo.enums.EnergyResponseEnum; -import com.njcn.energy.pojo.po.AirStrategy; import com.njcn.energy.pojo.po.EleLogs; import com.njcn.energy.service.IEleLogsService; import com.njcn.energy.service.IModelService; import com.njcn.redis.utils.RedisUtil; -import io.swagger.models.auth.In; -import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import net.sf.json.JSON; import org.eclipse.paho.client.mqttv3.MqttMessage; -import org.json.JSONException; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; import java.nio.charset.StandardCharsets; import java.time.LocalDateTime; import java.time.ZoneOffset; -import java.util.Calendar; -import java.util.Date; import java.util.Objects; -import java.util.concurrent.TimeUnit; /** * @author hongawen @@ -54,139 +42,134 @@ public class MqttMessageHandler { private final IEleLogsService eleLogsService; -// /** -// * 设备注册 -// */ -// @MqttSubscribe(value = "/device/register",qos = 1) -// public void register(String topic, MqttMessage message, @Payload String payload) { -// String result = modelService.deviceRegister(new String(message.getPayload(), StandardCharsets.UTF_8)); -// publisher.send("/platform/register",result,1,false); -// EleLogs eleLogs = new EleLogs(); -// eleLogs.setType(1); -// //设备取消注册，需要通知平台 + /** + * 设备注册 + */ + @MqttSubscribe(value = "/device/register",qos = 1) + public void register(String topic, MqttMessage message, @Payload String payload) { + String result = modelService.deviceRegister(new String(message.getPayload(), StandardCharsets.UTF_8)); + publisher.send("/platform/register",result,1,false); + EleLogs eleLogs = new EleLogs(); + eleLogs.setType(1); + //设备取消注册，需要通知平台 + Gson gson = new Gson(); + RegisterDTO.RegisterRequest registerDTO = gson.fromJson(new String(message.getPayload(), StandardCharsets.UTF_8), RegisterDTO.RegisterRequest.class); + RegisterDTO.RegisterResponse response = gson.fromJson(result, RegisterDTO.RegisterResponse.class); + if (registerDTO.getParam().getType() == 0){ + eleLogs.setType(0); + if (response.getCode() == 200 && response.getParam().getRes() == 1){ + DeviceOperateDTO deviceOperateDTO = new DeviceOperateDTO(); + deviceOperateDTO.setNdid(registerDTO.getParam().getNDid()); + deviceOperateDTO.setDid(response.getParam().getDid()); + deviceOperateDTO.setTime(Long.toString(System.currentTimeMillis()/1000)); + deviceOperateDTO.setMessage("装置取消注册"); + deviceOperateDTO.setType("003"); + publisher.send("/device/platform",gson.toJson(deviceOperateDTO),1,false); + } + } + //将日志存库 + eleLogs.setNdid(registerDTO.getParam().getNDid()); + eleLogs.setReqTime(LocalDateTime.ofEpochSecond(Long.parseLong(registerDTO.getTimestamp()), 0, ZoneOffset.ofHours(8))); + eleLogs.setInfo(response.getMsg()); + eleLogs.setCreateTime(LocalDateTime.now()); + eleLogsService.addLogs(eleLogs); + } + + /** + * 设备接入 + */ + @MqttSubscribe(value = "/device/pltreq/{version}/{edgeId}",qos = 1) + public void access(String topic, MqttMessage message, @NamedValue("edgeId") String edgeId,@NamedValue("version") String version, @Payload String payload) throws InterruptedException { + String result = modelService.deviceAccess(new String(message.getPayload(), StandardCharsets.UTF_8),edgeId); + Gson gson = new Gson(); + RegisterDTO.RegisterRequest registerDTO = gson.fromJson(new String(message.getPayload(), StandardCharsets.UTF_8), RegisterDTO.RegisterRequest.class); + RegisterDTO.RegisterResponse response = gson.fromJson(result, RegisterDTO.RegisterResponse.class); + //设备接入成功，需要通知平台 + if (response.getCode() == 200 && Objects.equals(response.getType(), ApiParam.REP_LINKUP)){ + DeviceOperateDTO deviceOperateDTO = new DeviceOperateDTO(); + deviceOperateDTO.setNdid(edgeId); + deviceOperateDTO.setDid(registerDTO.getParam().getDid()); + deviceOperateDTO.setTime(Long.toString(System.currentTimeMillis()/1000)); + deviceOperateDTO.setMessage("装置上线"); + deviceOperateDTO.setType("004"); + publisher.send("/device/platform",gson.toJson(deviceOperateDTO),1,false); + deviceOperateDTO.setMessage("主题更新"); + deviceOperateDTO.setType("002"); + publisher.send("/device/operate",gson.toJson(deviceOperateDTO),1,false); + } + //有装置异常需要主动下线，需要通知平台 + if (response.getCode() == 300 && Objects.equals(response.getType(), ApiParam.REP_HEARTBEAT)){ + DeviceOperateDTO deviceOperateDTO = new DeviceOperateDTO(); + deviceOperateDTO.setNdid(edgeId); + deviceOperateDTO.setDid(registerDTO.getParam().getDid()); + deviceOperateDTO.setTime(Long.toString(System.currentTimeMillis()/1000)); + deviceOperateDTO.setMessage("装置下线"); + deviceOperateDTO.setType("005"); + publisher.send("/device/platform",gson.toJson(deviceOperateDTO),1,false); + response.setCode(Integer.parseInt(EnergyResponseEnum.SUCCESS.getCode())); + result = gson.toJson(response); + } + /** + * 如果心跳超过3分钟，下线当前网关所有装置，需要通知平台，记录数据库掉线时间 + * 使用redis的过期时间做处理 + */ + redisUtil.saveByKeyWithExpire("MQTT:" + edgeId,registerDTO.getTimestamp(),180L); + redisUtil.saveByKeyWithExpire(edgeId,registerDTO.getTimestamp(),200L); + //将日志存库 + if (!Objects.equals(response.getType(), ApiParam.REP_HEARTBEAT)){ + EleLogs eleLogs = new EleLogs(); + eleLogs.setType(2); + eleLogs.setNdid(edgeId); + eleLogs.setReqTime(LocalDateTime.ofEpochSecond(Long.parseLong(registerDTO.getTimestamp()), 0, ZoneOffset.ofHours(8))); + eleLogs.setInfo(response.getMsg()); + eleLogs.setCreateTime(LocalDateTime.now()); + eleLogsService.addLogs(eleLogs); + } + //回复装置信息 + publisher.send("/device/pltrep/"+version+"/" + edgeId,result,1,false); + +// 询问模板数据 暂时线下传递模板数据 // Gson gson = new Gson(); -// RegisterDTO.RegisterRequest registerDTO = gson.fromJson(new String(message.getPayload(), StandardCharsets.UTF_8), RegisterDTO.RegisterRequest.class); -// RegisterDTO.RegisterResponse response = gson.fromJson(result, RegisterDTO.RegisterResponse.class); -// if (registerDTO.getParam().getType() == 0){ -// eleLogs.setType(0); -// if (response.getCode() == 200 && response.getParam().getRes() == 1){ -// DeviceOperateDTO deviceOperateDTO = new DeviceOperateDTO(); -// deviceOperateDTO.setNdid(registerDTO.getParam().getNDid()); -// deviceOperateDTO.setDid(response.getParam().getDid()); -// deviceOperateDTO.setTime(Long.toString(System.currentTimeMillis()/1000)); -// deviceOperateDTO.setMessage("装置取消注册"); -// deviceOperateDTO.setType("003"); -// publisher.send("/device/platform",gson.toJson(deviceOperateDTO),1,false); -// } +// AccessDTO.AccessResponse response = gson.fromJson(result,AccessDTO.AccessResponse.class); +// if (response.getCode() == Integer.parseInt(EnergyResponseEnum.NO_MODEL_FIND.getCode())){ +// AskDataDTO.AskDataRequest askDataDTO = new AskDataDTO.AskDataRequest(); +// askDataDTO.setTimestamp(Long.toString(System.currentTimeMillis()/1000)); +// askDataDTO.setLevel(0); +// askDataDTO.setType(ApiParam.CMD_DEV_DATA); +// AskDataParamDTO askDataParamDTO = new AskDataParamDTO(); +// askDataParamDTO.setDataType(DataType.TEMPLATE); +// askDataParamDTO.setOperate(ModelState.READ); +// askDataParamDTO.setStartTime(Long.toString(System.currentTimeMillis()/1000)); +// askDataDTO.setParam(askDataParamDTO); +// publisher.send("/platform/command/v1/" + edgeId,gson.toJson(askDataDTO),1,false); // } -// //将日志存库 -// eleLogs.setNdid(registerDTO.getParam().getNDid()); -// eleLogs.setReqTime(LocalDateTime.ofEpochSecond(Long.parseLong(registerDTO.getTimestamp()), 0, ZoneOffset.ofHours(8))); -// eleLogs.setInfo(response.getMsg()); -// eleLogs.setCreateTime(LocalDateTime.now()); -// eleLogsService.addLogs(eleLogs); -// } -// -// /** -// * 设备接入 -// */ -// @MqttSubscribe(value = "/device/pltreq/{version}/{edgeId}",qos = 1) -// public void access(String topic, MqttMessage message, @NamedValue("edgeId") String edgeId,@NamedValue("version") String version, @Payload String payload) throws InterruptedException { -// String result = modelService.deviceAccess(new String(message.getPayload(), StandardCharsets.UTF_8),edgeId); -// Gson gson = new Gson(); -// RegisterDTO.RegisterRequest registerDTO = gson.fromJson(new String(message.getPayload(), StandardCharsets.UTF_8), RegisterDTO.RegisterRequest.class); -// RegisterDTO.RegisterResponse response = gson.fromJson(result, RegisterDTO.RegisterResponse.class); -// //设备接入成功，需要通知平台 -// if (response.getCode() == 200 && Objects.equals(response.getType(), ApiParam.REP_LINKUP)){ -// DeviceOperateDTO deviceOperateDTO = new DeviceOperateDTO(); -// deviceOperateDTO.setNdid(edgeId); -// deviceOperateDTO.setDid(registerDTO.getParam().getDid()); -// deviceOperateDTO.setTime(Long.toString(System.currentTimeMillis()/1000)); -// deviceOperateDTO.setMessage("装置上线"); -// deviceOperateDTO.setType("004"); -// publisher.send("/device/platform",gson.toJson(deviceOperateDTO),1,false); -// deviceOperateDTO.setMessage("主题更新"); -// deviceOperateDTO.setType("002"); -// publisher.send("/device/operate",gson.toJson(deviceOperateDTO),1,false); -// } -// //有装置异常需要主动下线，需要通知平台 -// if (response.getCode() == 300 && Objects.equals(response.getType(), ApiParam.REP_HEARTBEAT)){ -// DeviceOperateDTO deviceOperateDTO = new DeviceOperateDTO(); -// deviceOperateDTO.setNdid(edgeId); -// deviceOperateDTO.setDid(registerDTO.getParam().getDid()); -// deviceOperateDTO.setTime(Long.toString(System.currentTimeMillis()/1000)); -// deviceOperateDTO.setMessage("装置下线"); -// deviceOperateDTO.setType("005"); -// publisher.send("/device/platform",gson.toJson(deviceOperateDTO),1,false); -// response.setCode(Integer.parseInt(EnergyResponseEnum.SUCCESS.getCode())); -// result = gson.toJson(response); -// } -// /** -// * 如果心跳超过3分钟，下线当前网关所有装置，需要通知平台，记录数据库掉线时间 -// * 使用redis的过期时间做处理 -// */ -// redisUtil.saveByKeyWithExpire("MQTT:" + edgeId,registerDTO.getTimestamp(),180L); -// redisUtil.saveByKeyWithExpire(edgeId,registerDTO.getTimestamp(),200L); -// //将日志存库 -// if (!Objects.equals(response.getType(), ApiParam.REP_HEARTBEAT)){ -// EleLogs eleLogs = new EleLogs(); -// eleLogs.setType(2); -// eleLogs.setNdid(edgeId); -// eleLogs.setReqTime(LocalDateTime.ofEpochSecond(Long.parseLong(registerDTO.getTimestamp()), 0, ZoneOffset.ofHours(8))); -// eleLogs.setInfo(response.getMsg()); -// eleLogs.setCreateTime(LocalDateTime.now()); -// eleLogsService.addLogs(eleLogs); -// } -// //回复装置信息 -// publisher.send("/device/pltrep/"+version+"/" + edgeId,result,1,false); -// -//// 询问模板数据 暂时线下传递模板数据 -//// Gson gson = new Gson(); -//// AccessDTO.AccessResponse response = gson.fromJson(result,AccessDTO.AccessResponse.class); -//// if (response.getCode() == Integer.parseInt(EnergyResponseEnum.NO_MODEL_FIND.getCode())){ -//// AskDataDTO.AskDataRequest askDataDTO = new AskDataDTO.AskDataRequest(); -//// askDataDTO.setTimestamp(Long.toString(System.currentTimeMillis()/1000)); -//// askDataDTO.setLevel(0); -//// askDataDTO.setType(ApiParam.CMD_DEV_DATA); -//// AskDataParamDTO askDataParamDTO = new AskDataParamDTO(); -//// askDataParamDTO.setDataType(DataType.TEMPLATE); -//// askDataParamDTO.setOperate(ModelState.READ); -//// askDataParamDTO.setStartTime(Long.toString(System.currentTimeMillis()/1000)); -//// askDataDTO.setParam(askDataParamDTO); -//// publisher.send("/platform/command/v1/" + edgeId,gson.toJson(askDataDTO),1,false); -//// } -// } -// -// -// /** -// * 获取模板信息 -// */ -// @MqttSubscribe(value = "/platform/reply/{version}/{edgeId}",qos = 1) -// public void replyTemplate(String topic, MqttMessage message, @NamedValue("edgeId") String edgeId, @Payload String payload) { -// String result = modelService.deviceData(new String(message.getPayload(), StandardCharsets.UTF_8)); -// //模板发生变更通知其他云服务 -// Gson gson = new Gson(); -// RegisterDTO.RegisterResponse response = gson.fromJson(result, RegisterDTO.RegisterResponse.class); -// if (Objects.equals(response.getCode(),200)){ -// DeviceOperateDTO deviceOperateDTO = new DeviceOperateDTO(); -// deviceOperateDTO.setTime(Long.toString(System.currentTimeMillis())); -// deviceOperateDTO.setMessage("模板更新"); -// deviceOperateDTO.setType("001"); -// publisher.send("/device/operate",gson.toJson(deviceOperateDTO),1,false); -// } -// } -// -// /** -// * 获取网关订阅的主题 -// */ -// @MqttSubscribe(value = "/device/topic/{edgeId}",qos = 1) -// public void subscribeTopic(String topic, MqttMessage message, @NamedValue("edgeId") String edgeId, @Payload String payload) { -// modelService.subscribeTopic(new String(message.getPayload(), StandardCharsets.UTF_8),edgeId); -// } - - + } + /** + * 获取模板信息 + */ + @MqttSubscribe(value = "/platform/reply/{version}/{edgeId}",qos = 1) + public void replyTemplate(String topic, MqttMessage message, @NamedValue("edgeId") String edgeId, @Payload String payload) { + String result = modelService.deviceData(new String(message.getPayload(), StandardCharsets.UTF_8)); + //模板发生变更通知其他云服务 + Gson gson = new Gson(); + RegisterDTO.RegisterResponse response = gson.fromJson(result, RegisterDTO.RegisterResponse.class); + if (Objects.equals(response.getCode(),200)){ + DeviceOperateDTO deviceOperateDTO = new DeviceOperateDTO(); + deviceOperateDTO.setTime(Long.toString(System.currentTimeMillis())); + deviceOperateDTO.setMessage("模板更新"); + deviceOperateDTO.setType("001"); + publisher.send("/device/operate",gson.toJson(deviceOperateDTO),1,false); + } + } + /** + * 获取网关订阅的主题 + */ + @MqttSubscribe(value = "/device/topic/{edgeId}",qos = 1) + public void subscribeTopic(String topic, MqttMessage message, @NamedValue("edgeId") String edgeId, @Payload String payload) { + modelService.subscribeTopic(new String(message.getPayload(), StandardCharsets.UTF_8),edgeId); + } }