添加farmCode验证

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

@@ -38,13 +38,6 @@ public class InsureController {
     @PostMapping("/saveInsure")
     public Result add(@RequestBody Insure insure , HttpServletRequest request){
         String farmCode = FarmCodeUtils.getFarmCode(insure.getFarmCode(), request);
-//        List<Insure> insureList = insureVo.getInsureList();
-//        insureService.remove(new QueryWrapper<Insure>().eq("farm_code",farmCode));
-//        System.out.println(farmCode);
-//        for (Insure insure : insureList) {
-//            insure.setFarmCode(farmCode);
-//            insureService.save(insure);
-//        }
         insure.setFarmCode(farmCode);
         insureService.save(insure);
         return new Result(10000,"添加成功",true);

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

@@ -2,20 +2,31 @@ package com.huimv.cattle.controller;
 
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.cattle.pojo.DataSource;
 import com.huimv.cattle.pojo.PreventDetection;
 import com.huimv.cattle.pojo.SalesCattle;
 import com.huimv.cattle.pojo.vo.SalesCattleVo;
+import com.huimv.cattle.service.DataSourceService;
 import com.huimv.cattle.service.SalesCattleService;
 import com.huimv.cattle.utils.FarmCodeUtils;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -33,6 +44,10 @@ import java.util.Map;
 public class SalesCattleController {
     @Autowired
     private SalesCattleService salesCattleService;
+    @Resource
+    private DataSourceService dataSourceService;
+    @Resource
+    private RestTemplate restTemplate;
 
     @Transactional
     @PostMapping("/saveSalesCattle")
@@ -62,13 +77,48 @@ public class SalesCattleController {
         return new Result(10000,"删除成功",true);
     }
     @PostMapping("/getSalesCattle")
-    public  Result list(@RequestBody SalesCattle salesCattle,HttpServletRequest request){
-        String farmCode = FarmCodeUtils.getFarmCode(salesCattle.getFarmCode(), request);
-        List<SalesCattle> list = salesCattleService.list(new QueryWrapper<SalesCattle>().eq("farm_code",farmCode).orderByDesc("year").orderByDesc("quarter"));
-        if (ObjectUtil.isEmpty(list)){
-            return new Result(ResultCode.SUCCESS,new ArrayList<>());
+    public  Result list(@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.getSalesCattle(farmCode);
+        } else {
+            //view=2,显示镇汇总数据
+            if (dataSource.getDsStatus() == 1) {
+                //status=1,显示镇汇总（手填）数据
+                return   salesCattleService.getSalesCattle(farmCode);
+            } else {
+                //status=2,显示镇汇总（养殖云）数据
+                System.out.println("status=2,显示镇汇总（养殖云）数据");
+                return getSalesByDivision(farmCode);
+
+            }
+        }
+    }
+
+    private Result getSalesByDivision(String  farmCode) {
+        HttpHeaders httpHeaders = new HttpHeaders();
+        MediaType type = MediaType.parseMediaType("application/json;charset=UTF-8");
+        httpHeaders.setContentType(type);
+        HashMap<String, Object> map = new HashMap<>();
+        //这里提交的是区县编码或乡镇编码
+        map.put("farmCode", farmCode);
+        HttpEntity<Map<String, Object>> objectHttpEntity = new HttpEntity<>(map, httpHeaders);
+        //读取真实数据
+        String remoteUrl = "http://123.60.134.84:10001/breed/api/v1.0.0/cattle/getSalesByDivision";
+        ResponseEntity<String> entity = restTemplate.postForEntity(remoteUrl, objectHttpEntity, String.class);
+        if(entity.getStatusCode().toString().contains("200")){
+            String body = entity.getBody();
+            System.out.println(body);
+            JSONObject dataJo = JSON.parseObject(body).getJSONObject("data");
+            System.out.println("dataJo="+dataJo);
+            //, )
+            return new Result(ResultCode.SUCCESS,dataJo);
+        }else{
+            return new Result(ResultCode.FAIL,"调取远程数据出错.");
         }
-        return new Result(ResultCode.SUCCESS,list);
     }
 }
 

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

@@ -2,6 +2,7 @@ package com.huimv.cattle.service;
 
 import com.huimv.cattle.pojo.SalesCattle;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.common.utils.Result;
 
 /**
  * <p>
@@ -13,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface SalesCattleService extends IService<SalesCattle> {
 
+    Result getSalesCattle(String farmCode);
 }

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

@@ -1,11 +1,19 @@
 package com.huimv.cattle.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.cattle.pojo.SalesCattle;
 import com.huimv.cattle.mapper.SalesCattleMapper;
 import com.huimv.cattle.service.SalesCattleService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -16,5 +24,15 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SalesCattleServiceImpl extends ServiceImpl<SalesCattleMapper, SalesCattle> implements SalesCattleService {
+    @Autowired
+    private SalesCattleMapper salesCattleMapper;
 
+    @Override
+    public Result getSalesCattle(String farmCode) {
+        List<SalesCattle> list = salesCattleMapper.selectList(new QueryWrapper<SalesCattle>().eq("farm_code",farmCode).orderByDesc("year").orderByDesc("quarter"));
+        if (ObjectUtil.isEmpty(list)){
+            return new Result(ResultCode.SUCCESS,new ArrayList<>());
+        }
+        return new Result(ResultCode.SUCCESS,list);
+    }
 }

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

@@ -162,6 +162,10 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         }else {
              farmCode = TokenSign.getFarmCode(request);
         }
+        String accountClass = paramsMap.get("accountClass");
+        if ("1".equals(accountClass)){
+            farmCode = "0";
+        }
         System.out.println(farmCode);
         //查询判断是否有重名存在
         QueryWrapper<SysUserAccount> queryWrapperUserAccount = new QueryWrapper<>();