|
@@ -1,8 +1,11 @@
|
|
|
package com.sooka.sponest.data.digitalagriculture.service.impl;
|
|
|
|
|
|
+import com.ruoyi.common.core.utils.StringUtils;
|
|
|
import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
|
|
|
import com.ruoyi.common.security.utils.DictUtils;
|
|
|
+import com.ruoyi.common.security.utils.SecurityUtils;
|
|
|
import com.ruoyi.system.api.domain.SysDictData;
|
|
|
+import com.ruoyi.system.api.utils.DeptLevelUtil;
|
|
|
import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
|
|
|
import com.sooka.sponest.data.digitalagriculture.domain.CenterdataTFarmAgriculturalCooperatives;
|
|
|
import com.sooka.sponest.data.digitalagriculture.domain.bo.AgricultureBigDataBO;
|
|
@@ -12,6 +15,7 @@ import org.apache.commons.collections4.MapUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import javax.annotation.Resource;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -21,7 +25,7 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
|
|
|
@Autowired
|
|
|
private AgricultureBigDataMapper agricultureBigDataMapper;
|
|
|
|
|
|
- @Autowired
|
|
|
+ @Resource
|
|
|
private DeptLevelUtil deptLevelUtil;
|
|
|
|
|
|
@Override
|
|
@@ -219,6 +223,9 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
|
|
|
objectObjectHashMap.put("stockNum", 0);
|
|
|
list.add(objectObjectHashMap);
|
|
|
}
|
|
|
+ if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
|
|
|
+ agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
|
|
|
+ }
|
|
|
return deptLevelUtil.getDeptLevel(list,String.valueOf(agricultureBigDataBO.getDeptId()));
|
|
|
}
|
|
|
|
|
@@ -242,10 +249,16 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
|
|
|
int currentYear = calendar.get(Calendar.YEAR);
|
|
|
// 获取当前年份的数据
|
|
|
List<Map<String, Object>> currentYearStatistics = getStatisticsByYear(agricultureBigDataBO, String.valueOf(currentYear));
|
|
|
+ if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
|
|
|
+ agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
|
|
|
+ }
|
|
|
List<Map<String, Object>> deptLevel = deptLevelUtil.getDeptLevel(currentYearStatistics,String.valueOf(agricultureBigDataBO.getDeptId()));
|
|
|
// 获取过去五年的数据
|
|
|
for (int i = currentYear - 1; i >= currentYear - 4; i--) {
|
|
|
List<Map<String, Object>> statisticsByYear = getStatisticsByYear(agricultureBigDataBO, String.valueOf(i));
|
|
|
+ if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
|
|
|
+ agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
|
|
|
+ }
|
|
|
deptLevel.addAll(deptLevelUtil.getDeptLevel(statisticsByYear,String.valueOf(agricultureBigDataBO.getDeptId())));
|
|
|
}
|
|
|
// 根据name(年份)进行分组
|
|
@@ -291,6 +304,9 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
|
|
|
objectObjectHashMap.put("breedMoneyNum", 0);
|
|
|
agriculturalSubsidy.add(objectObjectHashMap);
|
|
|
}
|
|
|
+ if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
|
|
|
+ agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
|
|
|
+ }
|
|
|
return deptLevelUtil.getDeptLevel(agriculturalSubsidy,String.valueOf(agricultureBigDataBO.getDeptId()));
|
|
|
}
|
|
|
|
|
@@ -382,6 +398,9 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
map.put("agricultureBigDataBO",agricultureBigDataBO);
|
|
|
map.put("dictList", DictUtils.getDictCache("farm_field_attribute"));
|
|
|
+ if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
|
|
|
+ agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
|
|
|
+ }
|
|
|
return deptLevelUtil.getDeptLevel(agricultureBigDataMapper.getFarmlandStatistics(map),String.valueOf(agricultureBigDataBO.getDeptId()));
|
|
|
}
|
|
|
|
|
@@ -398,21 +417,36 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
|
|
|
Map<String,List<Map<String, Object>>> hashMap = new HashMap<>();
|
|
|
// 合作社数量
|
|
|
List<Map<String, Object>> cooperativesStatisticsByCooperatives = agricultureBigDataMapper.getCooperativesStatisticsByCooperatives(agricultureBigDataBO);
|
|
|
+ if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
|
|
|
+ agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
|
|
|
+ }
|
|
|
List<Map<String, Object>> cooperativesStatistics = new ArrayList<>(deptLevelUtil.getDeptLevel(cooperativesStatisticsByCooperatives,String.valueOf(agricultureBigDataBO.getDeptId())));
|
|
|
// 示范级别
|
|
|
List<Map<String, Object>> statisticsByLeaseTerm = agricultureBigDataMapper.getCooperativesStatisticsByLeaseTerm(agricultureBigDataBO);
|
|
|
+ if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
|
|
|
+ agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
|
|
|
+ }
|
|
|
List<Map<String, Object>> statisticsByLeaseTermList = deptLevelUtil.getDeptLevel(statisticsByLeaseTerm, String.valueOf(agricultureBigDataBO.getDeptId()));
|
|
|
// 成员出资额
|
|
|
List<Map<String, Object>> statisticsByRegisterCapital = agricultureBigDataMapper.getCooperativesStatisticsByRegisterCapital(agricultureBigDataBO);
|
|
|
int registerCapitalSum = getStatisticsSum(statisticsByRegisterCapital);
|
|
|
+ if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
|
|
|
+ agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
|
|
|
+ }
|
|
|
List<Map<String, Object>> statisticsByRegisterCapitalList = deptLevelUtil.getDeptLevel(statisticsByRegisterCapital, String.valueOf(agricultureBigDataBO.getDeptId()));
|
|
|
// 入社人员
|
|
|
List<Map<String, Object>> statisticsByMembersNum = agricultureBigDataMapper.getCooperativesStatisticsByMembersNum(agricultureBigDataBO);
|
|
|
int membersNumSum = getStatisticsSum(statisticsByMembersNum);
|
|
|
+ if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
|
|
|
+ agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
|
|
|
+ }
|
|
|
List<Map<String, Object>> statisticsByMembersNumList = deptLevelUtil.getDeptLevel(statisticsByMembersNum, String.valueOf(agricultureBigDataBO.getDeptId()));
|
|
|
// 带动农户
|
|
|
List<Map<String, Object>> statisticsByDrivenFarmersNum = agricultureBigDataMapper.getCooperativesStatisticsByDrivenFarmersNum(agricultureBigDataBO);
|
|
|
int drivenFarmersNumSum = getStatisticsSum(statisticsByDrivenFarmersNum);
|
|
|
+ if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
|
|
|
+ agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
|
|
|
+ }
|
|
|
List<Map<String, Object>> statisticsByDrivenFarmersNumList = deptLevelUtil.getDeptLevel(statisticsByDrivenFarmersNum, String.valueOf(agricultureBigDataBO.getDeptId()));
|
|
|
|
|
|
// 数据分组
|
|
@@ -506,6 +540,9 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
|
|
|
objectObjectHashMap.put("stillAreaNum", 0);
|
|
|
strawTurnover.add(objectObjectHashMap);
|
|
|
}
|
|
|
+ if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
|
|
|
+ agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
|
|
|
+ }
|
|
|
return deptLevelUtil.getDeptLevel(strawTurnover,String.valueOf(agricultureBigDataBO.getDeptId()));
|
|
|
}
|
|
|
}
|