Forráskód Böngészése

新增 测报灯识别开启禁用功能

zhaiyifei 1 éve
szülő
commit
e8c037f41f

+ 8 - 0
src/main/java/com/yunfeiyun/agmp/iotm/device/pest/controller/IotDeviceCbdController.java

@@ -18,6 +18,7 @@ import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceDictConst;
 import com.yunfeiyun.agmp.iot.common.domain.IotCbddata;
 import com.yunfeiyun.agmp.iot.common.domain.IotCbddata;
 import com.yunfeiyun.agmp.iot.common.domain.IotCbdimg;
 import com.yunfeiyun.agmp.iot.common.domain.IotCbdimg;
 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.exception.IotBizException;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
 import com.yunfeiyun.agmp.iot.common.service.TypeCacheService;
 import com.yunfeiyun.agmp.iot.common.service.TypeCacheService;
@@ -39,6 +40,7 @@ import org.springframework.data.mongodb.core.aggregation.GroupOperation;
 import org.springframework.data.mongodb.core.aggregation.MatchOperation;
 import org.springframework.data.mongodb.core.aggregation.MatchOperation;
 import org.springframework.data.mongodb.core.aggregation.ProjectionOperation;
 import org.springframework.data.mongodb.core.aggregation.ProjectionOperation;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
@@ -257,5 +259,11 @@ public class IotDeviceCbdController extends BaseController {
         return new AjaxResult(ErrorCode.SUCCESS.getCode(), result, null);
         return new AjaxResult(ErrorCode.SUCCESS.getCode(), result, null);
     }
     }
 
 
+    @Transactional(rollbackFor = Exception.class)
+    @PostMapping("/modify/recog")
+    public AjaxResult modifyRecog(@RequestBody IotCbdModifyDevRecogTypeReqVo reqVo) {
+        int status = iotCbdService.modifyRecog(reqVo);
+        return toAjax(status);
+    }
 
 
 }
 }

+ 3 - 0
src/main/java/com/yunfeiyun/agmp/iotm/device/pest/service/IotCbdService.java

@@ -2,6 +2,7 @@ package com.yunfeiyun.agmp.iotm.device.pest.service;
 
 
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 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.iotm.device.common.domin.DeviceRefreshDto;
 import com.yunfeiyun.agmp.iotm.device.common.domin.DeviceRefreshDto;
 import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseListReqVo;
 import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseListReqVo;
 import com.yunfeiyun.agmp.iotm.device.common.service.IotDeviceBaseService;
 import com.yunfeiyun.agmp.iotm.device.common.service.IotDeviceBaseService;
@@ -20,4 +21,6 @@ public interface IotCbdService extends IotDeviceBaseService {
 
 
     public void refresh(DeviceRefreshDto reqVo);
     public void refresh(DeviceRefreshDto reqVo);
     public String editConfig(IotCbdConfigEditReqVo iotCbdConfigEditReqVo);
     public String editConfig(IotCbdConfigEditReqVo iotCbdConfigEditReqVo);
+
+    public int modifyRecog(IotCbdModifyDevRecogTypeReqVo reqVo);
 }
 }

+ 23 - 1
src/main/java/com/yunfeiyun/agmp/iotm/device/pest/service/impl/IotCbdServiceImpl.java

@@ -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);
+    }
 
 
 }
 }