Merge branch 'master' of http://git.xt.wenhq.top:8083/wenhongquan/iotc

# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/data/controller/TblDataController.java

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblDataController.java

@@ -78,11 +78,9 @@ public class TblDataController extends BaseController {
             gateWaySensorList.add(gateWaySensor);
         }
         for(GateWaySensor gateWaySensor:gateWaySensorList){
-            System.out.println(gateWaySensor.getTblGateway().getProtocalType());
+            gateWaySensor.setSn(gateWaySensor.getTblGateway().getSn());
               for(SysDictData sysDictData:sysDictTypeList){
-                  System.out.println(sysDictData.getDictValue());
                         if(gateWaySensor.getTblGateway().getProtocalType() == Integer.valueOf(sysDictData.getDictValue())){
-                            gateWaySensor.setSn(gateWaySensor.getTblGateway().getSn());
                             gateWaySensor.setProtocalTypeName(sysDictData.getDictLabel());
                         }
               }
@@ -105,12 +103,12 @@ public class TblDataController extends BaseController {
             sensorPoint.setTblSensorVo(tblSensorVo);
             List<PointData> pointDatas = new ArrayList<PointData>();
             JSONArray pointArry = new JSONArray(tblSensorVo.getDatapoints());
-            for(Object pointObject:pointArry) {
+            for(Object pointObject:pointArry){
                 JSONObject jsonObject = new JSONObject(pointObject);
-                if (jsonObject.get("dataPointId") != null) {
+                if(jsonObject.get("dataPointId")!=null){
                     Long pointId = Long.valueOf((String) jsonObject.get("dataPointId"));
-                    for (TblDatapointVo tblDatapointVo : tblDatapointVoList) {
-                        if (pointId == tblDatapointVo.getId()) {
+                    for(TblDatapointVo tblDatapointVo:tblDatapointVoList){
+                        if( pointId == tblDatapointVo.getId()) {
                             PointData pointData = new PointData();
                             pointData.setName((String) jsonObject.get("name"));
                             pointData.setLabel((String) jsonObject.get("label"));
@@ -120,10 +118,18 @@ public class TblDataController extends BaseController {
                             pointDatas.add(pointData);
                         }
                     }
+                }else{
+                    PointData pointData = new PointData();
+                    pointData.setName((String) jsonObject.get("name"));
+                    pointData.setLabel((String) jsonObject.get("label"));
+                    pointData.setUnit((String) jsonObject.get("unit"));
+                    pointData.setUnitType((String) jsonObject.get("unitType"));
+                    pointDatas.add(pointData);
                 }
-                sensorPoint.setDataPoints(pointDatas);
-                list.add(sensorPoint);
             }
+            tblSensorVo.setDatapoints(null);
+            sensorPoint.setDataPoints(pointDatas);
+            list.add(sensorPoint);
         }
         return list;
     }