|
|
@@ -170,10 +170,14 @@ public class IotSensorServiceImpl extends ServiceImpl<IotSensorMapper, IotSensor
|
|
|
final JSONArray jsonArray = new JSONArray();
|
|
|
final List<Map> list = JSON.parseArray(infoStr, Map.class);
|
|
|
for (Map map : list) {
|
|
|
+ String name = (String) map.get("name");
|
|
|
+ final String val = (String) map.get("val");
|
|
|
+ if ("被盗告警".equals(name)){
|
|
|
+ name = "防盗告警";
|
|
|
+ map.put("name", "防盗告警");
|
|
|
+ }
|
|
|
final JSONObject obj = JSON.parseObject(JSON.toJSONString(map), JSONObject.class);
|
|
|
jsonArray.add(obj);
|
|
|
- final String name = (String) map.get("name");
|
|
|
- final String val = (String) map.get("val");
|
|
|
|
|
|
final ElectricityMeterAttributes attributesEnum = ElectricityMeterAttributes.getEnumByName(name);
|
|
|
if (ObjectUtil.isNull(attributesEnum)) {
|