新增 获取天气信息公共工具

src/main/java/com/yunfeiyun/agmp/iotm/device/pest/service/impl/IotCbdrecogServiceImpl.java

@@ -16,7 +16,7 @@ import com.yunfeiyun.agmp.iot.common.domain.reqvo.IotCbdrecogReqVo;
 import com.yunfeiyun.agmp.iot.common.enums.EnumCbdMarkType;
 import com.yunfeiyun.agmp.iot.common.enums.EnumCbdRecogType;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
-import com.yunfeiyun.agmp.iot.common.service.IotWeatherService;
+import com.yunfeiyun.agmp.common.service.WeatherService;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
 import com.yunfeiyun.agmp.iotm.device.pest.domain.IotCbdrecogInfoResVo;
 import com.yunfeiyun.agmp.iotm.device.pest.domain.IotCbdrecogResVo;
@@ -60,7 +60,7 @@ public class IotCbdrecogServiceImpl implements IIotCbdrecogService {
     private IIotDeviceService iotDeviceService;
 
     @Autowired
-    private IotWeatherService iotWeatherService;
+    private WeatherService weatherService;
 
     @Autowired
     private MongoService mongoService;

src/main/java/com/yunfeiyun/agmp/iotm/device/xycb/service/IIotXycbCommService.java

@@ -18,7 +18,7 @@ import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceDictConst;
 import com.yunfeiyun.agmp.iot.common.domain.*;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdGroupModel;
-import com.yunfeiyun.agmp.iot.common.service.IotWeatherService;
+import com.yunfeiyun.agmp.common.service.WeatherService;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
 import com.yunfeiyun.agmp.iotm.device.common.domin.DeviceRefreshDto;
 import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceDataListReqVo;
@@ -63,7 +63,7 @@ public class IIotXycbCommService extends IotDeviceBaseServiceImpl implements Iot
     private IIotXyinfoService iIotXyinfoService;
 
     @Autowired
-    private IotWeatherService iotWeatherService;
+    private WeatherService weatherService;
 
     @Autowired
     private IIotPestrecogService iIotPestrecogService;
@@ -241,7 +241,7 @@ public class IIotXycbCommService extends IotDeviceBaseServiceImpl implements Iot
         String city = StringUtils.isEmpty(iotDevice.getDevCityalign()) ? iotDevice.getDevCity(): iotDevice.getDevCityalign();
         String district = StringUtils.isEmpty(iotDevice.getDevDistrictalign()) ? iotDevice.getDevDistrict(): iotDevice.getDevDistrictalign();
         if(StringUtils.isNotEmpty(province) && StringUtils.isNotEmpty(city)){
-            JSONObject weatherInfo = iotWeatherService.getWeatherByAddress(province, city, district);
+            JSONObject weatherInfo = weatherService.getWeatherByAddress(province, city, district);
             iotXycbInfoResVo.setWea(weatherInfo.getString("wea"));
             iotXycbInfoResVo.setWin(weatherInfo.getString("win"));
             iotXycbInfoResVo.setWin_speed(weatherInfo.getString("win_speed"));

src/main/java/com/yunfeiyun/agmp/iotm/device/xycb/service/impl/IotXycbServiceImpl.java

@@ -15,7 +15,7 @@ import com.yunfeiyun.agmp.iot.common.domain.IotPest;
 import com.yunfeiyun.agmp.iot.common.domain.IotXyinfo;
 import com.yunfeiyun.agmp.iot.common.domain.IotYfXycbIIIdata;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
-import com.yunfeiyun.agmp.iot.common.service.IotWeatherService;
+import com.yunfeiyun.agmp.common.service.WeatherService;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
 import com.yunfeiyun.agmp.iotm.device.pest.service.IIotPestService;
 import com.yunfeiyun.agmp.iotm.device.pest.service.IIotPestrecogService;
@@ -45,7 +45,7 @@ public class IotXycbServiceImpl implements IIotXycbService {
     private MongoService mongoService;
 
     @Autowired
-    private IotWeatherService iotWeatherService;
+    private WeatherService weatherService;
 
     @Autowired
     private IIotXyinfoService iIotXyinfoService;
@@ -307,7 +307,7 @@ public class IotXycbServiceImpl implements IIotXycbService {
         String city = StringUtils.isEmpty(iotDevice.getDevCityalign()) ? iotDevice.getDevCity(): iotDevice.getDevCityalign();
         String district = StringUtils.isEmpty(iotDevice.getDevDistrictalign()) ? iotDevice.getDevDistrict(): iotDevice.getDevDistrictalign();
         if(StringUtils.isNotEmpty(province) && StringUtils.isNotEmpty(city)){
-            JSONObject weatherInfo = iotWeatherService.getWeatherByAddress(province, city, district);
+            JSONObject weatherInfo = weatherService.getWeatherByAddress(province, city, district);
             iotXycbInfoResVo.setWea(weatherInfo.getString("wea"));
             iotXycbInfoResVo.setWin(weatherInfo.getString("win"));
             iotXycbInfoResVo.setWin_speed(weatherInfo.getString("win_speed"));