|
@@ -72,7 +72,7 @@ public class EmergencyBigDataController extends BaseController {
|
|
|
VisuForestCloudMapVO visuForestCloudMapVO = new VisuForestCloudMapVO();
|
|
|
List list = emergencyBigDataService.getEmergencyResourceCount(vo);
|
|
|
list.addAll(fireControlBigDataService.geFireControltTotal(visuForestCloudMapVO));
|
|
|
- return R.ok(emergencyBigDataService.getEmergencyResourceCount(vo));
|
|
|
+ return R.ok(list);
|
|
|
}
|
|
|
|
|
|
/**
|