优化 修改项目结构

src/main/java/com/yunfeiyun/agmp/iots/device/controller/TestController.java

@@ -10,9 +10,8 @@ import com.yunfeiyun.agmp.iot.common.domain.*;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdGroupModel;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
 import com.yunfeiyun.agmp.iots.core.cmd.core.CmdDispatcherService;
-import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.device.mapper.IotDeviceMapper;
-import com.yunfeiyun.agmp.iots.device.service.IIotYfScddataService;
+import com.yunfeiyun.agmp.iots.service.IIotYfScddataService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;

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

@@ -15,7 +15,7 @@ import com.yunfeiyun.agmp.iot.common.service.MongoService;
 import com.yunfeiyun.agmp.iots.common.annotate.HttpCore;
 import com.yunfeiyun.agmp.iots.core.http.HttpClient;
 import com.yunfeiyun.agmp.iots.service.IIotDeviceService;
-import com.yunfeiyun.agmp.iots.service.IotDeviceAddressService;
+import com.yunfeiyun.agmp.iots.service.impl.IotDeviceAddressService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

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

@@ -21,6 +21,8 @@ import com.yunfeiyun.agmp.iots.device.domain.bzy.YfBzyReqMsg;
 import com.yunfeiyun.agmp.iots.device.domain.bzy.YfBzyTakephotoMsg;
 import com.yunfeiyun.agmp.iots.device.service.IBzyDevice;
 import com.yunfeiyun.agmp.iots.service.*;
+import com.yunfeiyun.agmp.iots.service.impl.IotBzyImgService;
+import com.yunfeiyun.agmp.iots.service.impl.IotDeviceAddressService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.util.TextUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -23,6 +23,8 @@ import com.yunfeiyun.agmp.iots.device.domain.cbd.YfCbdReqMsg;
 import com.yunfeiyun.agmp.iots.device.domain.cbd.YfCbdTakephotoMsg;
 import com.yunfeiyun.agmp.iots.device.service.ICbdDevice;
 import com.yunfeiyun.agmp.iots.service.*;
+import com.yunfeiyun.agmp.iots.service.impl.IotCbdImgService;
+import com.yunfeiyun.agmp.iots.service.impl.IotDeviceAddressService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.util.TextUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -9,13 +9,10 @@ import com.yunfeiyun.agmp.common.utils.JSONUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.common.utils.reflect.ReflectUtils;
 import com.yunfeiyun.agmp.iot.common.constant.cmd.CmdDef;
-import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceDictConst;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
 import com.yunfeiyun.agmp.iot.common.constant.mqtt.IotMqttConstant;
 import com.yunfeiyun.agmp.iot.common.domain.IotBaseEntity;
-import com.yunfeiyun.agmp.iot.common.domain.IotCbddata;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
-import com.yunfeiyun.agmp.iot.common.domain.IotPest;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
 import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
@@ -24,15 +21,15 @@ import com.yunfeiyun.agmp.iots.device.domain.cbd.YfCbdConfigMsg;
 import com.yunfeiyun.agmp.iots.device.domain.cbd.YfCbdMsgUtil;
 import com.yunfeiyun.agmp.iots.device.domain.cbd.YfCbdReqMsg;
 import com.yunfeiyun.agmp.iots.device.domain.cbd.YfCbdTakephotoMsg;
-import com.yunfeiyun.agmp.iots.device.mapper.IotPestMapper;
 import com.yunfeiyun.agmp.iots.device.service.IYfXctDevice;
 import com.yunfeiyun.agmp.iots.service.*;
+import com.yunfeiyun.agmp.iots.service.impl.IotCbdImgService;
+import com.yunfeiyun.agmp.iots.service.impl.IotDeviceAddressService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.util.TextUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import java.util.*;
 
 @Component(ServiceNameConst.SERVICE_YF_XCT)

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

@@ -18,6 +18,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.IXphYfQxzDevice;
 import com.yunfeiyun.agmp.iots.service.*;
+import com.yunfeiyun.agmp.iots.service.impl.IotDeviceAddressService;
 import com.yunfeiyun.agmp.iots.service.impl.WarnService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.util.TextUtils;

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

@@ -24,6 +24,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.IYfQxzDevice;
 import com.yunfeiyun.agmp.iots.service.*;
