采集配置

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

@@ -99,7 +99,7 @@ public class DevicePointController extends JeecgController<DevicePoint, IDeviceP
 	 @ApiOperation(value="设备采集点-根据设备id查询", notes="设备采集点-根据设备id查询")
 	 @GetMapping(value = "/queryListByDid")
 	 public Result<List<DevicePoint>> queryListByDid(@RequestParam(name="did") String did) {
-		 List<DevicePoint> list = devicePointService.list(new LambdaQueryWrapper<DevicePoint>().eq(DevicePoint::getDeviceId, did));
+		 List<DevicePoint> list = devicePointService.list(new LambdaQueryWrapper<DevicePoint>().eq(DevicePoint::getGatherServiceId, did));
 		 return Result.OK(list);
 	 }
 	
@@ -342,7 +342,7 @@ public class DevicePointController extends JeecgController<DevicePoint, IDeviceP
 	@ApiOperation(value="s7采集点-testAllS7", notes="s7采集点-testAllS7")
 	@GetMapping(value = "/testAllS7")
 	public Result<?> testAll(@RequestParam(name="id") String id) {
-		List<DevicePoint> devicePointList = devicePointService.list(new LambdaQueryWrapper<DevicePoint>().eq(DevicePoint::getDeviceId, id));
+		List<DevicePoint> devicePointList = devicePointService.list(new LambdaQueryWrapper<DevicePoint>().eq(DevicePoint::getGatherServiceId, id));
 		for (DevicePoint devicePoint : devicePointList) {
 			Query query = Query.query(Criteria.where("pointId").is(devicePoint.getId()))
 					.with(Sort.by(Sort.Order.desc("time"))).limit(1);