|
@@ -22,7 +22,6 @@ import java.io.IOException;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
-import java.util.Objects;
|
|
|
|
|
|
@Service
|
|
|
public class ResourceBigDataServiceImpl extends BaseServiceImpl implements IResourceBigDataService {
|
|
@@ -159,11 +158,7 @@ public class ResourceBigDataServiceImpl extends BaseServiceImpl implements IReso
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
map.put("centerdataTFarmBasicFarmland",centerdataTFarmBasicFarmland);
|
|
|
map.put("dictList",DictUtils.getDictCache("farm_field_attribute"));
|
|
|
- String deptId="";
|
|
|
- if (!Objects.isNull(centerdataTFarmBasicFarmland.getDeptId())){
|
|
|
- deptId=String.valueOf(centerdataTFarmBasicFarmland.getDeptId());
|
|
|
- }
|
|
|
- return deptLevelUtil.getDeptLevel(digitalResourcesBigDataMapper.selectFarmBasicFarmlandCount(map),deptId);
|
|
|
+ return deptLevelUtil.getDeptLevel(digitalResourcesBigDataMapper.selectFarmBasicFarmlandCount(map),String.valueOf(centerdataTFarmBasicFarmland.getDeptId()));
|
|
|
}
|
|
|
/**
|
|
|
* 地质灾害易发区
|
|
@@ -189,11 +184,7 @@ public class ResourceBigDataServiceImpl extends BaseServiceImpl implements IReso
|
|
|
for (Map<String, Object> stringObjectMap : hydraulicPatrolTask) {
|
|
|
stringObjectMap.put("patrolTrajectory",getPlanLength(MapUtils.getString(stringObjectMap,"patrolTrajectory")));
|
|
|
}
|
|
|
- String deptId="";
|
|
|
- if (!Objects.isNull(centerdataTHydraulicPatrolTask.getDeptId())){
|
|
|
- deptId=String.valueOf(centerdataTHydraulicPatrolTask.getDeptId());
|
|
|
- }
|
|
|
- return deptLevelUtil.getDeptLevel(hydraulicPatrolTask,deptId);
|
|
|
+ return deptLevelUtil.getDeptLevel(hydraulicPatrolTask,String.valueOf(centerdataTHydraulicPatrolTask.getDeptId()));
|
|
|
|
|
|
}
|
|
|
private String getPlanLength(String patrolTrajectory) {
|