|
@@ -3,6 +3,8 @@ package com.zhonglai.luhui.mqtt.service.topic; |
|
@@ -3,6 +3,8 @@ package com.zhonglai.luhui.mqtt.service.topic; |
|
3
|
import com.alibaba.fastjson.JSON;
|
3
|
import com.alibaba.fastjson.JSON;
|
|
4
|
import com.alibaba.fastjson.JSONObject;
|
4
|
import com.alibaba.fastjson.JSONObject;
|
|
5
|
import com.google.gson.JsonElement;
|
5
|
import com.google.gson.JsonElement;
|
|
|
|
6
|
+import com.google.gson.JsonObject;
|
|
|
|
7
|
+import com.google.gson.JsonParser;
|
|
6
|
import com.ruoyi.common.utils.GsonConstructor;
|
8
|
import com.ruoyi.common.utils.GsonConstructor;
|
|
7
|
import com.zhonglai.luhui.device.analysis.comm.dto.thingsmodels.ThingsModelItemBase;
|
9
|
import com.zhonglai.luhui.device.analysis.comm.dto.thingsmodels.ThingsModelItemBase;
|
|
8
|
import com.zhonglai.luhui.device.analysis.comm.service.BusinessDataUpdateService;
|
10
|
import com.zhonglai.luhui.device.analysis.comm.service.BusinessDataUpdateService;
|
|
@@ -14,11 +16,14 @@ import com.zhonglai.luhui.device.analysis.comm.dto.thingsmodels.ThingsModelBase; |
|
@@ -14,11 +16,14 @@ import com.zhonglai.luhui.device.analysis.comm.dto.thingsmodels.ThingsModelBase; |
|
14
|
import com.zhonglai.luhui.device.analysis.comm.dto.thingsmodels.ThingsModelDataTypeEnum;
|
16
|
import com.zhonglai.luhui.device.analysis.comm.dto.thingsmodels.ThingsModelDataTypeEnum;
|
|
15
|
import com.zhonglai.luhui.device.analysis.comm.factory.BusinessAgreement;
|
17
|
import com.zhonglai.luhui.device.analysis.comm.factory.BusinessAgreement;
|
|
16
|
import com.zhonglai.luhui.device.analysis.comm.factory.Topic;
|
18
|
import com.zhonglai.luhui.device.analysis.comm.factory.Topic;
|
|
|
|
19
|
+import com.zhonglai.luhui.mqtt.MqttApplication;
|
|
17
|
import com.zhonglai.luhui.mqtt.service.ClienNoticeService;
|
20
|
import com.zhonglai.luhui.mqtt.service.ClienNoticeService;
|
|
18
|
import com.zhonglai.luhui.device.analysis.dto.MessageCode;
|
21
|
import com.zhonglai.luhui.device.analysis.dto.MessageCode;
|
|
19
|
import com.zhonglai.luhui.device.analysis.dto.topic.ReadReqDto;
|
22
|
import com.zhonglai.luhui.device.analysis.dto.topic.ReadReqDto;
|
|
20
|
import com.zhonglai.luhui.device.analysis.comm.db.mode.TerminalDataThingsModeService;
|
23
|
import com.zhonglai.luhui.device.analysis.comm.db.mode.TerminalDataThingsModeService;
|
|
21
|
import org.apache.commons.lang3.EnumUtils;
|
24
|
import org.apache.commons.lang3.EnumUtils;
|
|
|
|
25
|
+import org.slf4j.Logger;
|
|
|
|
26
|
+import org.slf4j.LoggerFactory;
|
|
22
|
import org.springframework.beans.factory.annotation.Autowired;
|
27
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
23
|
import org.springframework.stereotype.Service;
|
28
|
import org.springframework.stereotype.Service;
|
|
24
|
|
29
|
|
|
@@ -27,6 +32,7 @@ import java.util.HashMap; |
|
@@ -27,6 +32,7 @@ import java.util.HashMap; |
|
27
|
|
32
|
|
|
28
|
@Service("READ_REQ")
|
33
|
@Service("READ_REQ")
|
|
29
|
public class ReadReqTopic implements BusinessAgreement<ReadReqDto> {
|
34
|
public class ReadReqTopic implements BusinessAgreement<ReadReqDto> {
|
|
|
|
35
|
+ private static Logger log = LoggerFactory.getLogger(ReadReqTopic.class);
|
|
30
|
@Autowired
|
36
|
@Autowired
|
|
31
|
private ClienNoticeService clienNoticeService; //客户端通知服务
|
37
|
private ClienNoticeService clienNoticeService; //客户端通知服务
|
|
32
|
@Autowired
|
38
|
@Autowired
|
|
@@ -52,6 +58,7 @@ public class ReadReqTopic implements BusinessAgreement<ReadReqDto> { |
|
@@ -52,6 +58,7 @@ public class ReadReqTopic implements BusinessAgreement<ReadReqDto> { |
|
52
|
for(String vkey:vjsonObject.keySet())
|
58
|
for(String vkey:vjsonObject.keySet())
|
|
53
|
{
|
59
|
{
|
|
54
|
JSONObject jsData = vjsonObject.getJSONObject(vkey);
|
60
|
JSONObject jsData = vjsonObject.getJSONObject(vkey);
|
|
|
|
61
|
+ JsonObject gsonData = GsonConstructor.get().fromJson(jsData.toString(), JsonObject.class);
|
|
55
|
for(String key:jsData.keySet())
|
62
|
for(String key:jsData.keySet())
|
|
56
|
{
|
63
|
{
|
|
57
|
IotThingsModel thingsModel = terminalDataThingsModeService.getIotThingsModel(topic.getUsername(),key);
|
64
|
IotThingsModel thingsModel = terminalDataThingsModeService.getIotThingsModel(topic.getUsername(),key);
|
|
@@ -74,14 +81,17 @@ public class ReadReqTopic implements BusinessAgreement<ReadReqDto> { |
|
@@ -74,14 +81,17 @@ public class ReadReqTopic implements BusinessAgreement<ReadReqDto> { |
|
74
|
{
|
81
|
{
|
|
75
|
data_type = ThingsModelDataTypeEnum.STRING.name();
|
82
|
data_type = ThingsModelDataTypeEnum.STRING.name();
|
|
76
|
}
|
83
|
}
|
|
77
|
- ThingsModelBase thingsModelBase = ThingsModelItemBase.newhingsModel(Enum.valueOf(ThingsModelDataTypeEnum.class,data_type),thingsModel, GsonConstructor.get().fromJson(jsData.get(key).toString(), JsonElement.class));
|
|
|
|
78
|
-// Class<ThingsModelBase> aClass = Enum.valueOf(ThingsModelDataTypeEnum.class,data_type).getaClass();
|
|
|
|
79
|
-// ThingsModelBase thingsModelBase = JSON.parseObject(thingsModel.getSpecs(),aClass);
|
|
|
|
80
|
-// thingsModelBase.conversionThingsModel(thingsModel);
|
|
|
|
81
|
-//
|
|
|
|
82
|
-// thingsModelBase.addValue(jsData.get(key));
|
84
|
+
|
|
|
|
85
|
+ try {
|
|
|
|
86
|
+ JsonElement vjson = JsonParser.parseString(gsonData.get(key).toString());
|
|
|
|
87
|
+ ThingsModelBase thingsModelBase = ThingsModelItemBase.newhingsModel(Enum.valueOf(ThingsModelDataTypeEnum.class,data_type),thingsModel,vjson);
|
|
83
|
|
88
|
|
|
84
|
jsData.put(key,thingsModelBase);
|
89
|
jsData.put(key,thingsModelBase);
|
|
|
|
90
|
+ }catch (Exception e)
|
|
|
|
91
|
+ {
|
|
|
|
92
|
+ log.info("{}的值{}解析异常",jsData,key);
|
|
|
|
93
|
+ throw e;
|
|
|
|
94
|
+ }
|
|
85
|
}
|
95
|
}
|
|
86
|
vjsonObject.put(vkey,jsData);
|
96
|
vjsonObject.put(vkey,jsData);
|
|
87
|
}
|
97
|
}
|
|
@@ -115,4 +125,5 @@ public class ReadReqTopic implements BusinessAgreement<ReadReqDto> { |
|
@@ -115,4 +125,5 @@ public class ReadReqTopic implements BusinessAgreement<ReadReqDto> { |
|
115
|
public ReadReqDto toData(BusinessDto data) {
|
125
|
public ReadReqDto toData(BusinessDto data) {
|
|
116
|
return JSONObject.parseObject(JSONObject.toJSONString(data.getContentData()),ReadReqDto.class);
|
126
|
return JSONObject.parseObject(JSONObject.toJSONString(data.getContentData()),ReadReqDto.class);
|
|
117
|
}
|
127
|
}
|
|
|
|
128
|
+
|
|
118
|
} |
129
|
} |
