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