补充提交

src/main/java/com/yunfeiyun/agmp/iots/core/cmd/core/CmdDispatcherService.java

@@ -15,7 +15,7 @@ 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.CmdModel;
 import com.yunfeiyun.agmp.iots.core.cmd.model.CmdExecModel;
-import com.yunfeiyun.agmp.iots.mq.IotsMqService;
+
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -53,8 +53,7 @@ public class CmdDispatcherService {
     @Autowired
     private CmdTaskService cmdTaskService;
 
-    @Resource
-    private IotsMqService iotsMqService;
+
 
     /**
      * 解析指令集，转换为IOTS 方便处理的格式
@@ -101,8 +100,8 @@ public class CmdDispatcherService {
         taskResult.setMsg(status.getMessage());
         taskResult.setErrMsg(errMsg);
         taskResult.setCompleteDate(DateUtils.dateTimeNow());
-
-        iotsMqService.sendTaskResultMsg(taskResult);
+        // TODO
+        // iotsMqService.sendTaskResultMsg(taskResult);
 
         cmdTaskServiceMap.remove(taskId);
     }

src/main/java/com/yunfeiyun/agmp/iots/core/cmd/core/task/CmdTaskService.java

@@ -22,7 +22,7 @@ import com.yunfeiyun.agmp.iots.core.cmd.model.CmdExecModel;
 import com.yunfeiyun.agmp.iots.device.common.Device;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
 import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
-import com.yunfeiyun.agmp.iots.mq.IotsMqService;
+
 import com.yunfeiyun.agmp.iots.service.*;
 import com.yunfeiyun.agmp.iots.service.checker.CmdResultCheckService;
 import lombok.extern.slf4j.Slf4j;
@@ -52,8 +52,7 @@ public class CmdTaskService {
     private RedisCacheManager redisCacheManager;
     @Resource
     private IIotDeviceService iIotDeviceService;
-    @Resource
-    private IotsMqService iotsMqService;
+
     @Resource
     private IIotCmdtaskService iotCmdtaskService;
 
@@ -448,8 +447,8 @@ public class CmdTaskService {
         taskResult.setMsg(cmdgroupStatus.getMessage());
         taskResult.setErrMsg(errMsg);
         taskResult.setCompleteDate(DateUtils.dateTimeNow());
-
-        iotsMqService.sendTaskResultMsg(taskResult);
+        //TODO
+        //   iotsMqService.sendTaskResultMsg(taskResult);
     }
 
     private void resetResultCallback(CmdExecModel cmdExecModel, CmdgroupStatus cmdgroupStatus) {
@@ -491,8 +490,8 @@ public class CmdTaskService {
         ext.put("ctDevtype",findItem.getCtDevtype());
         ext.put("ctDevcode",findItem.getCtDevcode());
         taskResult.setExtraBody(ext);
-
-        iotsMqService.sendTaskResultMsg(taskResult);
+        // TODO
+        // iotsMqService.sendTaskResultMsg(taskResult);
     }
 
     public static long getTimeDifference(String datetime1, String datetime2) {

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/IotCbdImgService.java

@@ -13,7 +13,7 @@ import com.yunfeiyun.agmp.iot.common.model.IotWarncheck;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
 import com.yunfeiyun.agmp.iot.common.service.YfCbdRecogeService;
 import com.yunfeiyun.agmp.iot.common.util.tmn.cbd.CbdInsectIdentifyUtil;
-import com.yunfeiyun.agmp.iots.mq.IotsMqService;
+
 import com.yunfeiyun.agmp.iots.service.IIotDeviceService;
 import com.yunfeiyun.agmp.iots.service.IIotPestService;
 import com.yunfeiyun.agmp.iots.service.impl.WarnService;
@@ -45,8 +45,7 @@ public class IotCbdImgService {
     @Autowired
     private WarnService warnService;
 
-    @Autowired
-    private IotsMqService iotsMqService;
+
 
     @Autowired
     private IIotDeviceService iIotDeviceService;

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/YfQxzDeviceImpl.java

@@ -9,7 +9,7 @@ import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceDictConst;
 import com.yunfeiyun.agmp.iot.common.constant.IotErrorCode;
 import com.yunfeiyun.agmp.iot.common.constant.cmd.CmdDef;
-import com.yunfeiyun.agmp.iot.common.constant.mq.IotMqConstant;
+
 import com.yunfeiyun.agmp.iot.common.constant.mqtt.IotMqttConstant;
 import com.yunfeiyun.agmp.iot.common.domain.IotBaseEntity;
 import com.yunfeiyun.agmp.iot.common.domain.IotBzydata;
@@ -31,7 +31,7 @@ import com.yunfeiyun.agmp.iots.device.domain.yfqxz.YfQxzMsg;
 import com.yunfeiyun.agmp.iots.device.domain.yfqxz.YfQxzReqMsg;
 import com.yunfeiyun.agmp.iots.device.service.*;
 import com.yunfeiyun.agmp.iots.service.impl.WarnService;
-import com.yunfeiyun.agmp.iots.mq.IotsMqService;
+
 import com.yunfeiyun.agmp.iots.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.util.TextUtils;
@@ -91,8 +91,7 @@ public class YfQxzDeviceImpl implements IYfQxzDevice {
     @Autowired
     private IotDeviceAddressService iotDeviceAddressService;
 
-    @Autowired
-    private IotsMqService iotsMqService;
+
 
     @Override
     public Object sendCmd(CmdModel cmdModel) throws Exception {
@@ -327,7 +326,8 @@ public class YfQxzDeviceImpl implements IYfQxzDevice {
             //要求预警检查 V3
             IotWarncheck warncheck = new IotWarncheck();
             warncheck.setDevBid(iotDeviceOld.getDevBid());
-            iotsMqService.sendMsg(IotMqConstant.TOPIC_WARNCHECK, IotMqConstant.TOPIC_WARNCHECK, warncheck);
+            // TODO
+            //  iotsMqService.sendMsg(IotMqConstant.TOPIC_WARNCHECK, IotMqConstant.TOPIC_WARNCHECK, warncheck);
         }else{
             //预警检查 V2
             warnService.checkSensData("0","",iotDeviceOld.getDevBid());