|
@@ -24,6 +24,7 @@ import com.yunfeiyun.agmp.iot.common.domain.reqvo.IotBzydataReqVo;
|
|
|
import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
|
|
import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
|
|
|
import com.yunfeiyun.agmp.iot.common.model.cmd.CmdGroupModel;
|
|
import com.yunfeiyun.agmp.iot.common.model.cmd.CmdGroupModel;
|
|
|
import com.yunfeiyun.agmp.iot.common.service.MongoService;
|
|
import com.yunfeiyun.agmp.iot.common.service.MongoService;
|
|
|
|
|
+import com.yunfeiyun.agmp.iot.common.util.dev.DevOperateUtil;
|
|
|
import com.yunfeiyun.agmp.iotm.common.controller.BaseController;
|
|
import com.yunfeiyun.agmp.iotm.common.controller.BaseController;
|
|
|
import com.yunfeiyun.agmp.iotm.device.bzy.domain.IotBzyDeviceDataListResVo;
|
|
import com.yunfeiyun.agmp.iotm.device.bzy.domain.IotBzyDeviceDataListResVo;
|
|
|
import com.yunfeiyun.agmp.iotm.device.bzy.domain.IotYfBzyPolylineResVo;
|
|
import com.yunfeiyun.agmp.iotm.device.bzy.domain.IotYfBzyPolylineResVo;
|
|
@@ -171,9 +172,7 @@ public class IotDeviceBzyController extends BaseController {
|
|
|
public AjaxResult takePhoto(@PathVariable("devBid") String devBid) {
|
|
public AjaxResult takePhoto(@PathVariable("devBid") String devBid) {
|
|
|
log.info("【{}】【孢子仪】【拍照】客户id {}", LogCore.getSeq(), getCustomerId());
|
|
log.info("【{}】【孢子仪】【拍照】客户id {}", LogCore.getSeq(), getCustomerId());
|
|
|
IotDevice iotDevice = iIotDeviceService.selectIotDeviceByDevBid(devBid);
|
|
IotDevice iotDevice = iIotDeviceService.selectIotDeviceByDevBid(devBid);
|
|
|
- if (iotDevice == null) {
|
|
|
|
|
- throw new IotBizException(ErrorCode.FAILURE.getCode(),"设备不存在");
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ DevOperateUtil.sendConfigCmdCheck(iotDevice);
|
|
|
|
|
|
|
|
IotDeviceconfig iotDeviceconfig = new IotDeviceconfig();
|
|
IotDeviceconfig iotDeviceconfig = new IotDeviceconfig();
|
|
|
iotDeviceconfig.setTid(iotDevice.getTid());
|
|
iotDeviceconfig.setTid(iotDevice.getTid());
|
|
@@ -224,9 +223,8 @@ public class IotDeviceBzyController extends BaseController {
|
|
|
throw new IotBizException(ErrorCode.FAILURE.getCode(),"设备id不可为空");
|
|
throw new IotBizException(ErrorCode.FAILURE.getCode(),"设备id不可为空");
|
|
|
}
|
|
}
|
|
|
IotDevice iotDevice = iIotDeviceService.selectIotDeviceByDevBid(devBid);
|
|
IotDevice iotDevice = iIotDeviceService.selectIotDeviceByDevBid(devBid);
|
|
|
- if (iotDevice == null) {
|
|
|
|
|
- throw new IotBizException(ErrorCode.FAILURE.getCode(),"设备不存在");
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ DevOperateUtil.sendConfigCmdCheck(iotDevice);
|
|
|
|
|
+
|
|
|
IotDeviceconfig iotDeviceconfig = iIotDeviceconfigService.selectIotDeviceConfigByDevBid(devBid);
|
|
IotDeviceconfig iotDeviceconfig = iIotDeviceconfigService.selectIotDeviceConfigByDevBid(devBid);
|
|
|
if (null == iotDeviceconfig) {
|
|
if (null == iotDeviceconfig) {
|
|
|
// 如果测报灯配置为空,则新增测报灯配置
|
|
// 如果测报灯配置为空,则新增测报灯配置
|