|
|
@@ -26,8 +26,8 @@ public class JsonController {
|
|
|
@Autowired
|
|
|
private UserRepository userRepository;
|
|
|
|
|
|
- private String mLastWeatherDate = "";
|
|
|
- private WeatherBean mWeatherBean;
|
|
|
+ //private String mLastWeatherDate = "";
|
|
|
+ //private WeatherBean mWeatherBean;
|
|
|
private String mLastYijiDate = "";
|
|
|
private YijiBean mYijiBean;
|
|
|
|
|
|
@@ -57,14 +57,15 @@ public class JsonController {
|
|
|
|
|
|
// todo 以后收费
|
|
|
/*if (!dbUserBean.isVip()) {
|
|
|
- return "请更新客户端并开通服务后常识";
|
|
|
+ return "请更新客户端并开通服务后重试";
|
|
|
}*/
|
|
|
- String currentDate = DateTool.getCurrentDate();
|
|
|
- if (!TextUtils.equals(mLastWeatherDate, currentDate) || TextUtils.isEmpty(mWeatherBean.temperatureRange)) {
|
|
|
- mWeatherBean = WebTool.getWeatherInfo(weatherBean, city);
|
|
|
- mLastWeatherDate = currentDate;
|
|
|
- }
|
|
|
- return JSON.toJSONString(mWeatherBean);
|
|
|
+// String currentDate = DateTool.getCurrentDate();
|
|
|
+// if (!TextUtils.equals(mLastWeatherDate, currentDate) || TextUtils.isEmpty(mWeatherBean.temperatureRange)) {
|
|
|
+// mWeatherBean = WebTool.getWeatherInfo(weatherBean, city);
|
|
|
+// mLastWeatherDate = currentDate;
|
|
|
+// }
|
|
|
+ WebTool.getWeatherInfo(weatherBean, city);
|
|
|
+ return JSON.toJSONString(weatherBean);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -92,7 +93,7 @@ public class JsonController {
|
|
|
|
|
|
// todo 以后收费
|
|
|
/*if (!dbUserBean.isVip()) {
|
|
|
- return "请更新客户端并开通服务后常识";
|
|
|
+ return "请更新客户端并开通服务后重试";
|
|
|
}*/
|
|
|
String currentDate = DateTool.getCurrentDate();
|
|
|
if (!TextUtils.equals(mLastYijiDate, currentDate) || TextUtils.isEmpty(mYijiBean.newDate)) {
|