`fix`

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());
                         }
               }
@@ -107,19 +105,29 @@ public class TblDataController extends BaseController {
             JSONArray pointArry = new JSONArray(tblSensorVo.getDatapoints());
             for(Object pointObject:pointArry){
                 JSONObject jsonObject = new JSONObject(pointObject);
-                Long pointId = Long.valueOf((String) jsonObject.get("dataPointId"));
-                for(TblDatapointVo tblDatapointVo:tblDatapointVoList){
-                    if(pointId == tblDatapointVo.getId()) {
-                        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"));
-                        pointData.setDataPointInfo(tblDatapointVo);
-                        pointDatas.add(pointData);
+                if(jsonObject.get("dataPointId")!=null){
+                    Long pointId = Long.valueOf((String) jsonObject.get("dataPointId"));
+                    for(TblDatapointVo tblDatapointVo:tblDatapointVoList){
+                        if( pointId == tblDatapointVo.getId()) {
+                            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"));
+                            pointData.setDataPointInfo(tblDatapointVo);
+                            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);
                 }
             }
+            tblSensorVo.setDatapoints(null);
             sensorPoint.setDataPoints(pointDatas);
             list.add(sensorPoint);
         }