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

设备点位数据bug修复

Browse Source
This commit is contained in:
wyw
2024-08-16 02:47:07 +08:00
parent 0388cd8aba
commit ab9792668c
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fastbee-service/fastbee-iot-service/pom.xml
View File

@ -156,6 +156,10 @@
<artifactId>forest-spring-boot-starter</artifactId> <artifactId>forest-spring-boot-starter</artifactId>
<version>1.5.36</version> <version>1.5.36</version>
</dependency> </dependency>
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-waterele-service</artifactId>
</dependency>
</dependencies> </dependencies>

18
fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceServiceImpl.java
View File

@ -10,6 +10,7 @@ import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.core.domain.entity.SysDept; import com.fastbee.common.core.domain.entity.SysDept;
import com.fastbee.common.core.domain.entity.SysUser; import com.fastbee.common.core.domain.entity.SysUser;
import com.fastbee.common.core.domain.model.LoginUser; import com.fastbee.common.core.domain.model.LoginUser;
import com.fastbee.common.core.page.TableDataInfo;
import com.fastbee.common.core.redis.RedisCache; import com.fastbee.common.core.redis.RedisCache;
import com.fastbee.common.core.redis.RedisKeyBuilder; import com.fastbee.common.core.redis.RedisKeyBuilder;
import com.fastbee.common.core.thingsModel.ThingsModelSimpleItem; import com.fastbee.common.core.thingsModel.ThingsModelSimpleItem;
@ -37,6 +38,8 @@ import com.fastbee.iot.cache.ITSLValueCache;
import com.fastbee.iot.tdengine.service.ILogService; import com.fastbee.iot.tdengine.service.ILogService;
import com.fastbee.system.mapper.SysDeptMapper; import com.fastbee.system.mapper.SysDeptMapper;
import com.fastbee.system.service.ISysUserService; import com.fastbee.system.service.ISysUserService;
import com.fastbee.waterele.domain.MaWatereleRecord;
import com.fastbee.waterele.service.IMaWatereleRecordService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
@ -121,7 +124,8 @@ public class DeviceServiceImpl implements IDeviceService {
private SubGatewayMapper subGatewayMapper; private SubGatewayMapper subGatewayMapper;
@Resource @Resource
private IOrderControlService orderControlService; private IOrderControlService orderControlService;
@Resource
private IMaWatereleRecordService watereleRecordService;
/** /**
* 查询设备 * 查询设备
@ -1604,6 +1608,18 @@ public class DeviceServiceImpl implements IDeviceService {
devices.setProductId(136L); devices.setProductId(136L);
List<Device> deviceList = selectDeviceList(devices); List<Device> deviceList = selectDeviceList(devices);
for (Device device : deviceList) { for (Device device : deviceList) {
MaWatereleRecord maWatereleRecord = new MaWatereleRecord();
maWatereleRecord.setDevSn(device.getSerialNumber());
TableDataInfo tableDataInfo = watereleRecordService.selectMaWatereleRecordList(maWatereleRecord);
List<MaWatereleRecord> list = (List<MaWatereleRecord>) tableDataInfo.getRows();
int status = 4;
if(list.size() > 0){
MaWatereleRecord record = list.get(0);
if(new Date().getTime() - record.getCreateTime().getTime() < 3600000){
status = 3;
}
}
device.setStatus(status);
HashMap<String, Object> itemMap = new HashMap<>(); HashMap<String, Object> itemMap = new HashMap<>();
resultList.add(itemMap); resultList.add(itemMap);
Integer integer = 0; Integer integer = 0;