修改镇汇总

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

@@ -29,6 +29,10 @@ public class IndustryOutputController {
     public Result getIndustryOutput(HttpServletRequest request, @RequestBody Map<String,String> paramsMap){
         return industryOutputService.getIndustryOutput(request,paramsMap);
     }
+    @PostMapping("/getIndustryOutputScreen")
+    public Result getIndustryOutputScreen(HttpServletRequest request, @RequestBody Map<String,String> paramsMap){
+        return industryOutputService.getIndustryOutputScreen(request,paramsMap);
+    }
 
     @PostMapping("/saveIndustryOutput")
     public Result saveIndustryOutput(HttpServletRequest request,@RequestBody Map<String,String> paramsMap){

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

@@ -28,6 +28,10 @@ public class OnlineServiceController {
     public Result getOnlineService(HttpServletRequest request, @RequestBody Map<String, String> paramsMap){
         return onlineServiceService.getOnlineService(request,paramsMap);
     }
+    @PostMapping("/getOnlineServiceScreen")
+    public Result getOnlineServiceScreen(HttpServletRequest request, @RequestBody Map<String, String> paramsMap){
+        return onlineServiceService.getOnlineServiceScreen(request,paramsMap);
+    }
 
     @PostMapping("/saveOnlineService")
     public Result saveOnlineService(HttpServletRequest request, @RequestBody Map<String, String> paramsMap){

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

@@ -107,6 +107,31 @@ public class SalesCattleController {
         }
     }
 
+    @PostMapping("/getSalesCattleScreen")
+    public  Result getSalesCattleScreen(@RequestBody Map<String,String> paramsMap,HttpServletRequest request){
+        String farmCode = FarmCodeUtils.getFarmCode(paramsMap.get("farmCode"), request);
+        //        //读取模式切换
+        DataSource dataSource = dataSourceService.getDataSourceStatus();
+        if (dataSource.getViewType() == 1) {
+            //view=1,显示县填写数据
+            return   salesCattleService.getAllSaleCattle(farmCode);
+        } else {
+            //view=2,显示镇汇总数据
+            if (dataSource.getDsStatus() == 1) {
+                //status=1,显示镇汇总（手填）数据
+                return   salesCattleService.getSalesCattleScreen();
+            } else {
+                //status=2,显示镇汇总（养殖云）数据
+                System.out.println("status=2,显示镇汇总（养殖云）数据");
+                String farmCodes =   getFarmCodeByAdcode(farmCode);
+                if (StringUtils.isBlank(farmCodes)){
+                    return new Result(ResultCode.SUCCESS,new ArrayList<>());
+                }
+                return getSalesByDivision(farmCodes);
+            }
+        }
+    }
+
     private String getFarmCodeByAdcode(String farmCode) {
         String adcode  = "620826";
         if (!"0".equals(farmCode)){

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

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * <p>
@@ -19,4 +20,6 @@ import java.math.BigDecimal;
 public interface IndustryOutputMapper extends BaseMapper<IndustryOutput> {
 
     void deleteAll(@Param("farmCode") String farmCode);
+
+    List<IndustryOutput> getIndustryOutputScreen();
 }

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

@@ -2,6 +2,7 @@ package com.huimv.cattle.mapper;
 
 import com.huimv.cattle.pojo.OnlineService;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.cattle.service.OnlineServiceService;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -17,4 +18,6 @@ import org.springframework.stereotype.Repository;
 public interface OnlineServiceMapper extends BaseMapper<OnlineService> {
 
     OnlineService getOnlineService(@Param("farmCode") String farmCode);
+
+    OnlineService getOnlineServiceScreen();
 }

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

@@ -18,4 +18,8 @@
     <delete id="deleteAll">
         delete from industry_output where farm_code = #{farmCode}
     </delete>
+    <select id="getIndustryOutputScreen" resultType="com.huimv.cattle.pojo.IndustryOutput">
+
+        SELECT SUM(sales_money)  salesMoney, `year`, farm_code FROM  `industry_output`  WHERE farm_code !=0  GROUP BY `year`
+    </select>
 </mapper>

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

@@ -19,5 +19,8 @@
     <select id="getOnlineService" resultType="com.huimv.cattle.pojo.OnlineService">
         select * from online_service where farm_code = #{farmCode}
     </select>
+    <select id="getOnlineServiceScreen" resultType="com.huimv.cattle.pojo.OnlineService">
+        SELECT SUM(doctor_count)  doctorCount ,SUM(treat_count) treatCount,SUM(farmer_count) farmerCount  , farm_code FROM `online_service` WHERE farm_code != 0
+    </select>
 
 </mapper>

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

@@ -20,4 +20,6 @@ public interface IndustryOutputService extends IService<IndustryOutput> {
     Result getIndustryOutput(HttpServletRequest request, Map<String, String> paramsMap);
 
     Result saveIndustryOutput(HttpServletRequest request, Map<String, String> paramsMap);
+
+    Result getIndustryOutputScreen(HttpServletRequest request, Map<String, String> paramsMap);
 }

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

@@ -20,4 +20,6 @@ public interface OnlineServiceService extends IService<OnlineService> {
     Result getOnlineService(HttpServletRequest request, Map<String, String> paramsMap);
 
     Result saveOnlineService(HttpServletRequest request, Map<String, String> paramsMap);
+
+    Result getOnlineServiceScreen(HttpServletRequest request, Map<String, String> paramsMap);
 }

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

@@ -17,4 +17,6 @@ public interface SalesCattleService extends IService<SalesCattle> {
     Result getSalesCattle(String farmCode);
 
     Result getAllSaleCattle(String farmCode);
+
+    Result getSalesCattleScreen();
 }

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

@@ -4,9 +4,12 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.cattle.pojo.DataSource;
 import com.huimv.cattle.pojo.IndustryOutput;
 import com.huimv.cattle.mapper.IndustryOutputMapper;
+import com.huimv.cattle.pojo.OnlineService;
 import com.huimv.cattle.pojo.SubsidyCount;
+import com.huimv.cattle.service.DataSourceService;
 import com.huimv.cattle.service.IndustryOutputService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.cattle.token.TokenSign;
@@ -17,6 +20,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.*;
 
@@ -32,7 +36,8 @@ import java.util.*;
 public class IndustryOutputServiceImpl extends ServiceImpl<IndustryOutputMapper, IndustryOutput> implements IndustryOutputService {
     @Autowired
     private IndustryOutputMapper industryOutputMapper;
-
+    @Resource
+    private DataSourceService dataSourceService;
     @Autowired
     private DateUtil dateUtil;
 
@@ -67,6 +72,7 @@ public class IndustryOutputServiceImpl extends ServiceImpl<IndustryOutputMapper,
 
     @Override
     public Result saveIndustryOutput(HttpServletRequest request, Map<String, String> paramsMap) {
+
         String farmCode = paramsMap.get("farmCode");
         if (StringUtils.isBlank(farmCode)) {
             farmCode = TokenSign.getFarmCode(request);
@@ -90,6 +96,41 @@ public class IndustryOutputServiceImpl extends ServiceImpl<IndustryOutputMapper,
         return new Result(ResultCode.SUCCESS);
     }
 
+    @Override
+    public Result getIndustryOutputScreen(HttpServletRequest request, Map<String, String> paramsMap) {
+        DataSource dataSource = dataSourceService.getDataSourceStatus();
+        if (dataSource.getDsStatus() == 1 && dataSource.getViewType() ==2) {
+            List<IndustryOutput> industryOutputs =  industryOutputMapper.getIndustryOutputScreen();
+            return new Result(ResultCode.SUCCESS,industryOutputs);
+        }
+
+        String farmCode = paramsMap.get("farmCode");
+        if (StringUtils.isBlank(farmCode)) {
+            farmCode = TokenSign.getFarmCode(request);
+        }
+        String yearNum = paramsMap.get("yearNum");
+//        if (StringUtils.isBlank(yearNum)){
+//            yearNum = "0";
+//        }
+        QueryWrapper<IndustryOutput> queryWrapper = new QueryWrapper<IndustryOutput>();
+        if (StringUtils.isNotBlank(yearNum)) {
+            queryWrapper.between("year", Integer.valueOf(dateUtil.getThisYear()) - Integer.valueOf(yearNum), Integer.valueOf(dateUtil.getThisYear()));
+            //        queryWrapper.last("LIMIT "+yearNum);
+        }
+        queryWrapper.eq("farm_code", farmCode);
+        queryWrapper.orderByDesc("year");
+
+        List<IndustryOutput> industryOutputs = industryOutputMapper.selectList(queryWrapper);
+        if (industryOutputs.isEmpty()) {
+            IndustryOutput industryOutput = new IndustryOutput();
+            industryOutput.setYear(dateUtil.getThisYear());
+            industryOutput.setFarmCode(farmCode);
+            industryOutputMapper.insert(industryOutput);
+            industryOutputs.add(industryOutput);
+        }
+        return new Result(ResultCode.SUCCESS, industryOutputs);
+    }
+
     private Boolean checkRepeat(List<IndustryOutput> list) {
         List<String> collectionOptionList = new ArrayList<>();
         for (IndustryOutput a : list) {

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

@@ -1,8 +1,10 @@
 package com.huimv.cattle.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.huimv.cattle.pojo.DataSource;
 import com.huimv.cattle.pojo.OnlineService;
 import com.huimv.cattle.mapper.OnlineServiceMapper;
+import com.huimv.cattle.service.DataSourceService;
 import com.huimv.cattle.service.OnlineServiceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.cattle.token.TokenSign;
@@ -12,6 +14,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;
 
@@ -27,6 +30,30 @@ import java.util.Map;
 public class OnlineServiceServiceImpl extends ServiceImpl<OnlineServiceMapper, OnlineService> implements OnlineServiceService {
     @Autowired
     private OnlineServiceMapper onlineServiceMapper;
+    @Resource
+    private DataSourceService dataSourceService;
+    @Override
+    public Result getOnlineServiceScreen(HttpServletRequest request, Map<String, String> paramsMap) {
+        DataSource dataSource = dataSourceService.getDataSourceStatus();
+        if (dataSource.getDsStatus() == 1 && dataSource.getViewType() ==2) {
+           OnlineService   onlineService =  onlineServiceMapper.getOnlineServiceScreen();
+            return new Result(ResultCode.SUCCESS,onlineService);
+        }
+        String farmCode = paramsMap.get("farmCode");
+        if (StringUtils.isBlank(farmCode)){
+            farmCode = TokenSign.getFarmCode(request);
+        }
+        OnlineService onlineService = onlineServiceMapper.getOnlineService(farmCode);
+        if (ObjectUtil.isEmpty(onlineService)){
+            onlineService = new OnlineService();
+            onlineService.setTreatCount(0);
+            onlineService.setDoctorCount(0);
+            onlineService.setFarmerCount(0);
+            onlineService.setFarmCode(farmCode);
+            onlineServiceMapper.insert(onlineService);
+        }
+        return new Result(ResultCode.SUCCESS,onlineService);
+    }
 
     @Override
     public Result getOnlineService(HttpServletRequest request, Map<String, String> paramsMap) {

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

@@ -48,4 +48,13 @@ public class SalesCattleServiceImpl extends ServiceImpl<SalesCattleMapper, Sales
         }
         return new Result(ResultCode.SUCCESS,list);
     }
+    @Override
+    public Result getSalesCattleScreen() {
+        QueryWrapper<SalesCattle> wrapper = new QueryWrapper<SalesCattle>().ne("farm_code",0).orderByDesc("year").orderByDesc("quarter").groupBy("year ").groupBy("quarter");
+        List<SalesCattle> list = salesCattleMapper.geaAllSaleCattle(wrapper);
+        if (ObjectUtil.isEmpty(list)){
+            return new Result(ResultCode.SUCCESS,new ArrayList<>());
+        }
+        return new Result(ResultCode.SUCCESS,list);
+    }
 }