luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

展连设备数据解析策略

Browse Source
This commit is contained in:
mi9688
2024-11-21 17:48:58 +08:00
parent db13870ffe
commit 148800d58f
26 changed files with 515 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceAlarmController.java
View File

@ -1,12 +1,10 @@
package com.fastbee.data.controller.aaScreenAgricultural;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.fastbee.common.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.deviceData.api.devlink.service.DevLinkBaseService;
import com.fastbee.deviceData.api.devlink.service.ZhanLianBaseService;
import com.fastbee.deviceInfo.manager.DeviceInformationManager;
import com.fastbee.iot.domain.AlertLog;
import com.fastbee.iot.mapper.AlertLogMapper;
@ -26,7 +24,7 @@ import java.util.Map;
public class DeviceAlarmController extends BaseController {
@Autowired
private DevLinkBaseService devLinkBaseService;
private ZhanLianBaseService zhanLianBaseService;
@Autowired
private AlertLogMapper alertLogMapper;
@ -75,7 +73,7 @@ public class DeviceAlarmController extends BaseController {
HashMap<String, Object> body = new HashMap<>();
body.put("method","get");
body.put("path","api/v1/product/device/list");
JSONObject data = devLinkBaseService.baseRequest(body);
JSONObject data = zhanLianBaseService.baseRequest(body);
//仁科设备

3
fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceRealtimedataMeteorologyController.java
View File

@ -1,6 +1,7 @@
package com.fastbee.data.controller.aaScreenAgricultural;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.deviceData.service.IDeviceRealtimedataMeteorologyService;
import com.fastbee.deviceData.service.impl.DeviceRealtimedataMeteorologyServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -12,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
public class DeviceRealtimedataMeteorologyController {
@Autowired
private DeviceRealtimedataMeteorologyServiceImpl deviceRealtimedataMeteorologyService;
private IDeviceRealtimedataMeteorologyService deviceRealtimedataMeteorologyService;
/**
* 获取最新的一条气象数据

19
fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceRealtimedataMoistureController.java
View File

@ -2,7 +2,9 @@ package com.fastbee.data.controller.aaScreenAgricultural;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.deviceData.domain.DeviceRealtimedataMoisture;
import com.fastbee.deviceData.service.IDeviceRealtimedataMoistureService;
import com.fastbee.deviceData.service.impl.DeviceRealtimedataMoistureServiceImpl;
import com.fastbee.deviceInfo.service.IDeviceInformationMoistureService;
import com.fastbee.deviceInfo.service.impl.DeviceInformationMoistureServiceImpl;
import io.lettuce.core.dynamic.annotation.Param;
import org.springframework.beans.factory.annotation.Autowired;
@ -14,21 +16,26 @@ import org.springframework.web.bind.annotation.RestController;
@RestController()
@RequestMapping("/moisture")
public class DeviceRealtimedataMoistureController {
@Autowired
private DeviceRealtimedataMoistureServiceImpl deviceRealtimedataMoistureServiceImpl;
private IDeviceRealtimedataMoistureService deviceRealtimedataMoistureService;
@Autowired
private DeviceInformationMoistureServiceImpl deviceInformationMoistureServiceImpl;
private IDeviceInformationMoistureService deviceInformationMoistureService;
/**
* 获取最新一条墒情数据
* @return
*/
@GetMapping("/weather/realtimedata")
public AjaxResult getLatestWeatherRealtimedata( String deviceId) {
return AjaxResult.success(deviceRealtimedataMoistureServiceImpl.getLatestWeatherRealtimedata(deviceId));
return AjaxResult.success(deviceRealtimedataMoistureService.getLatestWeatherRealtimedata(deviceId));
}
/**
* 获取最新一条墒情设备下拉列表
*/
@GetMapping("/weather/pullDown")
public AjaxResult getLatestWeatherPullDown() {
return AjaxResult.success(deviceInformationMoistureServiceImpl.selectDeviceInformationMoistureList(null));
return AjaxResult.success(deviceInformationMoistureService.selectDeviceInformationMoistureList(null));
}
}

2
fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceRealtimedataSeedlingGrowthController.java
View File

@ -38,8 +38,6 @@ public class DeviceRealtimedataSeedlingGrowthController {
.list();
//获取监控播放地址
list.forEach(this::setPlayUrl);
return AjaxResult.success(list);
}