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

修复易联云对接获取token的bug，修改获取行政区列表接口逻辑

Browse Source
This commit is contained in:
mi9688
2024-12-12 13:16:00 +08:00
parent f9c7354301
commit 6f41eb2599
6 changed files with 134 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataMeteorologyServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.fastbee.deviceData.service.impl;
import java.math.BigDecimal;
import java.util.*;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
@ -121,7 +122,7 @@ public class DeviceRealtimedataMeteorologyServiceImpl extends ServiceImpl<Device
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.getWindDir().toString()).unit("°").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());
@ -142,4 +143,28 @@ public class DeviceRealtimedataMeteorologyServiceImpl extends ServiceImpl<Device
/**
* 风向数据映射
*/
private String windDirMap(BigDecimal windDir){
//8个风向
if (windDir.compareTo(new BigDecimal("0")) >= 0 && windDir.compareTo(new BigDecimal("22.5")) < 0) {
return "北";
} else if (windDir.compareTo(new BigDecimal("22.5")) >= 0 && windDir.compareTo(new BigDecimal("67.5")) < 0) {
return "东北";
} else if (windDir.compareTo(new BigDecimal("67.5")) >= 0 && windDir.compareTo(new BigDecimal("112.5")) < 0) {
return "东";
} else if (windDir.compareTo(new BigDecimal("112.5")) >= 0 && windDir.compareTo(new BigDecimal("157.5")) < 0) {
return "东南";
} else if (windDir.compareTo(new BigDecimal("157.5")) >= 0 && windDir.compareTo(new BigDecimal("202.5")) < 0) {
return "南";
} else if (windDir.compareTo(new BigDecimal("202.5")) >= 0 && windDir.compareTo(new BigDecimal("247.5")) < 0) {
return "西南";
} else if (windDir.compareTo(new BigDecimal("247.5")) >= 0 && windDir.compareTo(new BigDecimal("292.5")) < 0) {
return "西";
} else if (windDir.compareTo(new BigDecimal("292.5")) >= 0 && windDir.compareTo(new BigDecimal("337.5")) < 0) {
return "西北";
} else if (windDir.compareTo(new BigDecimal("337.5")) >= 0 && windDir.compareTo(new BigDecimal("360")) < 0) {
return "北";
} else {
return "无数据";
}
}
}

13
fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/service/impl/ProjectServiceImpl.java
View File

@ -647,16 +647,21 @@ public class ProjectServiceImpl implements IProjectService
//过滤后项目列表
List<Project> projectFilterList =new ArrayList<>();
for (Project project : projectAllList) {
// System.err.println("-----------"+project.getProjectName()+"------------");
String administrativeAreaCode = project.getAdministrativeAreaCode();
if(StringUtils.isNotBlank(administrativeAreaCode)){
JSONArray areaCodeArrays = JSONUtil.parseArray(administrativeAreaCode);
if(!areaCodeArrays.isEmpty()){
JSONArray areaCodeArray = JSONUtil.parseArray(areaCodeArrays.get(0));
for (Object o : areaCodeArray) {
if(o.equals(areaCode)){
projectFilterList.add(project);
for(Object areaCodeArrayObj:areaCodeArrays){
JSONArray areaCodeArray = JSONUtil.parseArray(areaCodeArrayObj.toString());
for (Object o : areaCodeArray) {
// System.err.println("项目行政区划代码："+o);
if(o.equals(areaCode)){
projectFilterList.add(project);
}
}
}
}
}
}

18
fastbee-service/fastbee-system-service/src/main/java/com/fastbee/system/service/impl/SysDistrictServiceImpl.java
View File

@ -239,15 +239,15 @@ public class SysDistrictServiceImpl implements ISysDistrictService
}
List<SysDistrict> sysDistrictList = getDistricts(SysDistricts, map, roots);
//处理直辖市情况
for (SysDistrict sysDistrict : sysDistrictList) {
if(isMunicipality(sysDistrict.getName())&&sysDistrict.getLevel()==1){
List<SysDistrict> children = sysDistrict.getChildren();
SysDistrict district = children.get(0);
children.remove(0);
sysDistrict.setChildren(Collections.singletonList(district));
sysDistrict.getChildren().get(0).setChildren(children);
}
}
// for (SysDistrict sysDistrict : sysDistrictList) {
// if(isMunicipality(sysDistrict.getName())&&sysDistrict.getLevel()==1){
// List<SysDistrict> children = sysDistrict.getChildren();
// SysDistrict district = children.get(0);
// children.remove(0);
// sysDistrict.setChildren(Collections.singletonList(district));
// sysDistrict.getChildren().get(0).setChildren(children);
// }
// }
return sysDistrictList;
}