From da663fff45cc01aaac4f5221932fd029a343b377 Mon Sep 17 00:00:00 2001 From: tongliran Date: Thu, 9 Jan 2025 18:19:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0projectId=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/config/ResourcesConfig.java | 3 +- .../DeviceAlarmController.java | 4 +-- .../DeviceInfoController.java | 20 ++++++++----- ...eviceInformationMeteorologyController.java | 2 +- ...viceRealtimedataMeteorologyController.java | 4 +-- ...eRealtimedataSeedlingGrowthController.java | 11 +++++++- ...IDeviceRealtimedataMeteorologyService.java | 2 +- ...iceRealtimedataMeteorologyServiceImpl.java | 28 ++++++++++--------- .../domain/DeviceInformationMeteorology.java | 5 ++++ .../domain/DeviceInformationMiaoqing.java | 5 ++++ .../domain/DeviceInformationMoisture.java | 5 ++++ .../domain/DeviceInformationMonitor.java | 7 +++++ .../domain/DeviceInformationTargetpests.java | 5 ++++ .../domain/DeviceInformationWorms.java | 5 ++++ .../manager/DeviceInformationManager.java | 27 +++++++++++++----- .../DeviceInformationMeteorologyMapper.xml | 7 ++++- .../DeviceInformationMiaoqingMapper.xml | 7 ++++- .../DeviceInformationMoistureMapper.xml | 7 ++++- .../mapper/DeviceInformationMonitorMapper.xml | 7 ++++- .../DeviceInformationTargetpestsMapper.xml | 7 ++++- .../mapper/DeviceInformationWormsMapper.xml | 5 ++++ 21 files changed, 133 insertions(+), 40 deletions(-) diff --git a/fastbee-framework/src/main/java/com/fastbee/framework/config/ResourcesConfig.java b/fastbee-framework/src/main/java/com/fastbee/framework/config/ResourcesConfig.java index 3b33ba4..133fa46 100644 --- a/fastbee-framework/src/main/java/com/fastbee/framework/config/ResourcesConfig.java +++ b/fastbee-framework/src/main/java/com/fastbee/framework/config/ResourcesConfig.java @@ -61,7 +61,8 @@ public class ResourcesConfig implements WebMvcConfigurer "/tool/gen/**"); //配置项目数据隔离拦截器 registry.addInterceptor(projectDataIsolationInterceptor) - .addPathPatterns("/gis/groups/**", "/gis/legend/**","/gis/site/**","/project/**","/system/**","/device/statistics/**"); + .addPathPatterns("/gis/groups/**", "/gis/legend/**","/gis/site/**","/project/**","/system/**","/device/statistics/**") + .addPathPatterns("/media/yingshiyun/**"); } /** diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceAlarmController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceAlarmController.java index 2a9aa0a..92c1626 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceAlarmController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceAlarmController.java @@ -126,8 +126,8 @@ public class DeviceAlarmController extends BaseController { * 统计不同设备数量 */ @GetMapping("/countByType") - public AjaxResult getDeviceCountByType() { - return AjaxResult.success(deviceInformationManager.getAllDeviceCount()); + public AjaxResult getDeviceCountByType(Long projectId) { + return AjaxResult.success(deviceInformationManager.getAllDeviceCount(projectId)); } /** diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInfoController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInfoController.java index bca6812..bba4bc7 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInfoController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInfoController.java @@ -44,13 +44,14 @@ public class DeviceInfoController extends BaseController { * 查询全部设备立杆列表 */ @GetMapping("/allList") - public AjaxResult getAllList() { + public AjaxResult getAllList(Long projectId) { List> result =new ArrayList<>(); //气象 LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); queryWrapper1.select(DeviceInformationMeteorology::getId,DeviceInformationMeteorology::getName, DeviceInformationMeteorology::getLongitude,DeviceInformationMeteorology::getLatitude, - DeviceInformationMeteorology::getDeviceEncoding); + DeviceInformationMeteorology::getDeviceEncoding) + .eq(DeviceInformationMeteorology::getProjectId,projectId); List deviceInformationMeteorologies = deviceInformationMeteorologyMapper.selectList(queryWrapper1); Map obj1=new HashMap<>(); obj1.put("type","气象"); @@ -60,7 +61,8 @@ public class DeviceInfoController extends BaseController { LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>(); queryWrapper2.select(DeviceInformationWorms::getId,DeviceInformationWorms::getName, DeviceInformationWorms::getLongitude,DeviceInformationWorms::getLatitude, - DeviceInformationWorms::getDeviceEncoding); + DeviceInformationWorms::getDeviceEncoding) + .eq(DeviceInformationWorms::getProjectId,projectId); List deviceInformationWorms = deviceInformationWormsMapper.selectList(queryWrapper2); Map obj2=new HashMap<>(); obj2.put("type","虫情"); @@ -71,7 +73,8 @@ public class DeviceInfoController extends BaseController { LambdaQueryWrapper queryWrapper3 = new LambdaQueryWrapper<>(); queryWrapper3.select(DeviceInformationMoisture::getId,DeviceInformationMoisture::getName, DeviceInformationMoisture::getLongitude,DeviceInformationMoisture::getLatitude, - DeviceInformationMoisture::getDeviceEncoding); + DeviceInformationMoisture::getDeviceEncoding) + .eq(DeviceInformationMoisture::getProjectId,projectId); List deviceInformationMoistures = deviceInformationMoistureMapper.selectList(queryWrapper3); Map obj3=new HashMap<>(); obj3.put("type","墒情"); @@ -82,7 +85,8 @@ public class DeviceInfoController extends BaseController { LambdaQueryWrapper queryWrapper4 = new LambdaQueryWrapper<>(); queryWrapper4.select(DeviceInformationTargetpests::getId,DeviceInformationTargetpests::getName, DeviceInformationTargetpests::getLongitude,DeviceInformationTargetpests::getLatitude, - DeviceInformationTargetpests::getDeviceEncoding); + DeviceInformationTargetpests::getDeviceEncoding) + .eq(DeviceInformationTargetpests::getProjectId,projectId); List deviceInformationTargetpests = deviceInformationTargetpestsMapper.selectList(queryWrapper4); Map obj4=new HashMap<>(); obj4.put("type","杀虫灯"); @@ -93,7 +97,8 @@ public class DeviceInfoController extends BaseController { LambdaQueryWrapper queryWrapper5 = new LambdaQueryWrapper<>(); queryWrapper5.select(DeviceInformationMiaoqing::getId,DeviceInformationMiaoqing::getName, DeviceInformationMiaoqing::getLongitude,DeviceInformationMiaoqing::getLatitude, - DeviceInformationMiaoqing::getDeviceEncoding); + DeviceInformationMiaoqing::getDeviceEncoding) + .eq(DeviceInformationMiaoqing::getProjectId,projectId); List deviceInformationMiaoqings = deviceInformationMiaoqingMapper.selectList(queryWrapper5); Map obj5=new HashMap<>(); obj5.put("type","苗情"); @@ -104,7 +109,8 @@ public class DeviceInfoController extends BaseController { LambdaQueryWrapper queryWrapper6 = new LambdaQueryWrapper<>(); queryWrapper6.select(DeviceInformationMonitor::getId,DeviceInformationMonitor::getName, DeviceInformationMonitor::getLongitude,DeviceInformationMonitor::getLatitude, - DeviceInformationMonitor::getDeviceEncoding); + DeviceInformationMonitor::getDeviceEncoding) + .eq(DeviceInformationMonitor::getProjectId,projectId); List deviceInformationMonitors = deviceInformationMonitorMapper.selectList(queryWrapper6); Map obj6=new HashMap<>(); obj6.put("type","监控"); diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/deviceBaseInfo/DeviceInformationMeteorologyController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/deviceBaseInfo/DeviceInformationMeteorologyController.java index 4d720e7..9c60816 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/deviceBaseInfo/DeviceInformationMeteorologyController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/deviceBaseInfo/DeviceInformationMeteorologyController.java @@ -39,7 +39,7 @@ public class DeviceInformationMeteorologyController extends BaseController /** * 查询气象设备基础信息列表 */ -@PreAuthorize("@ss.hasPermi('deviceInfo:meteorology:list')") +//@PreAuthorize("@ss.hasPermi('deviceInfo:meteorology:list')") @GetMapping("/list") @ApiOperation("查询气象设备基础信息列表") public TableDataInfo list(DeviceInformationMeteorology deviceInformationMeteorology) diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/deviceRealTimeData/DeviceRealtimedataMeteorologyController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/deviceRealTimeData/DeviceRealtimedataMeteorologyController.java index 8203509..30e87eb 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/deviceRealTimeData/DeviceRealtimedataMeteorologyController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/deviceRealTimeData/DeviceRealtimedataMeteorologyController.java @@ -21,8 +21,8 @@ public class DeviceRealtimedataMeteorologyController { * 获取最新的一条气象数据 */ @GetMapping(value = "/weather/realtimedata") - public AjaxResult getLatestWeatherRealtimedata() { - return AjaxResult.success(deviceRealtimedataMeteorologyService.getLatestWeatherRealtimedata()); + public AjaxResult getLatestWeatherRealtimedata(String deviceEncoding) { + return AjaxResult.success(deviceRealtimedataMeteorologyService.getLatestWeatherRealtimedata(deviceEncoding)); } } diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/deviceRealTimeData/DeviceRealtimedataSeedlingGrowthController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/deviceRealTimeData/DeviceRealtimedataSeedlingGrowthController.java index 4e8b502..41275c3 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/deviceRealTimeData/DeviceRealtimedataSeedlingGrowthController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/deviceRealTimeData/DeviceRealtimedataSeedlingGrowthController.java @@ -2,6 +2,7 @@ package com.fastbee.data.controller.aaScreenAgricultural.deviceRealTimeData; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.fastbee.common.core.domain.AjaxResult; +import com.fastbee.common.holder.ProjectHolder; import com.fastbee.deviceData.api.yingshiyun.service.YingshiyunService; import com.fastbee.deviceInfo.domain.DeviceInformationMonitor; import com.fastbee.deviceInfo.mapper.DeviceInformationMonitorMapper; @@ -30,14 +31,22 @@ public class DeviceRealtimedataSeedlingGrowthController { * 获取苗情监测监控设备列表 */ @GetMapping("/monitorDeviceList") - public AjaxResult getMonitorDeviceList() { + public AjaxResult getMonitorDeviceList(Long projectId) { + System.err.println("/monitorDeviceList"); + System.err.println("projectId:"+projectId); List list = new LambdaQueryChainWrapper<>(monitorMapper) .select(DeviceInformationMonitor::getId, DeviceInformationMonitor::getName, DeviceInformationMonitor::getDeviceEncoding, DeviceInformationMonitor::getLatitude, DeviceInformationMonitor::getLongitude) + .eq(DeviceInformationMonitor::getProjectId,projectId) + //.eq(DeviceInformationMonitor::getDeviceEncoding,deviceEncoding) .list(); + for(int i=0;i getLatestWeatherRealtimedata(); + public Map getLatestWeatherRealtimedata(String deviceEncoding); } diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataMeteorologyServiceImpl.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataMeteorologyServiceImpl.java index 54bff9a..7247205 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataMeteorologyServiceImpl.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataMeteorologyServiceImpl.java @@ -107,31 +107,33 @@ public class DeviceRealtimedataMeteorologyServiceImpl extends ServiceImpl getLatestWeatherRealtimedata(){ + public Map getLatestWeatherRealtimedata(String deviceEncoding){ Map rest= new HashMap<>(); QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.orderByDesc("real_time"); + queryWrapper.eq("device_id",deviceEncoding); queryWrapper.last("limit 1"); DeviceRealtimedataMeteorology meteorology = deviceRealtimedataMeteorologyMapper.selectOne(queryWrapper); + System.err.println(meteorology.getDeviceId()+"最新一条气象数据，时间:"+meteorology.getRealTime()); List devicePropertiesList = new ArrayList<>(); rest.put("props",devicePropertiesList); if(Objects.isNull(meteorology)){ return rest; } - devicePropertiesList.add(DeviceProperties.builder().name("空气温度").value(meteorology.getAirTemp().toString()).unit("°C").build()); - devicePropertiesList.add(DeviceProperties.builder().name("空气湿度").value(meteorology.getAirHumi().toString()).unit("%").build()); - devicePropertiesList.add(DeviceProperties.builder().name("风速").value(meteorology.getWindSpeed().toString()).unit("m/s").build()); + devicePropertiesList.add(DeviceProperties.builder().name("空气温度").value(meteorology.getAirTemp()==null?"":meteorology.getAirTemp().toString()).unit("°C").build()); + devicePropertiesList.add(DeviceProperties.builder().name("空气湿度").value(meteorology.getAirHumi()==null?"":meteorology.getAirHumi().toString()).unit("%").build()); + devicePropertiesList.add(DeviceProperties.builder().name("风速").value(meteorology.getWindSpeed()==null?"":meteorology.getWindSpeed().toString()).unit("m/s").build()); devicePropertiesList.add(DeviceProperties.builder().name("风向").value(windDirMap(meteorology.getWindDir())).unit("风").build()); - devicePropertiesList.add(DeviceProperties.builder().name("大气压力").value(meteorology.getAirPre().toString()).unit("hPa").build()); - devicePropertiesList.add(DeviceProperties.builder().name("光照度").value(meteorology.getGuangzhao().toString()).unit("lx").build()); - devicePropertiesList.add(DeviceProperties.builder().name("光合有效辐射").value(meteorology.getFushe().toString()).unit("Lux").build()); - devicePropertiesList.add(DeviceProperties.builder().name("累积雨量").value(meteorology.getSumRain().toString()).unit("mm").build()); - devicePropertiesList.add(DeviceProperties.builder().name("瞬时雨量").value(meteorology.getInsRain().toString()).unit("mm").build()); - devicePropertiesList.add(DeviceProperties.builder().name("日雨量").value(meteorology.getDayRain().toString()).unit("mm").build()); - devicePropertiesList.add(DeviceProperties.builder().name("蒸发量").value(meteorology.getZhengfa().toString()).unit("t/h").build()); - devicePropertiesList.add(DeviceProperties.builder().name("土壤温度").value(meteorology.getSoilTemp().toString()).unit("°C").build()); - devicePropertiesList.add(DeviceProperties.builder().name("土壤湿度").value(meteorology.getSoilHumi().toString()).unit("%").build()); + devicePropertiesList.add(DeviceProperties.builder().name("大气压力").value(meteorology.getAirPre()==null?"":meteorology.getAirPre().toString()).unit("hPa").build()); + devicePropertiesList.add(DeviceProperties.builder().name("光照度").value(meteorology.getGuangzhao()==null?"":meteorology.getGuangzhao().toString()).unit("lx").build()); + devicePropertiesList.add(DeviceProperties.builder().name("光合有效辐射").value(meteorology.getFushe()==null?"":meteorology.getFushe().toString()).unit("Lux").build()); + devicePropertiesList.add(DeviceProperties.builder().name("累积雨量").value(meteorology.getSumRain()==null?"":meteorology.getSumRain().toString()).unit("mm").build()); + devicePropertiesList.add(DeviceProperties.builder().name("瞬时雨量").value(meteorology.getInsRain()==null?"":meteorology.getInsRain().toString()).unit("mm").build()); + devicePropertiesList.add(DeviceProperties.builder().name("日雨量").value(meteorology.getDayRain()==null?"":meteorology.getDayRain().toString()).unit("mm").build()); + devicePropertiesList.add(DeviceProperties.builder().name("蒸发量").value(meteorology.getZhengfa()==null?"":meteorology.getZhengfa().toString()).unit("t/h").build()); + devicePropertiesList.add(DeviceProperties.builder().name("土壤温度").value(meteorology.getSoilTemp()==null?"":meteorology.getSoilTemp().toString()).unit("°C").build()); + devicePropertiesList.add(DeviceProperties.builder().name("土壤湿度").value(meteorology.getSoilHumi()==null?"":meteorology.getSoilHumi().toString()).unit("%").build()); Map info=new HashMap<>(); info.put("deviceEncoding", meteorology.getDeviceId()); diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationMeteorology.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationMeteorology.java index 8f95af7..0a22df1 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationMeteorology.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationMeteorology.java @@ -93,4 +93,9 @@ private static final long serialVersionUID = 1L; @ApiModelProperty("状态1在线，0离线") private Long status; + /** projectId */ + @Excel(name = "projectId") + @ApiModelProperty("projectId") + private String projectId; + } diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationMiaoqing.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationMiaoqing.java index 761dca5..b18fba8 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationMiaoqing.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationMiaoqing.java @@ -89,4 +89,9 @@ private static final long serialVersionUID = 1L; /** 删除标志（0代表存在，2代表删除） */ private Integer delFlag; + /** 项目id */ + @Excel(name = "项目id") + @ApiModelProperty("项目id") + private Long projectId; + } diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationMoisture.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationMoisture.java index 7ad3d1d..a909b4c 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationMoisture.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationMoisture.java @@ -99,4 +99,9 @@ private static final long serialVersionUID = 1L; @ApiModelProperty("状态1在线，0离线") private Long status; + /** 项目id */ + @Excel(name = "项目id") + @ApiModelProperty("项目id") + private Long projectId; + } diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationMonitor.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationMonitor.java index ba0e760..3608683 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationMonitor.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationMonitor.java @@ -126,4 +126,11 @@ public class DeviceInformationMonitor extends BaseEntity @ApiModelProperty("accessToken") private String accessToken; + + /** projectId */ + @Excel(name = "projectId") + @ApiModelProperty("projectId") + private Long projectId; + + } diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationTargetpests.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationTargetpests.java index 2736db8..5bdca3c 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationTargetpests.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationTargetpests.java @@ -90,4 +90,9 @@ private static final long serialVersionUID = 1L; @ApiModelProperty("状态1在线，0离线") private Long status; + /** 项目id */ + @Excel(name = "项目id") + @ApiModelProperty("项目id") + private Long projectId; + } diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationWorms.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationWorms.java index eafb8c5..0d8c5e2 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationWorms.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationWorms.java @@ -88,4 +88,9 @@ private static final long serialVersionUID = 1L; @ApiModelProperty("状态1在线，0离线") private Long status; + /** 项目id */ + @Excel(name = "项目id") + @ApiModelProperty("项目id") + private Long projectId; + } diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/manager/DeviceInformationManager.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/manager/DeviceInformationManager.java index 53cbc53..4ef0da9 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/manager/DeviceInformationManager.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/manager/DeviceInformationManager.java @@ -34,13 +34,26 @@ public class DeviceInformationManager { /** * 获取所有设备 */ - public Map getAllDeviceCount() { - List meteorologieList = meteorologyMapper.selectDeviceInformationMeteorologyList(null); - List miaoqingList = miaoqingMapper.selectDeviceInformationMiaoqingList(null); - List moistureList= moistureMapper.selectDeviceInformationMoistureList(null); - List monitorList = monitorMapper.selectDeviceInformationMonitorList(null); - List targetpestList= targetpestsMapper.selectDeviceInformationTargetpestsList(null); - List wormList = wormsMapper.selectDeviceInformationWormsList(null); + public Map getAllDeviceCount(Long projectId) { + System.err.println("projectId:"+projectId); + DeviceInformationMeteorology informationMeteorology=new DeviceInformationMeteorology(); + informationMeteorology.setProjectId(String.valueOf(projectId)); + DeviceInformationMiaoqing informationMiaoqing=new DeviceInformationMiaoqing(); + informationMiaoqing.setProjectId(projectId); + DeviceInformationMoisture informationMoisture=new DeviceInformationMoisture(); + informationMoisture.setProjectId(projectId); + DeviceInformationMonitor informationMonitor=new DeviceInformationMonitor(); + informationMonitor.setProjectId(projectId); + DeviceInformationTargetpests informationTargetpests=new DeviceInformationTargetpests(); + informationTargetpests.setProjectId(projectId); + DeviceInformationWorms informationWorms=new DeviceInformationWorms(); + informationWorms.setProjectId(projectId); + List meteorologieList = meteorologyMapper.selectDeviceInformationMeteorologyList(informationMeteorology); + List miaoqingList = miaoqingMapper.selectDeviceInformationMiaoqingList(informationMiaoqing); + List moistureList= moistureMapper.selectDeviceInformationMoistureList(informationMoisture); + List monitorList = monitorMapper.selectDeviceInformationMonitorList(informationMonitor); + List targetpestList= targetpestsMapper.selectDeviceInformationTargetpestsList(informationTargetpests); + List wormList = wormsMapper.selectDeviceInformationWormsList(informationWorms); Map resp =new HashMap<>(); resp.put("meteorologieTotal",meteorologieList.size()); diff --git a/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMeteorologyMapper.xml b/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMeteorologyMapper.xml index 13fbde0..3e6c648 100644 --- a/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMeteorologyMapper.xml +++ b/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMeteorologyMapper.xml @@ -22,10 +22,11 @@ + - select id, name, device_brand, device_type, device_encoding, type, longitude, latitude, installation_location, name_project, construction_year, docking_method, del_flag, create_time, create_by, update_time, update_by from iot_device_information_meteorology + select id, name, device_brand, device_type, device_encoding, type, longitude, latitude, installation_location, name_project, construction_year, docking_method, del_flag, create_time, create_by, update_time, update_by,project_id from iot_device_information_meteorology @@ -69,6 +71,7 @@ create_by, update_time, update_by, + project_id, #{name}, @@ -87,6 +90,7 @@ #{createBy}, #{updateTime}, #{updateBy}, + #{projectId}, @@ -109,6 +113,7 @@ create_by = #{createBy}, update_time = #{updateTime}, update_by = #{updateBy}, + project_id = #{projectId}, where id = #{id} diff --git a/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMiaoqingMapper.xml b/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMiaoqingMapper.xml index 1008592..a629bfe 100644 --- a/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMiaoqingMapper.xml +++ b/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMiaoqingMapper.xml @@ -22,10 +22,11 @@ + - select id, name, device_brand, device_type, device_encoding, type, longitude, latitude, installation_location, name_project, construction_year, docking_method, del_flag, create_time, create_by, update_time, update_by from iot_device_information_miaoQing + select id, name, device_brand, device_type, device_encoding, type, longitude, latitude, installation_location, name_project, construction_year, docking_method, del_flag, create_time, create_by, update_time, update_by,project_id from iot_device_information_miaoQing @@ -69,6 +71,7 @@ create_by, update_time, update_by, + project_id, #{name}, @@ -87,6 +90,7 @@ #{createBy}, #{updateTime}, #{updateBy}, + #{projectId}, @@ -109,6 +113,7 @@ create_by = #{createBy}, update_time = #{updateTime}, update_by = #{updateBy}, + project_id = #{projectId}, where id = #{id} diff --git a/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMoistureMapper.xml b/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMoistureMapper.xml index af4077c..7589d6b 100644 --- a/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMoistureMapper.xml +++ b/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMoistureMapper.xml @@ -23,10 +23,11 @@ + - select id, name, products_name, device_brand, device_type, device_encoding, type, longitude, latitude, installation_location, name_project, construction_year, docking_method, del_flag, create_time, create_by, update_time, update_by from iot_device_information_moisture + select id, name, products_name, device_brand, device_type, device_encoding, type, longitude, latitude, installation_location, name_project, construction_year, docking_method, del_flag, create_time, create_by, update_time, update_by, project_id from iot_device_information_moisture @@ -72,6 +74,7 @@ create_by, update_time, update_by, + project_id, #{name}, @@ -91,6 +94,7 @@ #{createBy}, #{updateTime}, #{updateBy}, + #{projectId}, @@ -114,6 +118,7 @@ create_by = #{createBy}, update_time = #{updateTime}, update_by = #{updateBy}, + project_id = #{projectId}, where id = #{id} diff --git a/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMonitorMapper.xml b/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMonitorMapper.xml index a009e01..64bbed7 100644 --- a/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMonitorMapper.xml +++ b/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMonitorMapper.xml @@ -27,10 +27,11 @@ + - select id, name, device_encoding, type, longitude, latitude, installation_location, device_brand, device_type, name_project, construction_year, affiliation_township, management_leader, management_leader_telephone, management_unit, remarks_information, del_flag, create_time, create_by, update_time, update_by, play_url from iot_device_information_monitor + select id, name, device_encoding, type, longitude, latitude, installation_location, device_brand, device_type, name_project, construction_year, affiliation_township, management_leader, management_leader_telephone, management_unit, remarks_information, del_flag, create_time, create_by, update_time, update_by, play_url,project_id from iot_device_information_monitor @@ -84,6 +86,7 @@ update_time, update_by, play_url, + project_id, #{name}, @@ -107,6 +110,7 @@ #{updateTime}, #{updateBy}, #{playUrl}, + #{projectId}, @@ -134,6 +138,7 @@ update_time = #{updateTime}, update_by = #{updateBy}, play_url = #{playUrl}, + project_id = #{projectId}, where id = #{id} diff --git a/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationTargetpestsMapper.xml b/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationTargetpestsMapper.xml index edd8fad..6008129 100644 --- a/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationTargetpestsMapper.xml +++ b/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationTargetpestsMapper.xml @@ -22,10 +22,11 @@ + - select id, device_brand, type, device_type, power_supply, device_encoding, address_code, installation_location, longitude, latitude, docking_method, del_flag, create_time, create_by, update_time, update_by, name from iot_device_information_targetPests + select id, device_brand, type, device_type, power_supply, device_encoding, address_code, installation_location, longitude, latitude, docking_method, del_flag, create_time, create_by, update_time, update_by, name,project_id from iot_device_information_targetPests @@ -69,6 +71,7 @@ update_time, update_by, name, + project_id, #{deviceBrand}, @@ -87,6 +90,7 @@ #{updateTime}, #{updateBy}, #{name}, + #{projectId}, @@ -109,6 +113,7 @@ update_time = #{updateTime}, update_by = #{updateBy}, name = #{name}, + project_id = #{projectId}, where id = #{id} diff --git a/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationWormsMapper.xml b/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationWormsMapper.xml index b0e8778..1304b73 100644 --- a/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationWormsMapper.xml +++ b/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationWormsMapper.xml @@ -21,6 +21,7 @@ + @@ -40,6 +41,7 @@ and name_project = #{nameProject} and construction_year = #{constructionYear} and docking_method = #{dockingMethod} + and project_id = #{projectId} @@ -66,6 +68,7 @@ create_by, update_time, update_by, + project_id, #{name}, @@ -83,6 +86,7 @@ #{createBy}, #{updateTime}, #{updateBy}, + #{projectId}, @@ -104,6 +108,7 @@ create_by = #{createBy}, update_time = #{updateTime}, update_by = #{updateBy}, + project_id = #{projectId}, where id = #{id}