From 286f71a3f63847275366b989f299a4f066074c38 Mon Sep 17 00:00:00 2001
From: stone <827672943@qq.com>
Date: Tue, 16 May 2023 14:09:42 +0800
Subject: [PATCH] 11
---
.../java/com/psdc/entity/vo/DeviceStatusVo.java | 2 +-
.../service/impl/PsdcDeviceServiceImpl.java | 17 ++++++++---------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/psdc-business/src/main/java/com/psdc/entity/vo/DeviceStatusVo.java b/psdc-business/src/main/java/com/psdc/entity/vo/DeviceStatusVo.java
index ff853df..e0d8042 100644
--- a/psdc-business/src/main/java/com/psdc/entity/vo/DeviceStatusVo.java
+++ b/psdc-business/src/main/java/com/psdc/entity/vo/DeviceStatusVo.java
@@ -31,7 +31,7 @@ public class DeviceStatusVo {
/** 图片地址 */
private String photoUrl ;
/** 设备运行状态：1-开启，2-关闭 */
- private Integer deviceRunstatus ;
+ private Boolean deviceRunstatus ;
/** 设备模型 */
private String deviceModel;
diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java
index 0503994..d49292e 100644
--- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java
+++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java
@@ -1,16 +1,17 @@
package com.psdc.service.impl;
+import com.alibaba.fastjson2.JSONObject;
import com.psdc.entity.PsdcControlLog;
import com.psdc.entity.PsdcDevice;
import com.psdc.entity.PsdcScene;
import com.psdc.entity.res.PsdcDeviceInfoRes;
import com.psdc.entity.vo.DeviceStatusVo;
-import com.psdc.entity.vo.SceneVo;
import com.psdc.enums.ControlKeyEnum;
import com.psdc.exception.ControlException;
import com.psdc.mapper.PsdcControlLogMapper;
import com.psdc.mapper.PsdcDeviceMapper;
import com.psdc.mapper.PsdcSceneMapper;
+import com.psdc.mqtt.MyMQTTClient;
import com.psdc.service.IPsdcDeviceService;
import com.psdc.utils.SecurityUtils;
import com.psdc.utils.poi.ExcelUtil;
@@ -22,7 +23,6 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.InputStream;
-import java.security.cert.TrustAnchor;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -69,6 +69,11 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
return psdcDevices.stream().map(psdcDevice -> {
DeviceStatusVo deviceStatusVo = new DeviceStatusVo();
BeanUtils.copyProperties(psdcDevice, deviceStatusVo);
+ if (psdcDevice.getDeviceRunstatus() !=null && psdcDevice.getDeviceRunstatus() == 1 ){
+ deviceStatusVo.setDeviceRunstatus(true);
+ } else {
+ deviceStatusVo.setDeviceRunstatus(false);
+ }
return deviceStatusVo;
}).collect(Collectors.toList());
}
@@ -173,15 +178,9 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
/**
* 控制设备启动停止
-<<<<<<< HEAD
* @param deviceId 主键
* @param runStatus 状态
* @return 条数
-=======
- * @param deviceId
- * @param runStatus
- * @return
->>>>>>> d15c6d60ec068ceda12ba3aa1cf4c980940216a5
*/
@Override
public int controlDeviceStartAndStop(Integer deviceId, Integer runStatus, String controlBy, Integer controlMethod) {
@@ -238,7 +237,7 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
String controlKey = map.get("controlKey").toString();
String controlValue = map.get("controlValue").toString();
String controlContext = ControlKeyEnum.getControlContext(controlKey);
- //TODO 发送MQTT指令
+ // TODO 发送MQTT指令
// psdcControlLogMapper.insert(new PsdcControlLog(deviceId,psdcDevice.getDeviceName(),psdcDevice.getDeviceSn(),controlContext,controlValue,controlMethod,2,"控制成功",controlBy));
// psdcControlLogMapper.insert(new PsdcControlLog(deviceId,psdcDevice.getDeviceName(),psdcDevice.getDeviceSn(),controlContext,controlValue,controlMethod,3,"等待终端响应超时",controlBy));
//发送成功