|
@@ -3,6 +3,7 @@ package com.huimv.cattle.service.impl;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
+import com.huimv.cattle.mapper.SysRegionCounTownVillMapper;
|
|
|
import com.huimv.cattle.pojo.FarmKindCount;
|
|
|
import com.huimv.cattle.mapper.FarmKindCountMapper;
|
|
|
import com.huimv.cattle.pojo.IndustryOutput;
|
|
@@ -15,6 +16,7 @@ import com.huimv.common.utils.ResultCode;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
+import org.springframework.web.util.pattern.PathPattern;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import java.util.*;
|
|
@@ -31,6 +33,8 @@ import java.util.*;
|
|
|
public class FarmKindCountServiceImpl extends ServiceImpl<FarmKindCountMapper, FarmKindCount> implements FarmKindCountService {
|
|
|
@Autowired
|
|
|
private FarmKindCountMapper farmKindCountMapper;
|
|
|
+ @Autowired
|
|
|
+ private SysRegionCounTownVillMapper sysRegionCounTownVillMapper;
|
|
|
|
|
|
@Override
|
|
|
public Result getFarmKindCount(HttpServletRequest request, Map<String, String> paramsMap) {
|
|
@@ -67,6 +71,17 @@ public class FarmKindCountServiceImpl extends ServiceImpl<FarmKindCountMapper, F
|
|
|
return new Result(ResultCode.SUCCESS);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public Result getFarmKindCountScreen(HttpServletRequest request, Map<String, String> paramsMap) {
|
|
|
+ String farmCode = paramsMap.get("farmCode");
|
|
|
+ if (StringUtils.isBlank(farmCode)) {
|
|
|
+ farmCode = TokenSign.getFarmCode(request);
|
|
|
+ }
|
|
|
+ String[] city = sysRegionCounTownVillMapper.listSub(farmCode).split(",");
|
|
|
+ List<FarmKindCount> farmKindCount = farmKindCountMapper.getVillageFarmKindCount(city);
|
|
|
+ return new Result(ResultCode.SUCCESS, farmKindCount);
|
|
|
+ }
|
|
|
+
|
|
|
private Boolean checkRepeat(List<FarmKindCount> list) {
|
|
|
List<String> collectionOptionList = new ArrayList<>();
|
|
|
for (FarmKindCount a : list) {
|