|
@@ -7,7 +7,9 @@ import com.yunfeiyun.agmp.common.core.controller.BaseController;
|
|
|
import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
|
|
import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
|
|
|
import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
|
|
import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
|
|
|
import com.yunfeiyun.agmp.common.exception.BizException;
|
|
import com.yunfeiyun.agmp.common.exception.BizException;
|
|
|
|
|
+import com.yunfeiyun.agmp.common.service.LocationService;
|
|
|
import com.yunfeiyun.agmp.common.service.WeatherService;
|
|
import com.yunfeiyun.agmp.common.service.WeatherService;
|
|
|
|
|
+import com.yunfeiyun.agmp.common.service.modal.LocationAddressModel;
|
|
|
import com.yunfeiyun.agmp.common.utils.SecurityUtils;
|
|
import com.yunfeiyun.agmp.common.utils.SecurityUtils;
|
|
|
import com.yunfeiyun.agmp.common.utils.StringUtils;
|
|
import com.yunfeiyun.agmp.common.utils.StringUtils;
|
|
|
import com.yunfeiyun.agmp.fms.domain.FmsBlock;
|
|
import com.yunfeiyun.agmp.fms.domain.FmsBlock;
|
|
@@ -51,6 +53,9 @@ public class FmsScreenController extends BaseController {
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private WeatherService weatherService;
|
|
private WeatherService weatherService;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private LocationService locationService;
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 查询基地列表不分页
|
|
* 查询基地列表不分页
|
|
|
*/
|
|
*/
|
|
@@ -195,4 +200,16 @@ public class FmsScreenController extends BaseController {
|
|
|
result.put("chineseCalendar",chineseCalendar.getMonthInChinese()+"月"+chineseCalendar.getDayInChinese());
|
|
result.put("chineseCalendar",chineseCalendar.getMonthInChinese()+"月"+chineseCalendar.getDayInChinese());
|
|
|
return success(result);
|
|
return success(result);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 查询项目位置信息
|
|
|
|
|
+ */
|
|
|
|
|
+ @GetMapping("/location")
|
|
|
|
|
+ public AjaxResult location() {
|
|
|
|
|
+ LocationAddressModel location = locationService.getProjectLocation();
|
|
|
|
|
+ if (location == null) {
|
|
|
|
|
+ throw new BizException(ErrorCode.INVALID_PARAMETER.getCode(), "省份或城市不存在");
|
|
|
|
|
+ }
|
|
|
|
|
+ return AjaxResult.success(location);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|