修改镇数据源

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

@@ -76,6 +76,31 @@ public class OverviewController {
             }
         }
     }
+    @PostMapping("/getOverviewScreen")
+    public Result getOverviewScreen(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 overviewService.overList(httpServletRequest,paramsMap);
+        } else {
+            //view=2,显示镇汇总数据
+            if (dataSource.getDsStatus() == 1) {
+                //status=1,显示镇汇总（手填）数据
+                return overviewService.getListOverviewScreen(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);
+            }
+        }
+    }
 
     private String getFarmCodeByAdcode(String farmCode) {
         String adcode  = "620826";

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

@@ -76,6 +76,32 @@ public class StockController {
             }
         }
     }
+    @PostMapping("/getStockScreen")
+    public Result getStockScreen(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 stockService.getStock(httpServletRequest,paramsMap);
+        } else {
+            //view=2,显示镇汇总数据
+            if (dataSource.getDsStatus() == 1) {
+                //status=1,显示镇汇总（手填）数据
+                return stockService.getListStockScreen(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);
+                //++++++++++++++++++++++++++++++++++++++++++++++++++
+            }
+        }
+    }
 
     private String getFarmCodeByAdcode(String farmCode) {
         String adcode  = "620826";

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

@@ -29,6 +29,10 @@ public class StockStatusController {
     public Result getStockStatus(HttpServletRequest request,@RequestBody Map<String, String> paramsMap){
         return stockStatusService.getStockStatus(request,paramsMap);
     }
+    @PostMapping("/getStockStatusScreen")
+    public Result getStockStatusScreen(HttpServletRequest request,@RequestBody Map<String, String> paramsMap){
+        return stockStatusService.getStockStatusScreen(request,paramsMap);
+    }
 
     @PostMapping("/saveStockStatus")
     public Result saveStockStatus(HttpServletRequest request,@RequestBody Map<String, String> paramsMap){

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

@@ -1,5 +1,6 @@
 package com.huimv.cattle.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.cattle.pojo.Overview;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
@@ -15,4 +16,6 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface OverviewMapper extends BaseMapper<Overview> {
     Overview getOverList();
+
+    Overview getListOverview();
 }

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

@@ -19,4 +19,6 @@ import java.util.Map;
 public interface StockMapper extends BaseMapper<Stock> {
 
     Stock getList();
+
+    Stock getListStock();
 }

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

@@ -17,4 +17,6 @@ import org.springframework.stereotype.Repository;
 public interface StockStatusMapper extends BaseMapper<StockStatus> {
 
     StockStatus getStockStatus(@Param("farmCode") String farmCode);
+
+    StockStatus getStockStatusScreen();
 }

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

@@ -22,4 +22,9 @@
     <select id="getOverList" resultType="com.huimv.cattle.pojo.Overview">
         select * from overview
     </select>
+
+    <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
+</select>
 </mapper>

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

@@ -19,4 +19,9 @@
         select * from  stock
     </select>
 
+    <select id="getListStock" resultType="com.huimv.cattle.pojo.Stock">
+        SELECT SUM(fat_stock) fatStock ,SUM(cow_stock) cowStock ,SUM(bull_stock) bullStock FROM `stock`
+        WHERE farm_code != 0
+    </select>
+
 </mapper>

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

@@ -19,5 +19,9 @@
     <select id="getStockStatus" resultType="com.huimv.cattle.pojo.StockStatus">
         select * from stock_status where farm_code = #{farmCode}
     </select>
+    <select id="getStockStatusScreen" resultType="com.huimv.cattle.pojo.StockStatus">
+        SELECT SUM(breed_stock) breedStock ,SUM(calf_stock) calfStock ,SUM(raise_stock) raiseStock FROM `stock_status`
+        WHERE farm_code != 0
+    </select>
 
 </mapper>

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

@@ -24,5 +24,7 @@ public interface OverviewService extends IService<Overview> {
 
     Result getListOverview(HttpServletRequest httpServletRequest,Map<String, String> paramsMap);
 
+    Result getListOverviewScreen(HttpServletRequest httpServletRequest,Map<String, String> paramsMap);
+
     Integer getOutStock(JSONObject townJo);
 }

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

@@ -25,5 +25,7 @@ public interface StockService extends IService<Stock> {
 
     Result getListStock(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 
+    Result getListStockScreen(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
+
     Result getAllTownStock(HttpServletRequest request, JSONArray allTownsJa);
 }

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

@@ -20,4 +20,6 @@ public interface StockStatusService extends IService<StockStatus> {
     Result getStockStatus(HttpServletRequest request,Map<String, String> paramsMap);
 
     Result saveStockStatus(HttpServletRequest request, Map<String, String> paramsMap);
+
+    Result getStockStatusScreen(HttpServletRequest request, Map<String, String> paramsMap);
 }

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

@@ -131,6 +131,31 @@ public class OverviewServiceImpl extends ServiceImpl<OverviewMapper, Overview> i
         return new Result(ResultCode.SUCCESS,jsonObject);
     }
 
+    public Result getListOverviewScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmCode =paramsMap.get("farmCode");
+        if (farmCode==null) {
+            farmCode = TokenSign.getFarmCode(httpServletRequest);
+        }
+        Overview overview = overviewMapper.getListOverview();
+        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);
+    }
+
     @Override
     public Integer getOutStock(JSONObject townJo) {
         QueryWrapper<Overview> queryWrapper = new QueryWrapper<>();

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

@@ -149,6 +149,43 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         return new Result(ResultCode.SUCCESS, jsonObject);
     }
 
+    @Override
+    public Result getListStockScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmCode = paramsMap.get("farmCode");
+        if (farmCode == null) {
+            farmCode = TokenSign.getFarmCode(httpServletRequest);
+        }
+        JSONObject jsonObject = new JSONObject();
+        Stock stock = stockMapper.getListStock();
+        if (ObjectUtil.isEmpty(stock)) {
+            jsonObject.put("fatStock", 0);
+            jsonObject.put("cowStock", 0);
+            jsonObject.put("bullStock", 0);
+            jsonObject.put("count", 0);
+            jsonObject.put("fat", 0);
+            jsonObject.put("cow", 0);
+            jsonObject.put("bull", 0);
+            jsonObject.put("farmCode", 0);
+        } else {
+            Integer count = stock.getFatStock() + stock.getBullStock() + stock.getCowStock();
+            //创建一个数值格式化对象
+            NumberFormat numberFormat = NumberFormat.getInstance();
+            //设置精确到小数点后2位
+            numberFormat.setMaximumFractionDigits(2);
+            String fat = numberFormat.format((float) stock.getFatStock() / (float) count * 100) + "%";
+            String cow = numberFormat.format((float) stock.getCowStock() / (float) count * 100) + "%";
+            String bull = numberFormat.format((float) stock.getBullStock() / (float) count * 100) + "%";
+            jsonObject.put("fatStock", stock.getFatStock());
+            jsonObject.put("cowStock", stock.getCowStock());
+            jsonObject.put("bullStock", stock.getBullStock());
+            jsonObject.put("count", count);
+            jsonObject.put("fat", fat);
+            jsonObject.put("cow", cow);
+            jsonObject.put("bull", bull);
+        }
+        return new Result(ResultCode.SUCCESS, jsonObject);
+    }
+
     @Resource
     private OverviewService overviewService;
 

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

@@ -3,8 +3,10 @@ package com.huimv.cattle.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.cattle.mapper.StockMapper;
+import com.huimv.cattle.pojo.DataSource;
 import com.huimv.cattle.pojo.StockStatus;
 import com.huimv.cattle.mapper.StockStatusMapper;
+import com.huimv.cattle.service.DataSourceService;
 import com.huimv.cattle.service.StockStatusService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.cattle.token.TokenSign;
@@ -14,6 +16,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
@@ -30,6 +33,8 @@ public class StockStatusServiceImpl extends ServiceImpl<StockStatusMapper, Stock
 
     @Autowired
     private StockStatusMapper stockStatusMapper;
+    @Resource
+    private DataSourceService dataSourceService;
 
     @Override
     public Result getStockStatus(HttpServletRequest request, Map<String, String> paramsMap) {
@@ -76,4 +81,28 @@ public class StockStatusServiceImpl extends ServiceImpl<StockStatusMapper, Stock
         }
         return new Result(ResultCode.SUCCESS);
     }
+
+    @Override
+    public Result getStockStatusScreen(HttpServletRequest request, Map<String, String> paramsMap) {
+        String farmCode = paramsMap.get("farmCode");
+        if (StringUtils.isBlank(farmCode)){
+            farmCode = TokenSign.getFarmCode(request);
+        }
+        DataSource dataSource = dataSourceService.getDataSourceStatus();
+        StockStatus stockStatus = new StockStatus();
+        if (dataSource.getDsStatus() == 1 && dataSource.getViewType() ==2) {
+            stockStatus = stockStatusMapper.getStockStatusScreen();
+        }else{
+            stockStatus = stockStatusMapper.getStockStatus(farmCode);
+            if (ObjectUtil.isEmpty(stockStatus)){
+                stockStatus = new StockStatus();
+                stockStatus.setBreedStock(0);
+                stockStatus.setCalfStock(0);
+                stockStatus.setRaiseStock(0);
+                stockStatus.setFarmCode(farmCode);
+                stockStatusMapper.insert(stockStatus);
+            }
+        }
+        return new Result(ResultCode.SUCCESS,stockStatus);
+    }
 }