|
@@ -42,7 +42,7 @@ public class StockController {
|
|
|
|
|
|
@PostMapping("/getStock")
|
|
@PostMapping("/getStock")
|
|
public Result list(HttpServletRequest httpServletRequest,@RequestBody Map<String,String> paramsMap) {
|
|
public Result list(HttpServletRequest httpServletRequest,@RequestBody Map<String,String> paramsMap) {
|
|
- // //读取模式切换
|
|
|
|
|
|
+ //读取模式切换
|
|
DataSource dataSource = dataSourceService.getDataSourceStatus();
|
|
DataSource dataSource = dataSourceService.getDataSourceStatus();
|
|
if (dataSource.getViewType() == 1) {
|
|
if (dataSource.getViewType() == 1) {
|
|
//view=1,显示县填写数据
|
|
//view=1,显示县填写数据
|
|
@@ -54,9 +54,7 @@ public class StockController {
|
|
return stockService.getStock(httpServletRequest,paramsMap);
|
|
return stockService.getStock(httpServletRequest,paramsMap);
|
|
} else {
|
|
} else {
|
|
//status=2,显示镇汇总(养殖云)数据
|
|
//status=2,显示镇汇总(养殖云)数据
|
|
- System.out.println("status=2,显示镇汇总(养殖云)数据");
|
|
|
|
return getStockFromBreedCloud(paramsMap);
|
|
return getStockFromBreedCloud(paramsMap);
|
|
- //++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|