总览数据村汇总

huimv-cattle/src/main/java/com/huimv/cattle/controller/OverviewController.java

@@ -81,33 +81,20 @@ public class OverviewController {
         String farmCode = FarmCodeUtils.getFarmCode(paramsMap.get("farmCode"), httpServletRequest);
         //        //读取模式切换
         DataSource dataSource = dataSourceService.getDataSourceStatus();
-//        if (dataSource.getDsStatus() == 1){
-//            if (farmCode == null || farmCode.equals("0")){
-//                return overviewService.overList(httpServletRequest,paramsMap);
-//            }else {
-//                return overviewService.getListOverviewScreen(httpServletRequest,paramsMap);
-//            }
-//        }else {
-//            System.out.println("status=2,显示镇汇总（养殖云）数据");
-//            String farmCodes =   getFarmCodeByAdcode(farmCode);
-//            System.out.println(farmCodes);
-//            if (StringUtils.isBlank(farmCodes)){
-//                return new Result(ResultCode.SUCCESS,new ArrayList<>());
-//            }
-//            return getStockFromBreedCloud(farmCodes);
-//        }
-
         if (dataSource.getViewType() == 1) {
             //view=1,显示县填写数据
             return overviewService.overList(httpServletRequest,paramsMap);
-        } else {
+        }else if (dataSource.getViewType() == 2){
             //view=2,显示镇汇总数据
+            return overviewService.getListOverviewScreen(httpServletRequest,paramsMap);
+        } else {
+            //view=3,显示村汇总数据
             if (dataSource.getDsStatus() == 1) {
-                //status=1,显示镇汇总（手填）数据
-                return overviewService.getListOverviewScreen(httpServletRequest,paramsMap);
+                //status=1,显示村汇总（手填）数据
+                return overviewService.getListOverviewVillageScreen(httpServletRequest,paramsMap);
             } else {
-                //status=2,显示镇汇总（养殖云）数据
-                System.out.println("status=2,显示镇汇总（养殖云）数据");
+                //status=2,显示村汇总（养殖云）数据
+                System.out.println("status=2,显示村汇总（养殖云）数据");
                 String farmCodes =   getFarmCodeByAdcode(farmCode);
                 System.out.println(farmCodes);
                 if (StringUtils.isBlank(farmCodes)){

huimv-cattle/src/main/java/com/huimv/cattle/mapper/OverviewMapper.java

@@ -17,5 +17,5 @@ import org.springframework.stereotype.Repository;
 public interface OverviewMapper extends BaseMapper<Overview> {
     Overview getOverList();
 
-    Overview getListOverview();
+    Overview getListOverview(String[] farmCode);
 }

huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/OverviewMapper.xml

@@ -25,6 +25,9 @@
 
     <select id="getListOverview" resultType="com.huimv.cattle.pojo.Overview">
         SELECT SUM(stock_count) stockCount ,SUM(out_count) outCount ,SUM(breed_count) breedCount ,SUM(farm_count) farmCount,SUM(output_value) outputValue,SUM(variety) variety  FROM `overview`
-        WHERE farm_code != 0
+        WHERE farm_code IN
+        <foreach collection="farmCode"   item="cityCode" open="(" separator="," close=")">
+            #{cityCode}
+        </foreach>
 </select>
 </mapper>

huimv-cattle/src/main/java/com/huimv/cattle/service/OverviewService.java

@@ -27,4 +27,6 @@ public interface OverviewService extends IService<Overview> {
     Result getListOverviewScreen(HttpServletRequest httpServletRequest,Map<String, String> paramsMap);
 
     Integer getOutStock(JSONObject townJo);
+
+    Result getListOverviewVillageScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

huimv-cattle/src/main/java/com/huimv/cattle/service/impl/OverviewServiceImpl.java

@@ -3,6 +3,7 @@ package com.huimv.cattle.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.cattle.mapper.SysRegionCounTownVillMapper;
 import com.huimv.cattle.pojo.Overview;
 import com.huimv.cattle.mapper.OverviewMapper;
 import com.huimv.cattle.pojo.Stock;
@@ -17,6 +18,7 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -33,6 +35,9 @@ public class OverviewServiceImpl extends ServiceImpl<OverviewMapper, Overview> i
 
     @Autowired
     private OverviewMapper overviewMapper;
+    @Autowired
+    private SysRegionCounTownVillMapper sysRegionCounTownVillMapper;
+
     @Override
     public Result overList(HttpServletRequest httpServletRequest,Map<String, String> paramsMap) {
         String farmCode = FarmCodeUtils.getFarmCode(paramsMap.get("farmCode"), httpServletRequest);
@@ -139,7 +144,9 @@ public class OverviewServiceImpl extends ServiceImpl<OverviewMapper, Overview> i
         }
         Overview overview = new Overview();
         if (farmCode == null || farmCode.equals("0")){
-            overview = overviewMapper.getListOverview();
+            String cityCode = sysRegionCounTownVillMapper.listSub(farmCode);
+            String[] city = cityCode.split(",");
+            overview = overviewMapper.getListOverview(city);
         }else {
             QueryWrapper<Overview> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_code", farmCode);
@@ -175,4 +182,50 @@ public class OverviewServiceImpl extends ServiceImpl<OverviewMapper, Overview> i
             return overview.getOutCount();
         }
     }
+
+    @Override
+    public Result getListOverviewVillageScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmCode =paramsMap.get("farmCode");
+        if (farmCode==null) {
+            farmCode = TokenSign.getFarmCode(httpServletRequest);
+        }
+        Overview overview = new Overview();
+        String cityCode ="";
+        String subCityCode="";
+        List<String> subCityList = new ArrayList<>();
+        if (farmCode == null || farmCode.equals("0")){
+            cityCode = sysRegionCounTownVillMapper.listSub(farmCode);
+            String[] city = cityCode.split(",");
+            for (String s : city) {
+                subCityCode = sysRegionCounTownVillMapper.listSub(s);
+                String[] strings = subCityCode.split(",");
+                for (String string : strings) {
+                    subCityList.add(string);
+                }
+            }
+            String[] subCity = subCityList.toArray(new String[subCityList.size()]);
+            overview = overviewMapper.getListOverview(subCity);
+        }else {
+            cityCode = sysRegionCounTownVillMapper.listSub(farmCode);
+            String[] city = cityCode.split(",");
+            overview = overviewMapper.getListOverview(city);
+        }
+        JSONObject jsonObject = new JSONObject();
+        if (ObjectUtil.isEmpty(overview)) {
+            jsonObject.put("stockCount", 0);
+            jsonObject.put("outCount", 0);
+            jsonObject.put("breedCount", 0);
+            jsonObject.put("farmCount", 0);
+            jsonObject.put("outputValue", 0);
+            jsonObject.put("variety", 0);
+        } else {
+            jsonObject.put("stockCount", overview.getStockCount());
+            jsonObject.put("outCount", overview.getOutCount());
+            jsonObject.put("breedCount", overview.getBreedCount());
+            jsonObject.put("farmCount", overview.getFarmCount());
+            jsonObject.put("outputValue", overview.getOutputValue());
+            jsonObject.put("variety", overview.getVariety());
+        }
+        return new Result(ResultCode.SUCCESS,jsonObject);
+    }
 }