Merge remote-tracking branch 'origin/master'

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;
 

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());
     }
@@ -172,15 +177,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) {