+import com.yunfeiyun.agmp.iots.service.impl.IotDeviceAddressService;
 import com.yunfeiyun.agmp.iots.service.impl.WarnService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.util.TextUtils;

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

@@ -13,9 +13,10 @@ import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
 import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.device.common.DeviceAbstractImpl;
-import com.yunfeiyun.agmp.iots.device.service.IIotYfScddataService;
+import com.yunfeiyun.agmp.iots.service.IIotYfScddataService;
 import com.yunfeiyun.agmp.iots.device.service.IYfScdDevice;
 import com.yunfeiyun.agmp.iots.service.*;
+import com.yunfeiyun.agmp.iots.service.impl.IotDeviceAddressService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.util.TextUtils;
 import org.eclipse.paho.client.mqttv3.MqttException;

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

@@ -10,7 +10,7 @@ import com.yunfeiyun.agmp.iot.common.enums.IotDeviceStatusTypeEnum;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
 import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.device.common.DeviceAbstractImpl;
-import com.yunfeiyun.agmp.iots.device.service.IIotYfXycb2dataService;
+import com.yunfeiyun.agmp.iots.service.IIotYfXycb2dataService;
 import com.yunfeiyun.agmp.iots.device.service.IYfXycb2Device;
 import com.yunfeiyun.agmp.iots.service.IIotDeviceService;
 import com.yunfeiyun.agmp.iots.service.IIotDevicelasteddataService;

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

@@ -15,9 +15,10 @@ import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
 import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.device.common.DeviceAbstractImpl;
 import com.yunfeiyun.agmp.iots.device.domain.cbd.YfCbdReqMsg;
-import com.yunfeiyun.agmp.iots.device.service.IIotYfXycbIIIdataService;
+import com.yunfeiyun.agmp.iots.service.IIotYfXycbIIIdataService;
 import com.yunfeiyun.agmp.iots.device.service.IYfXycbIIIDevice;
 import com.yunfeiyun.agmp.iots.service.*;
+import com.yunfeiyun.agmp.iots.service.impl.IotDeviceAddressService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.util.TextUtils;
 import org.eclipse.paho.client.mqttv3.MqttException;

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

@@ -11,20 +11,19 @@ import com.yunfeiyun.agmp.iot.common.domain.*;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
 
-import com.yunfeiyun.agmp.iots.common.modal.IotDeviceconnResVo;
-import com.yunfeiyun.agmp.iots.core.http.EzvizHttpClient;
 import com.yunfeiyun.agmp.iots.core.http.ZjsfXycbHttpClient;
 import com.yunfeiyun.agmp.iots.core.manager.HttpManager;
 import com.yunfeiyun.agmp.iots.device.common.HttpDeviceAbstractImpl;
 import com.yunfeiyun.agmp.iots.device.service.ZjsfXycbDevice;
 import com.yunfeiyun.agmp.iots.service.*;
+import com.yunfeiyun.agmp.iots.service.impl.IotDeviceAddressService;
+import com.yunfeiyun.agmp.iots.service.impl.IotPestRecogService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.util.*;
 
 @Component(ServiceNameConst.SERVICE_ZJSF_XYCB)

src/main/java/com/yunfeiyun/agmp/iots/mq/listener/IotmBaseDataChannelAwareMessageListener.java

@@ -3,7 +3,6 @@ package com.yunfeiyun.agmp.iots.mq.listener;
 import com.alibaba.fastjson2.JSONObject;
 import com.rabbitmq.client.Channel;
 import com.yunfeiyun.agmp.common.framework.mq.rabbitmq.model.SynGlobalTenantInfoDto;
-import com.yunfeiyun.agmp.common.utils.JSONUtils;
 import com.yunfeiyun.agmp.common.utils.spring.SpringUtils;
 import com.yunfeiyun.agmp.iot.common.constant.mq.IotActionEnums;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
@@ -16,11 +15,10 @@ import com.yunfeiyun.agmp.iots.core.manager.ConnectionManager;
 import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.core.mqtt.DeviceTopicService;
 import com.yunfeiyun.agmp.iots.device.common.Device;
