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 444232c..991a93d 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 @@ -208,6 +208,9 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService { psdcControlLogMapper.insert(new PsdcControlLog(deviceId, null, null, "设定温度", null, controlMethod, 3, "未找到该设备", controlBy)); throw new ControlException("控制失败,未找到该设备"); } + if (psdcDevice.getIsControl() != 2 ){ + throw new ControlException("该设备无法控制,请联系管理员"); + } AtomicInteger atomicInteger = new AtomicInteger(0); @@ -253,6 +256,7 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService { } + //TODO 发送MQTT指令 // psdcControlLogMapper.insert(new PsdcControlLog(deviceId,psdcDevice.getDeviceName(),psdcDevice.getDeviceSn(),controlContext,value,controlMethod,2,"控制成功",controlBy)); // psdcControlLogMapper.insert(new PsdcControlLog(deviceId,psdcDevice.getDeviceName(),psdcDevice.getDeviceSn(),controlContext,value,controlMethod,3,"等待终端响应超时",controlBy)); diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcTimerServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcTimerServiceImpl.java index 2b2a8fb..2f52d20 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcTimerServiceImpl.java +++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcTimerServiceImpl.java @@ -7,6 +7,7 @@ import com.psdc.entity.request.PsdcTimerRequest; import com.psdc.entity.request.PsdcTimerRunTimeRequest; import com.psdc.entity.vo.PsdcTimerVo; import com.psdc.enums.ControlKeyEnum; +import com.psdc.exception.ControlException; import com.psdc.exception.ServiceException; import com.psdc.exception.job.TaskException; import com.psdc.mapper.PsdcTimerMapper; @@ -119,6 +120,9 @@ public class PsdcTimerServiceImpl implements IPsdcTimerService { if(psdcDevice == null){ throw new ServiceException("创建定时任务失败,未找到该设备"); } + if (psdcDevice.getIsControl() != 2 ){ + throw new ControlException("该设备无法控制,请联系管理员"); + } String[] split1 = runtime.split(":"); cronArr[0] = "0"; //分