出栏规模村汇总

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

@@ -49,6 +49,36 @@ public class OutStockController {
     private RestTemplate restTemplate;
     @Autowired
     private SysFarmService farmService;
+    @PostMapping("/getOutStockScreen")
+    public Result getListScreen(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        String farmCode = FarmCodeUtils.getFarmCode(paramsMap.get("farmCode"), httpServletRequest);
+        //        //读取模式切换
+        DataSource dataSource = dataSourceService.getDataSourceStatus();
+        if (dataSource.getViewType() == 1) {
+            //view=1,显示县填写数据
+            return  outStockService.listOutStock(httpServletRequest,paramsMap);
+        } else if (dataSource.getViewType() == 2){
+            //view=2,显示镇汇总数据
+            return  outStockService.listOutStock(httpServletRequest,paramsMap);
+        }else {
+            //view=3,显示村汇总数据
+            if (dataSource.getDsStatus() == 1) {
+                //status=1,显示村汇总（手填）数据
+                return  outStockService.listVillageOutStock(httpServletRequest,paramsMap);
+            } else {
+                //status=2,显示村汇总（养殖云）数据
+                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);
+                //++++++++++++++++++++++++++++++++++++++++++++++++++
+            }
+        }
+    }
+
     @PostMapping("/getOutStock")
     public Result getList(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         String farmCode = FarmCodeUtils.getFarmCode(paramsMap.get("farmCode"), httpServletRequest);

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

@@ -21,4 +21,6 @@ import java.util.List;
 @Repository
 public interface OutStockMapper extends BaseMapper<OutStock> {
     List<OutStock> listData(@Param(Constants.WRAPPER) QueryWrapper<OutStock> wrapper);
+
+    List<OutStock> listVillageOutStock(String[] farmCode);
 }

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

@@ -21,4 +21,13 @@
         ${ew.customSqlSegment}
     </select>
 
+    <select id="listVillageOutStock" resultType="com.huimv.cattle.pojo.OutStock">
+        SELECT YEAR,MONTH,SUM(out_stock) outStock FROM `out_stock`
+         WHERE farm_code IN
+        <foreach collection="farmCode"   item="cityCode" open="(" separator="," close=")">
+            #{cityCode}
+        </foreach>
+        GROUP BY YEAR,MONTH ORDER BY YEAR DESC,MONTH DESC
+    </select>
+
 </mapper>

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

@@ -19,4 +19,6 @@ public interface OutStockService extends IService<OutStock> {
     Result listOutStock(HttpServletRequest httpServletRequest,Map<String, String> paramsMap);
 
     Result addOutStock(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
+
+    Result listVillageOutStock(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.cattle.mapper.SysRegionCounTownVillMapper;
 import com.huimv.cattle.pojo.OutStock;
 import com.huimv.cattle.mapper.OutStockMapper;
 import com.huimv.cattle.service.OutStockService;
@@ -34,6 +35,8 @@ public class OutStockServiceImpl extends ServiceImpl<OutStockMapper, OutStock> i
 
     @Autowired
     private OutStockMapper outStockMapper;
+    @Autowired
+    private SysRegionCounTownVillMapper sysRegionCounTownVillMapper;
 
     @Override
     public Result listOutStock(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
@@ -114,4 +117,20 @@ public class OutStockServiceImpl extends ServiceImpl<OutStockMapper, OutStock> i
         }
         return new Result(ResultCode.SUCCESS,"保存成功");
     }
+
+    @Override
+    public Result listVillageOutStock(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmCode =paramsMap.get("farmCode");
+        if (farmCode==null) {
+            farmCode = TokenSign.getFarmCode(httpServletRequest);
+        }
+        String month = paramsMap.get("months");
+        if (month == null || month == "") {
+            String cityCode = sysRegionCounTownVillMapper.listSub(farmCode);
+            String[] city = cityCode.split(",");
+            List<OutStock> list = outStockMapper.listVillageOutStock(city);
+            return new Result(ResultCode.SUCCESS, list);
+        }
+        return null;
+    }
 }