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

1、设备详情安防页面数据第二版

Browse Source 
2、增加监控获取连接地址
This commit is contained in:
wyw
2024-08-14 15:47:24 +08:00
parent 67a44caf49
commit 7356e2d199
8 changed files with 382 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/impl/DeviceDetailServiceImpl.java
View File

@ -7,9 +7,11 @@ import com.fastbee.common.utils.StringUtils;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.data.domain.vo.AnfangInfoVo;
import com.fastbee.data.service.devicedetail.IDeviceDetailService;
import com.fastbee.iot.anfang.service.IUploadedPhotosService;
import com.fastbee.iot.domain.Device;
import com.fastbee.iot.haiwei.service.HaiWeiService;
import com.fastbee.iot.mapper.DeviceMapper;
import com.fastbee.iot.model.anfang.UploadedPhotos;
import com.fastbee.iot.model.haiwei.CmdHaiWeiVo;
import com.fastbee.iot.model.haiwei.dto.CmdHaiWeiDto;
import com.fastbee.iot.service.IDeviceService;
@ -24,6 +26,7 @@ import com.fastbee.xunjian.mapper.XjInspectionRoutesMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.xml.crypto.Data;
import java.util.*;
@Service
@ -41,6 +44,9 @@ public class DeviceDetailServiceImpl implements IDeviceDetailService {
private XjInspectionRecordsMapper xjInspectionRecordsMapper;
@Autowired
private HaiWeiService haiWeiService;
@Autowired
private IUploadedPhotosService uploadedPhotosService;
public DeviceDetailServiceImpl(DeviceMapper deviceMapper) {
this.deviceMapper = deviceMapper;
}
@ -140,9 +146,33 @@ public class DeviceDetailServiceImpl implements IDeviceDetailService {
if(StringUtils.isNotEmpty(anfangIds)){
Device anfangDevice = iDeviceService.selectDeviceByDeviceId(Long.parseLong(anfangIds));
//获取当前安防告警状态
UploadedPhotos uploadedPhotos = new UploadedPhotos();
uploadedPhotos.setSn(anfangDevice.getSerialNumber());
List<UploadedPhotos> uploadedPhotos1 = uploadedPhotosService.selectUploadedPhotosList(uploadedPhotos);
int doorStatus = 0;//0=正常，1=箱门振动，2=箱门打开
if(uploadedPhotos1.size() > 0){
UploadedPhotos temp = uploadedPhotos1.get(0);
if(new Date().getTime() - temp.getUploadTime().getTime() < 36000000){
if(temp.getShakeState().equals("1")){
doorStatus = 1;
}
if(temp.getDoorState().equals("1")){
doorStatus = 2;
}
}
}
if(uploadedPhotos1.size() > 5){
uploadedPhotos1 = uploadedPhotos1.subList(0,5);
}
anfangInfoVo.setDoorStatus(doorStatus);
anfangInfoVo.setAnfangList(uploadedPhotos1);
}
//获取安防历史记录
return null;
//安防设备
String guimenIds = devParams.get("guimenIds").toString();
if(StringUtils.isNotEmpty(guimenIds)){
anfangInfoVo.setGuimenId(devParams.get("guimenIds").toString());
}
return anfangInfoVo;
}
@Override
public CommonResult<CmdHaiWeiVo> cmdDevices(CmdHaiWeiDto cmdHaiWeiDto) {