|
@@ -81,6 +81,22 @@ public class OverviewController {
|
|
|
String farmCode = FarmCodeUtils.getFarmCode(paramsMap.get("farmCode"), httpServletRequest);
|
|
String farmCode = FarmCodeUtils.getFarmCode(paramsMap.get("farmCode"), httpServletRequest);
|
|
|
// //读取模式切换
|
|
// //读取模式切换
|
|
|
DataSource dataSource = dataSourceService.getDataSourceStatus();
|
|
DataSource dataSource = dataSourceService.getDataSourceStatus();
|
|
|
|
|
+// if (dataSource.getDsStatus() == 1){
|
|
|
|
|
+// if (farmCode == null || farmCode.equals("0")){
|
|
|
|
|
+// return overviewService.overList(httpServletRequest,paramsMap);
|
|
|
|
|
+// }else {
|
|
|
|
|
+// return overviewService.getListOverviewScreen(httpServletRequest,paramsMap);
|
|
|
|
|
+// }
|
|
|
|
|
+// }else {
|
|
|
|
|
+// System.out.println("status=2,显示镇汇总（养殖云）数据");
|
|
|
|
|
+// String farmCodes = getFarmCodeByAdcode(farmCode);
|
|
|
|
|
+// System.out.println(farmCodes);
|
|
|
|
|
+// if (StringUtils.isBlank(farmCodes)){
|
|
|
|
|
+// return new Result(ResultCode.SUCCESS,new ArrayList<>());
|
|
|
|
|
+// }
|
|
|
|
|
+// return getStockFromBreedCloud(farmCodes);
|
|
|
|
|
+// }
|
|
|
|
|
+
|
|
|
if (dataSource.getViewType() == 1) {
|
|
if (dataSource.getViewType() == 1) {
|
|
|
//view=1,显示县填写数据
|
|
//view=1,显示县填写数据
|
|
|
return overviewService.overList(httpServletRequest,paramsMap);
|
|
return overviewService.overList(httpServletRequest,paramsMap);
|
