瀏覽代碼

[电表][修复]:盒子配置使用JSON

release_toaliyun_real
hupeng 6 年之前
父節點
當前提交
b5b0364d08
共有 1 個檔案被更改,包括 3 行新增5 行删除
  1. +3
    -5
      mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java

+ 3
- 5
mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java 查看文件

@@ -95,11 +95,9 @@ public class KwBoxV1Controller extends BaseController {

data.put(KwBoxService.PREFIX_SYS_STATUS,record.getRegisterStatus());
data.put(KwBoxService.PREFIX_COM_KEY,record.getComKey());
if (kwBox.getConfig() != null) {
Map configMap = JSONObject.parseObject(kwBox.getConfig());
data.put(KwBoxService.PREFIX_CONFIG, configMap);
if (kwBox.getConfig() != null)
data.put(KwBoxService.PREFIX_CONFIG, JSONObject.parseObject(kwBox.getConfig()));

};
List<String> meters = kwBoxService.findMetersAddress(kwBox);
if (!meters.isEmpty())
data.put(KwBoxService.PREFIX_METERS,meters);
@@ -147,7 +145,7 @@ public class KwBoxV1Controller extends BaseController {
kwBoxService.saveOrUpdate(record);
Map<String,Object> data = new HashMap<>();
if (kwBox.getConfig() != null)
data.put(KwBoxService.PREFIX_CONFIG,kwBox.getConfig() );
data.put(KwBoxService.PREFIX_CONFIG,JSONObject.parseObject(kwBox.getConfig()));
return new ResultData(data);
}



Loading…
取消
儲存