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-29 19:11:30 +08:00
parent 9327c600f7
commit 172bd4f89d
28 changed files with 552 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,9 @@ import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.holder.ProjectHolder;
import com.fastbee.deviceData.api.devlink.service.ZhanLianBaseService;
import com.fastbee.deviceData.domain.dto.DeviceProperties;
import com.fastbee.deviceInfo.domain.*;
import com.fastbee.deviceInfo.manager.DeviceInformationManager;
import com.fastbee.deviceInfo.mapper.*;
import com.fastbee.iot.domain.AlertLog;
import com.fastbee.iot.domain.Device;
import com.fastbee.iot.mapper.AlertLogMapper;
@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.jws.Oneway;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@ -44,6 +47,21 @@ public class DeviceAlarmController extends BaseController {
@Autowired
private DeviceMapper deviceMapper;
@Autowired
private DeviceInformationWormsMapper wormsMapper;
@Autowired
private DeviceInformationMeteorologyMapper meteorologyMapper;
@Autowired
private DeviceInformationMoistureMapper moistureMapper;
@Autowired
private DeviceInformationMonitorMapper monitorMapper;
@Autowired
private DeviceInformationTargetpestsMapper targetpestsMapper;
/**
* 获取设备告警数量
*/
@ -62,22 +80,44 @@ public class DeviceAlarmController extends BaseController {
.count();
//统计设备离线数量
List<Device> deviceList = new LambdaQueryChainWrapper<>(deviceMapper)
.select(Device::getDeviceId,Device::getDeviceName,Device::getProductId,Device::getProductName,Device::getStatus,Device::getTenantId)
.eq(Device::getTenantId, ProjectHolder.getProjectInfo().getProjectAdminId())
.list();
//循环统计状态值为4离线设备数量
int count1 = 0;
for (Device device : deviceList) {
if(device.getStatus()==4){
count1++;
}
}
// List<Device> deviceList = new LambdaQueryChainWrapper<>(deviceMapper)
// .select(Device::getDeviceId,Device::getDeviceName,Device::getProductId,Device::getProductName,Device::getStatus,Device::getTenantId)
// .eq(Device::getTenantId, ProjectHolder.getProjectInfo().getProjectAdminId())
// .list();
// //循环统计状态值为4离线设备数量
// int count1 = 0;
// for (Device device : deviceList) {
// if(device.getStatus()==4){
// count1++;
// }
// }
//统计设备总离线量
Map<String, Map<String, Object>> info = getAllTypeDeviceListAndStatusCount();
//虫情设备信息
Map<String, Object> worm = info.get("worm");
//气象设备信息
Map<String, Object> meteorology = info.get("meteorology");
//墒情设备信息
Map<String, Object> moisture = info.get("moisture");
//监控设备信息
Map<String, Object> monitor = info.get("monitor");
//杀虫灯设备信息
Map<String, Object> targetpest = info.get("targetpest");
int offlineCount=0;
//计算离线设备总数
offlineCount+=Integer.parseInt(String.valueOf(worm.get("deviceOfflineCount")));
offlineCount+=Integer.parseInt(String.valueOf(meteorology.get("deviceOfflineCount")));
offlineCount+=Integer.parseInt(String.valueOf(moisture.get("deviceOfflineCount")));
offlineCount+=Integer.parseInt(String.valueOf(monitor.get("deviceOfflineCount")));
offlineCount+=Integer.parseInt(String.valueOf(targetpest.get("deviceOfflineCount")));
Map<String,Object> resp =new HashMap<>();
resp.put("alarmTotal",count);//告警总数
resp.put("securityLevel",getSecurityLevel(count));//安全等级
resp.put("offlineDeviceTotal",count1);//离线设备总数
resp.put("offlineDeviceTotal",offlineCount);//离线设备总数
return AjaxResult.success(resp);
}
@ -97,69 +137,177 @@ public class DeviceAlarmController extends BaseController {
@GetMapping("/onlineRate")
public AjaxResult getDeviceOnlineRate(Device device) {
List<Device> deviceList = new LambdaQueryChainWrapper<>(deviceMapper)
.select(Device::getDeviceId,Device::getDeviceName,Device::getProductId,Device::getProductName,Device::getStatus,Device::getTenantId)
.eq(Device::getTenantId,device.getTenantId())
.list();
// deviceList.forEach(System.err::println);
Map<String, Map<String, Object>> info = getAllTypeDeviceListAndStatusCount();
//虫情设备信息
Map<String, Object> worm = info.get("worm");
//气象设备信息
Map<String, Object> meteorology = info.get("meteorology");
//墒情设备信息
Map<String, Object> moisture = info.get("moisture");
//监控设备信息
Map<String, Object> monitor = info.get("monitor");
//杀虫灯设备信息
Map<String, Object> targetpest = info.get("targetpest");
System.out.println("-------------------------------------------");
//封装结果
List<DeviceProperties> restList=new ArrayList<>();
restList.add(DeviceProperties.builder().name("气象监测").value(String.valueOf(meteorology.get("deviceOnlineRate"))).unit("%").build());
restList.add(DeviceProperties.builder().name("墒情监测").value(String.valueOf(moisture.get("deviceOnlineRate"))).unit("%").build());
restList.add(DeviceProperties.builder().name("虫情监测").value(String.valueOf(worm.get("deviceOnlineRate"))).unit("%").build());
// restList.add(DeviceProperties.builder().name("苗情监测").value(String.valueOf(miaoQingDeviceOnlineRate)).unit("%").build());
restList.add(DeviceProperties.builder().name("杀虫灯").value(String.valueOf(targetpest.get("deviceOnlineRate"))).unit("%").build());
restList.add(DeviceProperties.builder().name("监控").value(String.valueOf(monitor.get("deviceOnlineRate"))).unit("%").build());
return AjaxResult.success(restList);
}
/**
* 查询所有类型设备列表返回每种设备列表Map
*/
private Map<String,Map<String,Object>> getAllTypeDeviceListAndStatusCount(){
Map<String,Map<String,Object>> resultMap=new HashMap<>();
int meteorologyDeviceCount = 0;//气象设备总量
int meteorologyDeviceOnLineCount = 0;//气象设备在线量
int meteorologyDeviceOfflineCount=0;//气象设备离线量
double meteorologyDeviceOnlineRate = 0.0; //气象设备在线率
int moistureDeviceCount = 0;//墒情设备总量
int moistureDeviceOnLineCount = 0;//墒情设备在线量
int moistureDeviceOfflineCount=0;//墒情设备离线量
double moistureDeviceOnlineRate = 0.0; //墒情设备在线率
int wormDeviceCount = 0;//虫情设备总量
int wormDeviceOnLineCount = 0;//虫情设备在线量
int wormDeviceOfflineCount=0;//虫情设备离线量
double wormDeviceOnlineRate = 0.0; //虫情设备在线率
int miaoQingDeviceCount = 0;//苗情设备总量
int miaoQingDeviceOnLineCount = 0;//苗情设备在线量
int miaoQingDeviceOfflineCount=0;//苗情设备离线量
double miaoQingDeviceOnlineRate = 0.0; //苗情设备在线率
int insecticidalLampDeviceCount = 0;//杀虫灯设备总量
int insecticidalLampDeviceOnLineCount = 0;//杀虫灯设备在线量
int insecticidalLampDeviceOfflineCount=0;//杀虫灯设备离线量
double insecticidalLampDeviceOnlineRate = 0.0; //杀虫灯设备在线率
int monitorDeviceCount = 0;//监控设备总量
int monitorDeviceOnLineCount = 0;//监控设备在线量
int monitorDeviceOfflineCount=0;//监控设备离线量
double monitorDeviceOnlineRate = 0.0; //监控设备在线率
for (Device d:deviceList) {
if (d.getProductName().equals("气象设备") || d.getProductId() == 144) {
meteorologyDeviceCount++;
if (d.getStatus() == 3) {
meteorologyDeviceOnLineCount++;
}
} else if (d.getProductName().equals("墒情设备") || d.getProductId() == 142) {
moistureDeviceCount++;
if (d.getStatus() == 3) {
moistureDeviceOnLineCount++;
}
} else if (d.getProductName().equals("太阳能供电设备") || d.getProductId() == 138) {
miaoQingDeviceCount++;
if (d.getStatus() == 3) {
miaoQingDeviceOnLineCount++;
}
} else if (d.getProductName().equals("杀虫灯设备") || d.getProductId() == 145) {
insecticidalLampDeviceCount++;
if (d.getStatus() == 3) {
insecticidalLampDeviceOnLineCount++;
}
} else if (d.getProductName().equals("虫情设备") || d.getProductId() == 143) {
wormDeviceCount++;
if (d.getStatus() == 3) {
wormDeviceOnLineCount++;
}
// List<Device> deviceList = new LambdaQueryChainWrapper<>(deviceMapper)
// .select(Device::getDeviceId,Device::getDeviceName,Device::getProductId,Device::getProductName,Device::getStatus,Device::getTenantId)
// .eq(Device::getTenantId,device.getTenantId())
// .list();
//// deviceList.forEach(System.err::println);
// for (Device d:deviceList) {
// if (d.getProductName().equals("气象设备") || d.getProductId() == 144) {
// meteorologyDeviceCount++;
// if (d.getStatus() == 3) {
// meteorologyDeviceOnLineCount++;
// }
// } else if (d.getProductName().equals("墒情设备") || d.getProductId() == 142) {
// moistureDeviceCount++;
// if (d.getStatus() == 3) {
// moistureDeviceOnLineCount++;
// }
// } else if (d.getProductName().equals("太阳能供电设备") || d.getProductId() == 138) {
// miaoQingDeviceCount++;
// if (d.getStatus() == 3) {
// miaoQingDeviceOnLineCount++;
// }
// } else if (d.getProductName().equals("杀虫灯设备") || d.getProductId() == 145) {
// insecticidalLampDeviceCount++;
// if (d.getStatus() == 3) {
// insecticidalLampDeviceOnLineCount++;
// }
// } else if (d.getProductName().equals("虫情设备") || d.getProductId() == 143) {
// wormDeviceCount++;
// if (d.getStatus() == 3) {
// wormDeviceOnLineCount++;
// }
//
// } else if ( d.getProductName().equals("萤石云视频")||d.getProductId()==141) {
// monitorDeviceCount++;
// if(d.getStatus()==3){
// monitorDeviceOnLineCount++;
// }
// }
// }
} else if ( d.getProductName().equals("萤石云视频")||d.getProductId()==141) {
monitorDeviceCount++;
if(d.getStatus()==3){
monitorDeviceOnLineCount++;
}
//查询虫情设备列表
List<DeviceInformationWorms> wormList = new LambdaQueryChainWrapper<>(wormsMapper)
.select(DeviceInformationWorms::getStatus)
.list();
wormDeviceCount=wormList.size();
for(DeviceInformationWorms d:wormList){
if(d.getStatus()==1){
wormDeviceOnLineCount++;
} else if (d.getStatus()==0) {
wormDeviceOfflineCount++;
}
}
//查询墒情设备列表
List<DeviceInformationMoisture> moistureList = new LambdaQueryChainWrapper<>(moistureMapper).select(DeviceInformationMoisture::getStatus).list();
moistureDeviceCount=moistureList.size();
for(DeviceInformationMoisture d:moistureList){
if(d.getStatus()==1){
moistureDeviceOnLineCount++;
} else if (d.getStatus()==0) {
meteorologyDeviceOfflineCount++;
}
}
//查询气象设备列表
List<DeviceInformationMeteorology> meteorologyList = new LambdaQueryChainWrapper<>(meteorologyMapper).select(DeviceInformationMeteorology::getStatus).list();
meteorologyDeviceCount=meteorologyList.size();
for(DeviceInformationMeteorology d:meteorologyList){
if(d.getStatus()==1){
meteorologyDeviceOnLineCount++;
} else if (d.getStatus()==0) {
meteorologyDeviceOfflineCount++;
}
}
//查询监控设备列表
List<DeviceInformationMonitor> monitorList = new LambdaQueryChainWrapper<>(monitorMapper).select(DeviceInformationMonitor::getStatus).list();
monitorDeviceCount=monitorList.size();
for(DeviceInformationMonitor d:monitorList){
if(d.getStatus()==1){
monitorDeviceOnLineCount++;
} else if (d.getStatus()==0) {
monitorDeviceOfflineCount++;
}
}
//查询杀虫灯设备列表
List<DeviceInformationTargetpests> targetpestList = new LambdaQueryChainWrapper<>(targetpestsMapper).select(DeviceInformationTargetpests::getStatus).list();
insecticidalLampDeviceCount=targetpestList.size();
for(DeviceInformationTargetpests d:targetpestList){
if(d.getStatus()==1){
insecticidalLampDeviceOnLineCount++;
} else if (d.getStatus()==0) {
insecticidalLampDeviceOfflineCount++;
}
}
//计算在线率
//气象设备在线率
meteorologyDeviceOnlineRate = meteorologyDeviceCount==0?0.0:((double) meteorologyDeviceOnLineCount / meteorologyDeviceCount)*100;
//墒情设备在线率
moistureDeviceOnlineRate = moistureDeviceCount==0?0.0:((double) moistureDeviceOnLineCount / moistureDeviceCount)*100;
//虫情设备在线率
wormDeviceOnlineRate = wormDeviceCount==0?0.0:((double) wormDeviceOnLineCount / wormDeviceCount)*100;
//苗情设备在线率
// miaoQingDeviceOnlineRate = miaoQingDeviceCount==0?0.0:((double) miaoQingDeviceOnLineCount / miaoQingDeviceCount)*100;
//杀虫灯设备在线率
insecticidalLampDeviceOnlineRate = insecticidalLampDeviceCount==0?0.0:((double) insecticidalLampDeviceOnLineCount / insecticidalLampDeviceCount)*100;
//监控设备在线率
monitorDeviceOnlineRate = monitorDeviceCount==0?0.0:((double) monitorDeviceOnLineCount / monitorDeviceCount)*100;
//打印累加后结果
System.out.println("气象设备总量:"+meteorologyDeviceCount);
System.out.println("气象设备在线量:"+meteorologyDeviceOnLineCount);
@ -172,10 +320,10 @@ public class DeviceAlarmController extends BaseController {
System.out.println("虫情设备总量:"+wormDeviceCount);
System.out.println("虫情设备在线量:"+wormDeviceOnLineCount);
System.out.println("虫情设备在线率:"+wormDeviceOnlineRate);
System.out.println("-------------------------------------------");
System.out.println("苗情设备总量:"+miaoQingDeviceCount);
System.out.println("苗情设备在线量:"+miaoQingDeviceOnLineCount);
System.out.println("苗情设备在线率:"+miaoQingDeviceOnlineRate);
// System.out.println("-------------------------------------------");
// System.out.println("苗情设备总量:"+miaoQingDeviceCount);
// System.out.println("苗情设备在线量:"+miaoQingDeviceOnLineCount);
// System.out.println("苗情设备在线率:"+miaoQingDeviceOnlineRate);
System.out.println("-------------------------------------------");
System.out.println("杀虫灯设备总量:"+insecticidalLampDeviceCount);
System.out.println("杀虫灯设备在线量:"+insecticidalLampDeviceOnLineCount);
@ -185,33 +333,51 @@ public class DeviceAlarmController extends BaseController {
System.out.println("监控设备在线量:"+monitorDeviceOnLineCount);
System.out.println("监控设备在线率:"+monitorDeviceOnlineRate);
System.out.println("-------------------------------------------");
//计算在线率
//气象设备在线率
meteorologyDeviceOnlineRate = meteorologyDeviceCount==0?0.0:((double) meteorologyDeviceOnLineCount / meteorologyDeviceCount)*100;
//墒情设备在线率
moistureDeviceOnlineRate = moistureDeviceCount==0?0.0:((double) moistureDeviceOnLineCount / moistureDeviceCount)*100;
//虫情设备在线率
wormDeviceOnlineRate = wormDeviceCount==0?0.0:((double) wormDeviceOnLineCount / wormDeviceCount)*100;
//苗情设备在线率
miaoQingDeviceOnlineRate = miaoQingDeviceCount==0?0.0:((double) miaoQingDeviceOnLineCount / miaoQingDeviceCount)*100;
//杀虫灯设备在线率
insecticidalLampDeviceOnlineRate = insecticidalLampDeviceCount==0?0.0:((double) insecticidalLampDeviceOnLineCount / insecticidalLampDeviceCount)*100;
//监控设备在线率
monitorDeviceOnlineRate = monitorDeviceCount==0?0.0:((double) monitorDeviceOnLineCount / monitorDeviceCount)*100;
//封装结果
List<DeviceProperties> restList=new ArrayList<>();
restList.add(DeviceProperties.builder().name("气象监测").value(String.valueOf(meteorologyDeviceOnlineRate)).unit("%").build());
restList.add(DeviceProperties.builder().name("墒情监测").value(String.valueOf(moistureDeviceOnlineRate)).unit("%").build());
restList.add(DeviceProperties.builder().name("虫情监测").value(String.valueOf(wormDeviceOnlineRate)).unit("%").build());
restList.add(DeviceProperties.builder().name("苗情监测").value(String.valueOf(miaoQingDeviceOnlineRate)).unit("%").build());
restList.add(DeviceProperties.builder().name("杀虫灯").value(String.valueOf(insecticidalLampDeviceOnlineRate)).unit("%").build());
restList.add(DeviceProperties.builder().name("监控").value(String.valueOf(monitorDeviceOnlineRate)).unit("%").build());
return AjaxResult.success(restList);
Map<String,Object> worm=new HashMap<>();
worm.put("deviceCount",wormDeviceCount);
worm.put("deviceOnlineCount",wormDeviceOnLineCount);
worm.put("deviceOfflineCount",wormDeviceOfflineCount);
worm.put("deviceOnlineRate",wormDeviceOnlineRate);
resultMap.put("worm",worm);
Map<String,Object> moisture=new HashMap<>();
moisture.put("deviceCount",moistureDeviceCount);
moisture.put("deviceOnlineCount",moistureDeviceOnLineCount);
moisture.put("deviceOfflineCount",moistureDeviceOfflineCount);
moisture.put("deviceOnlineRate",moistureDeviceOnlineRate);
resultMap.put("moisture",moisture);
Map<String,Object> meteorology=new HashMap<>();
meteorology.put("deviceCount",meteorologyDeviceCount);
meteorology.put("deviceOnlineCount",meteorologyDeviceOnLineCount);
meteorology.put("deviceOfflineCount",meteorologyDeviceOfflineCount);
meteorology.put("deviceOnlineRate",meteorologyDeviceOnlineRate);
resultMap.put("meteorology",meteorology);
Map<String,Object> targetpest=new HashMap<>();
targetpest.put("deviceCount",insecticidalLampDeviceCount );
targetpest.put("deviceOnlineCount",insecticidalLampDeviceOnLineCount);
targetpest.put("deviceOfflineCount",insecticidalLampDeviceOfflineCount);
targetpest.put("deviceOnlineRate",insecticidalLampDeviceOnlineRate);
resultMap.put("targetpest",targetpest);
Map<String,Object> monitor=new HashMap<>();
monitor.put("deviceCount",monitorDeviceCount);
monitor.put("deviceOnlineCount",monitorDeviceOnLineCount);
monitor.put("deviceOfflineCount",monitorDeviceOfflineCount);
monitor.put("deviceOnlineRate",monitorDeviceOnlineRate);
resultMap.put("monitor",monitor);
return resultMap;
}
/**
* 研判等级评级策略方法
* A级，3个以下报警；B级，3-10个报警；C级；10个以上报警

4
fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationMeteorologyController.java → fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/deviceBaseInfo/DeviceInformationMeteorologyController.java
View File

@ -1,4 +1,4 @@
package com.fastbee.data.controller.aaScreenAgricultural;
package com.fastbee.data.controller.aaScreenAgricultural.deviceBaseInfo;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
@ -15,10 +15,8 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fastbee.common.annotation.Log;
import com.fastbee.common.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.enums.BusinessType;
import com.fastbee.deviceInfo.domain.DeviceInformationMeteorology;
import com.fastbee.deviceInfo.service.IDeviceInformationMeteorologyService;
import com.fastbee.common.utils.poi.ExcelUtil;

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

@ -1,4 +1,4 @@
package com.fastbee.data.controller.aaScreenAgricultural;
package com.fastbee.data.controller.aaScreenAgricultural.deviceBaseInfo;
import java.util.List;
import javax.servlet.http.HttpServletResponse;

4
fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationMoistureController.java → fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/deviceBaseInfo/DeviceInformationMoistureController.java
View File

@ -1,4 +1,4 @@
package com.fastbee.data.controller.aaScreenAgricultural;
package com.fastbee.data.controller.aaScreenAgricultural.deviceBaseInfo;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
@ -15,10 +15,8 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fastbee.common.annotation.Log;
import com.fastbee.common.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.enums.BusinessType;
import com.fastbee.deviceInfo.domain.DeviceInformationMoisture;
import com.fastbee.deviceInfo.service.IDeviceInformationMoistureService;
import com.fastbee.common.utils.poi.ExcelUtil;

4
fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationMonitorController.java → fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/deviceBaseInfo/DeviceInformationMonitorController.java
View File

@ -1,4 +1,4 @@
package com.fastbee.data.controller.aaScreenAgricultural;
package com.fastbee.data.controller.aaScreenAgricultural.deviceBaseInfo;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
@ -15,10 +15,8 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fastbee.common.annotation.Log;
import com.fastbee.common.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.enums.BusinessType;
import com.fastbee.deviceInfo.domain.DeviceInformationMonitor;
import com.fastbee.deviceInfo.service.IDeviceInformationMonitorService;
import com.fastbee.common.utils.poi.ExcelUtil;

4
fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationTargetpestsController.java → fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/deviceBaseInfo/DeviceInformationTargetpestsController.java
View File

@ -1,4 +1,4 @@
package com.fastbee.data.controller.aaScreenAgricultural;
package com.fastbee.data.controller.aaScreenAgricultural.deviceBaseInfo;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
@ -15,10 +15,8 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fastbee.common.annotation.Log;
import com.fastbee.common.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.enums.BusinessType;
import com.fastbee.deviceInfo.domain.DeviceInformationTargetpests;
import com.fastbee.deviceInfo.service.IDeviceInformationTargetpestsService;
import com.fastbee.common.utils.poi.ExcelUtil;

4
fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationWormsController.java → fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/deviceBaseInfo/DeviceInformationWormsController.java
View File

@ -1,4 +1,4 @@
package com.fastbee.data.controller.aaScreenAgricultural;
package com.fastbee.data.controller.aaScreenAgricultural.deviceBaseInfo;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
@ -15,10 +15,8 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fastbee.common.annotation.Log;
import com.fastbee.common.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.enums.BusinessType;
import com.fastbee.deviceInfo.domain.DeviceInformationWorms;
import com.fastbee.deviceInfo.service.IDeviceInformationWormsService;
import com.fastbee.common.utils.poi.ExcelUtil;

4
fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/historyData/DeviceHistoryDataController.java → fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/deviceHistoryData/DeviceHistoryDataController.java
View File

@ -1,12 +1,10 @@
package com.fastbee.data.controller.aaScreenAgricultural.historyData;
package com.fastbee.data.controller.aaScreenAgricultural.deviceHistoryData;
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.common.core.page.TableDataInfo;
import com.fastbee.deviceData.domain.*;
import com.fastbee.deviceData.mapper.*;
import org.redisson.config.BaseConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;

2
fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/realTimeData/DeviceMonitorController.java → fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/deviceRealTimeData/DeviceMonitorController.java
View File

@ -1,4 +1,4 @@
package com.fastbee.data.controller.aaScreenAgricultural.realTimeData;
package com.fastbee.data.controller.aaScreenAgricultural.deviceRealTimeData;
import com.fastbee.common.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult;

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

@ -1,8 +1,7 @@
package com.fastbee.data.controller.aaScreenAgricultural;
package com.fastbee.data.controller.aaScreenAgricultural.deviceRealTimeData;
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;
import org.springframework.web.bind.annotation.RequestMapping;

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

@ -1,18 +1,16 @@
package com.fastbee.data.controller.aaScreenAgricultural;
package com.fastbee.data.controller.aaScreenAgricultural.deviceRealTimeData;
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;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 获取墒情设备实时数据
*/
@RestController()
@RequestMapping("/moisture")
public class DeviceRealtimedataMoistureController {

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

@ -1,4 +1,4 @@
package com.fastbee.data.controller.aaScreenAgricultural;
package com.fastbee.data.controller.aaScreenAgricultural.deviceRealTimeData;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.fastbee.common.core.domain.AjaxResult;
@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

7
fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceRealtimedataWormsController.java → fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/deviceRealTimeData/DeviceRealtimedataWormsController.java
View File

@ -1,15 +1,16 @@
package com.fastbee.data.controller.aaScreenAgricultural;
package com.fastbee.data.controller.aaScreenAgricultural.deviceRealTimeData;
import com.fastbee.common.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.deviceData.service.IDeviceRealtimedataMoistureService;
import com.fastbee.deviceData.service.impl.DeviceRealtimedataWormsServiceImpl;
import com.fastbee.deviceInfo.service.IDeviceInformationMoistureService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 获取虫情设备实时数据
*/
@RestController()
@RequestMapping("/worms")
public class DeviceRealtimedataWormsController extends BaseController {