-import com.yunfeiyun.agmp.iots.device.serviceImp.IotCbdImgService;
+import com.yunfeiyun.agmp.iots.service.impl.IotCbdImgService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.stereotype.Component;

src/main/java/com/yunfeiyun/agmp/iots/mq/listener/IotmCmdChannelAwareMessageListener.java

@@ -6,7 +6,7 @@ import com.yunfeiyun.agmp.common.utils.JSONUtils;
 import com.yunfeiyun.agmp.iot.common.constant.mq.IotActionEnums;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdGroupModel;
 import com.yunfeiyun.agmp.iots.core.cmd.core.CmdDispatcherService;
-import com.yunfeiyun.agmp.iots.device.serviceImp.IotCbdImgService;
+import com.yunfeiyun.agmp.iots.service.impl.IotCbdImgService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener;
@@ -14,8 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.stereotype.Component;
 
-import java.io.IOException;
-
 /**
  * 负责处理AGMP 子系统的消息
  */

src/main/java/com/yunfeiyun/agmp/iots/device/service/IIotSporeService.java

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iots.device.service;
+package com.yunfeiyun.agmp.iots.service;
 
 
 import com.yunfeiyun.agmp.iot.common.domain.IotSpore;

src/main/java/com/yunfeiyun/agmp/iots/device/service/IIotYfScddataService.java

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iots.device.service;
+package com.yunfeiyun.agmp.iots.service;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;

src/main/java/com/yunfeiyun/agmp/iots/device/service/IIotYfXycb2dataService.java

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iots.device.service;
+package com.yunfeiyun.agmp.iots.service;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;

src/main/java/com/yunfeiyun/agmp/iots/device/service/IIotYfXycbIIIdataService.java

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iots.device.service;
+package com.yunfeiyun.agmp.iots.service;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;

src/main/java/com/yunfeiyun/agmp/iots/device/service/IotYbqEnvDataService.java

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iots.device.service;
+package com.yunfeiyun.agmp.iots.service;
 
 import com.yunfeiyun.agmp.iot.common.domain.IotYbqEnvData;
 

src/main/java/com/yunfeiyun/agmp/iots/device/service/IotYbqPredictDataService.java

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iots.device.service;
+package com.yunfeiyun.agmp.iots.service;
 
 import com.yunfeiyun.agmp.iot.common.domain.IotYbqPredictData;
 

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

@@ -1,20 +1,17 @@
-package com.yunfeiyun.agmp.iots.device.serviceImp;
+package com.yunfeiyun.agmp.iots.service.impl;
 
 import com.alibaba.fastjson2.JSONObject;
-import com.yunfeiyun.agmp.common.constant.ResConstants;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.iot.common.domain.IotBaseEntity;
 import com.yunfeiyun.agmp.iot.common.domain.IotBzyimg;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
-import com.yunfeiyun.agmp.iot.common.util.tmn.bzy.BzyInsectIdentifyUtil;
 import com.yunfeiyun.agmp.iots.service.IIotPestService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 @Slf4j
 @Service

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

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iots.device.serviceImp;
+package com.yunfeiyun.agmp.iots.service.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,7 +10,7 @@ import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.iot.common.domain.*;
 import com.yunfeiyun.agmp.common.service.WeatherService;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
-import com.yunfeiyun.agmp.iots.device.service.IIotSporeService;
+import com.yunfeiyun.agmp.iots.service.IIotSporeService;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iots.device.serviceImp;
+package com.yunfeiyun.agmp.iots.service.impl;
 
 import com.yunfeiyun.agmp.common.utils.JSONUtils;
 import com.yunfeiyun.agmp.iot.common.domain.IotBaseEntity;

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

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iots.device.serviceImp;
+package com.yunfeiyun.agmp.iots.service.impl;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
@@ -19,7 +19,6 @@ import com.yunfeiyun.agmp.iot.common.service.YfCbdRecogeService;
 import com.yunfeiyun.agmp.iot.common.util.tmn.cbd.CbdInsectIdentifyUtil;
 import com.yunfeiyun.agmp.iots.service.IIotDeviceService;
 import com.yunfeiyun.agmp.iots.service.IIotPestService;
