瀏覽代碼

调整字段

guoqiang 7 月之前
父節點
當前提交
f2be21b7ab

+ 1 - 1
jeecg-module-gather/src/main/java/org/jeecg/modules/devicePoint/controller/DevicePointController.java

@@ -347,7 +347,7 @@ public class DevicePointController extends JeecgController<DevicePoint, IDeviceP
 			Query query = Query.query(Criteria.where("pointId").is(devicePoint.getId()))
 					.with(Sort.by(Sort.Order.desc("time"))).limit(1);
 			PointData pointData = mongoTemplate.findOne(query, PointData.class, devicePoint.getId() + "_500");
-			if(pointData!=null) devicePoint.setRemarks(pointData.getDataText());
+			if(pointData!=null) devicePoint.setTestResult(pointData.getDataText());
 		}
 		return Result.OK(devicePointList);
 	}

+ 0 - 4
jeecg-module-gather/src/main/java/org/jeecg/modules/devicePoint/entity/DevicePoint.java

@@ -93,10 +93,6 @@ public class DevicePoint implements Serializable {
 	@Excel(name = "寄存器偏移位", width = 15)
     @ApiModelProperty(value = "寄存器偏移位-modbus")
     private Integer pointScale;
-    /**测试结果*/
-    @Excel(name = "测试结果", width = 15)
-    @ApiModelProperty(value = "测试结果")
-    private java.lang.String remarks;
 	/**数据类型*/
 	@Excel(name = "数据类型", width = 15)
     @ApiModelProperty(value = "数据类型")