|
@@ -3,6 +3,7 @@ package com.yunfeiyun.agmp.iotm.device.pest.service.impl;
|
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
|
import com.yunfeiyun.agmp.common.constant.ErrorCode;
|
|
import com.yunfeiyun.agmp.common.constant.ErrorCode;
|
|
|
import com.yunfeiyun.agmp.common.log.LogCore;
|
|
import com.yunfeiyun.agmp.common.log.LogCore;
|
|
|
|
|
+import com.yunfeiyun.agmp.common.utils.DateUtils;
|
|
|
import com.yunfeiyun.agmp.common.utils.JSONUtils;
|
|
import com.yunfeiyun.agmp.common.utils.JSONUtils;
|
|
|
import com.yunfeiyun.agmp.common.utils.StringUtils;
|
|
import com.yunfeiyun.agmp.common.utils.StringUtils;
|
|
|
import com.yunfeiyun.agmp.common.utils.uuid.IdUtils;
|
|
import com.yunfeiyun.agmp.common.utils.uuid.IdUtils;
|
|
@@ -10,6 +11,8 @@ import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
|
|
|
import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
|
|
import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
|
|
|
import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconfig;
|
|
import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconfig;
|
|
|
import com.yunfeiyun.agmp.iot.common.domain.reqvo.IotCbdConfigEditReqVo;
|
|
import com.yunfeiyun.agmp.iot.common.domain.reqvo.IotCbdConfigEditReqVo;
|
|
|
|
|
+import com.yunfeiyun.agmp.iot.common.domain.reqvo.IotCbdModifyDevRecogTypeReqVo;
|
|
|
|
|
+import com.yunfeiyun.agmp.iot.common.enums.EnumDevRecogType;
|
|
|
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.iotm.device.common.domin.DeviceRefreshDto;
|
|
import com.yunfeiyun.agmp.iotm.device.common.domin.DeviceRefreshDto;
|
|
@@ -102,7 +105,7 @@ public class IotCbdServiceImpl extends IotDeviceBaseServiceImpl implements IotCb
|
|
|
iIotCmdtaskService.handInternalCmd(cmdGroupModel);
|
|
iIotCmdtaskService.handInternalCmd(cmdGroupModel);
|
|
|
return cmdGroupModel.getTaskUuid();
|
|
return cmdGroupModel.getTaskUuid();
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public String takePhoto(String devBid) {
|
|
public String takePhoto(String devBid) {
|
|
|
log.info("【{}】【测报灯】【拍照】客户id {}", LogCore.getSeq());
|
|
log.info("【{}】【测报灯】【拍照】客户id {}", LogCore.getSeq());
|
|
@@ -156,5 +159,24 @@ public class IotCbdServiceImpl extends IotDeviceBaseServiceImpl implements IotCb
|
|
|
iIotCmdtaskService.handInternalCmd(cmdGroupModel);
|
|
iIotCmdtaskService.handInternalCmd(cmdGroupModel);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public int modifyRecog(IotCbdModifyDevRecogTypeReqVo reqVo) {
|
|
|
|
|
+ log.info("【{}】【测报灯】【修改识别类型】客户id {}", LogCore.getSeq(), reqVo);
|
|
|
|
|
+ String devBid = reqVo.getDevBid();
|
|
|
|
|
+ String devRecogtype = reqVo.getDevRecogtype();
|
|
|
|
|
+
|
|
|
|
|
+ if(EnumDevRecogType.findEnumByCode(devRecogtype) == null){
|
|
|
|
|
+ throw new IotBizException(ErrorCode.FAILURE.getCode(),"识别类型不正确");
|
|
|
|
|
+ }
|
|
|
|
|
+ IotDevice iotDevice = iIotDeviceService.selectIotDeviceByDevBid(devBid);
|
|
|
|
|
+ if(iotDevice == null){
|
|
|
|
|
+ throw new IotBizException(ErrorCode.FAILURE.getCode(),"设备不存在");
|
|
|
|
|
+ }
|
|
|
|
|
+ IotDevice iotDeviceUpdate = new IotDevice();
|
|
|
|
|
+ iotDeviceUpdate.setDevBid(devBid);
|
|
|
|
|
+ iotDeviceUpdate.setDevRecogtype(devRecogtype);
|
|
|
|
|
+ iotDeviceUpdate.setDevModifieddate(DateUtils.dateTimeNow());
|
|
|
|
|
+ return iIotDeviceService.updateIotDevice(iotDeviceUpdate, null, null);
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
}
|
|
}
|