11

psdc-business/src/main/java/com/psdc/mapper/PsdcDeviceMapper.java

@@ -95,4 +95,10 @@ public interface PsdcDeviceMapper{
 
      void saveDevicesData(@Param(value = "devRecord") List<PsdcDevice> devRecord);
 
+     /**
+      * 控制页面查询设备查询可操作设备列表
+      * @param userId
+      * @return
+      */
+     List<PsdcDevice> controlQueryByUserId(Long userId);
  }

psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java

@@ -49,19 +49,14 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
 
     /**
      * 根据用户id查询设备列表
-<<<<<<< HEAD
      * @return 设备列表
-=======
-     *
-     * @return
->>>>>>> e7257650302fdf30d685bfae8df3cc0405bb51f6
      */
     public List<PsdcDevice> queryByUserId() {
         return psdcDeviceMapper.queryByUserId(SecurityUtils.getUserId());
     }
 
     public List<DeviceStatusVo> queryDeviceStatus() {
-        List<PsdcDevice> psdcDevices = psdcDeviceMapper.queryByUserId(SecurityUtils.getUserId());
+        List<PsdcDevice> psdcDevices = psdcDeviceMapper.controlQueryByUserId(SecurityUtils.getUserId());
         return psdcDevices.stream().map(psdcDevice -> {
             DeviceStatusVo deviceStatusVo = new DeviceStatusVo();
             BeanUtils.copyProperties(psdcDevice, deviceStatusVo);
@@ -159,16 +154,9 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
 
     /**
      * 控制设备启动停止
-<<<<<<< HEAD
      * @param deviceId 主键
      * @param runStatus 状态
      * @return 条数
-=======
-     *
-     * @param deviceId
-     * @param runStatus
-     * @return
->>>>>>> e7257650302fdf30d685bfae8df3cc0405bb51f6
      */
     @Override
     public int controlDeviceStartAndStop(Integer deviceId, Integer runStatus, String controlBy, Integer controlMethod) {
@@ -187,6 +175,7 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
             psdcControlLogMapper.insert(new PsdcControlLog(deviceId, null, null, "设备启停", value, controlMethod, 3, "未找到该设备", controlBy));
             throw new ControlException("控制失败，未找到该设备");
         }
+        
 
         // TODO 发送MQTT指令
         // psdcControlLogMapper.insert(new PsdcControlLog(deviceId,psdcDevice.getDeviceName(),psdcDevice.getDeviceSn(),"设备启停",value,controlMethod,3,"手动控制，等待终端响应超时",controlBy));

psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml

@@ -298,4 +298,25 @@
         select device_name from psdc_device where device_id = #{deviceId}
     </select>
 
+    <select id="controlQueryByUserId" resultMap="PsdcDeviceMap" >
+        select device_id,
+               user_id,
+               device_type,
+               device_sn,
+               device_name,
+               hard_version,
+               soft_version,
+               device_address,
+               start_time,
+               device_status,
+               device_runstatus,
+               photo_url,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from psdc_device
+        where user_id = #{userId} and is_control = 2
+    </select>
+
 </mapper>