-import com.yunfeiyun.agmp.iots.service.impl.WarnService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iots.device.serviceImp;
+package com.yunfeiyun.agmp.iots.service.impl;
 
 import com.yunfeiyun.agmp.iot.common.domain.IotCbdimg;
 import com.yunfeiyun.agmp.iot.common.domain.IotCbdrecog;

src/main/java/com/yunfeiyun/agmp/iots/service/IotDeviceAddressService.java

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iots.service;
+package com.yunfeiyun.agmp.iots.service.impl;
 
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.common.service.modal.LocationAddressModel;

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

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iots.device.serviceImp;
+package com.yunfeiyun.agmp.iots.service.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;

src/main/java/com/yunfeiyun/agmp/iots/service/impl/IotScddataServiceImpl.java

@@ -5,7 +5,7 @@ import com.yunfeiyun.agmp.iot.common.domain.IotBaseEntity;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotYfScddata;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
-import com.yunfeiyun.agmp.iots.device.service.IIotYfScddataService;
+import com.yunfeiyun.agmp.iots.service.IIotYfScddataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/yunfeiyun/agmp/iots/service/impl/IotSporeServiceImpl.java

@@ -4,7 +4,7 @@ import com.yunfeiyun.agmp.common.enums.RedisCacheKey;
 import com.yunfeiyun.agmp.common.framework.manager.RedisCacheManager;
 import com.yunfeiyun.agmp.iot.common.domain.IotSpore;
 import com.yunfeiyun.agmp.iots.device.mapper.IotSporeMapper;
-import com.yunfeiyun.agmp.iots.device.service.IIotSporeService;
+import com.yunfeiyun.agmp.iots.service.IIotSporeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/yunfeiyun/agmp/iots/service/impl/IotXycb2dataServiceImpl.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotYfXycb2data;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
-import com.yunfeiyun.agmp.iots.device.service.IIotYfXycb2dataService;
+import com.yunfeiyun.agmp.iots.service.IIotYfXycb2dataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -1,10 +1,10 @@
-package com.yunfeiyun.agmp.iots.device.serviceImp;
+package com.yunfeiyun.agmp.iots.service.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotYfXycbIIIdata;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
-import com.yunfeiyun.agmp.iots.device.service.IIotYfXycbIIIdataService;
+import com.yunfeiyun.agmp.iots.service.IIotYfXycbIIIdataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -1,8 +1,8 @@
-package com.yunfeiyun.agmp.iots.device.serviceImp;
+package com.yunfeiyun.agmp.iots.service.impl;
 
 import com.yunfeiyun.agmp.iot.common.domain.IotYbqEnvData;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
-import com.yunfeiyun.agmp.iots.device.service.IotYbqEnvDataService;
+import com.yunfeiyun.agmp.iots.service.IotYbqEnvDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -1,9 +1,9 @@
-package com.yunfeiyun.agmp.iots.device.serviceImp;
+package com.yunfeiyun.agmp.iots.service.impl;
 
 import com.yunfeiyun.agmp.common.utils.DateUtils;
 import com.yunfeiyun.agmp.iot.common.domain.IotYbqPredictData;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
-import com.yunfeiyun.agmp.iots.device.service.IotYbqPredictDataService;
+import com.yunfeiyun.agmp.iots.service.IotYbqPredictDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/yunfeiyun/agmp/iots/task/YbqScheduler.java

@@ -10,8 +10,8 @@ import com.yunfeiyun.agmp.iot.common.domain.IotYbqEnvData;
 import com.yunfeiyun.agmp.iot.common.domain.IotYbqPredictData;
 import com.yunfeiyun.agmp.iot.common.enums.ybq.YbqTypeConst;
 import com.yunfeiyun.agmp.iots.core.manager.HttpManager;
-import com.yunfeiyun.agmp.iots.device.service.IotYbqEnvDataService;
-import com.yunfeiyun.agmp.iots.device.service.IotYbqPredictDataService;
+import com.yunfeiyun.agmp.iots.service.IotYbqEnvDataService;
+import com.yunfeiyun.agmp.iots.service.IotYbqPredictDataService;
 import com.yunfeiyun.agmp.iots.device.serviceImp.YbqCmbService;
 import com.yunfeiyun.agmp.iots.service.IIotDeviceService;
 import com.yunfeiyun.agmp.iots.service.IIotDevicelasteddataService;