存栏

huimv-cattle/src/main/java/com/huimv/cattle/config/CorsConfig.java

@@ -1,23 +1,29 @@
-//package com.huimv.cattle.config;
-//
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.web.cors.CorsConfiguration;
-//import org.springframework.web.cors.reactive.CorsWebFilter;
-//import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource;
-//import org.springframework.web.util.pattern.PathPatternParser;
-//
-//@Configuration
-//public class CorsConfig {
-//    @Bean
-//    public CorsWebFilter corsFilter() {
-//        CorsConfiguration config = new CorsConfiguration();
-//        config.addAllowedMethod("*");
-//        config.addAllowedOrigin("*");
-//        config.addAllowedHeader("*");
-//        config.setMaxAge(18000L);// 预检请求的缓存时间（秒），即在这个时间内，对于相同的跨域请求不会再预检了
-//        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(new PathPatternParser());
-//        source.registerCorsConfiguration("/**", config);
-//        return new CorsWebFilter(source);
-//    }
-//}
+/*
+package com.huimv.cattle.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.reactive.CorsWebFilter;
+import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource;
+import org.springframework.web.util.pattern.PathPatternParser;
+
+@Configuration
+public class CorsConfig {
+
+*/
+/*
+    @Bean
+    public CorsWebFilter corsFilter() {
+        CorsConfiguration config = new CorsConfiguration();
+        config.addAllowedMethod("*");
+        config.addAllowedOrigin("*");
+        config.addAllowedHeader("*");
+        config.setMaxAge(18000L);// 预检请求的缓存时间（秒），即在这个时间内，对于相同的跨域请求不会再预检了
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(new PathPatternParser());
+        source.registerCorsConfiguration("/**", config);
+        return new CorsWebFilter(source);
+    }*//*
+
+}
+*/

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

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -28,13 +29,13 @@ public class OverviewController {
     private OverviewService overviewService;
 
     @PostMapping("/getOverview")
-    public Result getOverView(@RequestBody Map<String,String> paramsMap) {
-        return overviewService.overList(paramsMap);
+    public Result getOverView(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        return overviewService.overList(httpServletRequest,paramsMap);
     }
 
     @PostMapping("/saveOverview")
-    public Result saveOverView(@RequestBody Map<String,String> paramsMap) {
-        return overviewService.add(paramsMap);
+    public Result saveOverView(HttpServletRequest httpServletRequest,@RequestBody Map<String,String> paramsMap) {
+        return overviewService.add(httpServletRequest,paramsMap);
     }
 
     @PostMapping("/deleteSaveOverview")

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

@@ -5,11 +5,7 @@ import com.huimv.cattle.service.StockService;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
@@ -22,19 +18,21 @@ import java.util.Map;
  * @author zn
  * @since 2022-12-14
  */
+@CrossOrigin
 @RestController
 @RequestMapping("/v1.0.0/all")
 public class StockController {
     @Autowired
     private StockService stockService;
+
     @PostMapping("/getStock")
-    public Result list(@RequestBody Map<String,String> paramsMap) {
-        return stockService.getStock(paramsMap);
+    public Result list(HttpServletRequest httpServletRequest,@RequestBody Map<String,String> paramsMap) {
+        return stockService.getStock(httpServletRequest,paramsMap);
     }
 
     @PostMapping("/saveStock")
-    public Result saveStock(@RequestBody Map<String,String> paramsMap) {
-        return stockService.add(paramsMap);
+    public Result saveStock(HttpServletRequest httpServletRequest,@RequestBody Map<String,String> paramsMap) {
+        return stockService.add(httpServletRequest,paramsMap);
     }
 
     @PostMapping("/deleteSaveStock")

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

@@ -13,7 +13,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, fat_stock, cow_stock, bull_stock
+        id, fat_stock, cow_stock, bull_stock,farm_code
     </sql>
     <select id="getList" resultType="com.huimv.cattle.pojo.Stock">
         select * from  stock

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

@@ -12,11 +12,12 @@
         <result column="address" property="address" />
         <result column="farm_status" property="farmStatus" />
         <result column="remark" property="remark" />
+        <result column="adcode" property="adCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, farm_name, farm_code, linkman, phone, address, farm_status, remark
+        id, farm_name, farm_code, linkman, phone, address, farm_status, remark,adcode
     </sql>
 
 </mapper>

huimv-cattle/src/main/java/com/huimv/cattle/pojo/SysFarm.java

@@ -38,4 +38,7 @@ public class SysFarm implements Serializable {
 
     private String remark;
 
+    private String adcode;
+
+
 }

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

@@ -4,6 +4,7 @@ import com.huimv.cattle.pojo.Overview;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.common.utils.Result;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -16,7 +17,7 @@ import java.util.Map;
  */
 public interface OverviewService extends IService<Overview> {
 
-    Result overList(Map<String,String> paramsMap);
+    Result overList(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 
-    Result add(Map<String,String> paramsMap);
+    Result add(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 }

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

@@ -17,7 +17,7 @@ import java.util.Map;
  * @since 2022-12-14
  */
 public interface StockService extends IService<Stock> {
-    Result getStock(Map<String,String> paramsMap);
+    Result getStock(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 
-    Result add(Map<String,String> paramsMap);
+    Result add(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 }

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

@@ -2,8 +2,10 @@ 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.pojo.Overview;
 import com.huimv.cattle.mapper.OverviewMapper;
+import com.huimv.cattle.pojo.Stock;
 import com.huimv.cattle.service.OverviewService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.common.utils.Result;
@@ -11,6 +13,7 @@ import com.huimv.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.Map;
 
@@ -28,7 +31,13 @@ public class OverviewServiceImpl extends ServiceImpl<OverviewMapper, Overview> i
     @Autowired
     private OverviewMapper overviewMapper;
     @Override
-    public Result overList(Map<String, String> paramsMap) {
+    public Result overList(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmCode =paramsMap.get("farmCode");
+        if (farmCode==null) {
+            farmCode = httpServletRequest.getHeader("farmCode");
+        }
+        QueryWrapper<Stock> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_code", farmCode);
         Overview overview = overviewMapper.getOverList();
         JSONObject jsonObject = new JSONObject();
         if (ObjectUtil.isEmpty(overview)) {
@@ -50,7 +59,7 @@ public class OverviewServiceImpl extends ServiceImpl<OverviewMapper, Overview> i
     }
 
     @Override
-    public Result add(Map<String, String> paramsMap) {
+    public Result add(HttpServletRequest httpServletRequest,Map<String, String> paramsMap) {
         Overview overList = overviewMapper.getOverList();
         if (ObjectUtil.isEmpty(overList)) {
             Overview overview = new Overview();

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

@@ -2,16 +2,19 @@ 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.pojo.Stock;
 import com.huimv.cattle.mapper.StockMapper;
 import com.huimv.cattle.service.StockService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.cattle.token.TokenSign;
 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 javax.servlet.http.HttpServletRequest;
 import java.text.NumberFormat;
 import java.util.Map;
 
@@ -27,10 +30,17 @@ import java.util.Map;
 public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements StockService {
 
     @Autowired
-    StockMapper stockMapper;
+    private StockMapper stockMapper;
     @Override
-    public Result getStock(Map<String, String> paramsMap) {
-        Stock stock = stockMapper.getList();
+    public Result getStock(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+      //  Stock stock = stockMapper.getList();
+        String farmCode =paramsMap.get("farmCode");
+        if (farmCode==null) {
+            farmCode = httpServletRequest.getHeader("farmCode");
+        }
+        QueryWrapper<Stock> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_code", farmCode);
+        Stock stock = stockMapper.selectOne(queryWrapper);
         JSONObject jsonObject = new JSONObject();
         if (ObjectUtil.isEmpty(stock)) {
             jsonObject.put("fatStock", 0);
@@ -40,6 +50,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
             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();
             //创建一个数值格式化对象
@@ -56,28 +67,38 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
             jsonObject.put("fat", fat);
             jsonObject.put("cow", cow);
             jsonObject.put("bull", bull);
+            jsonObject.put("farmCode", stock.getFarmCode());
         }
         return new Result(ResultCode.SUCCESS,jsonObject);
     }
 
     @Override
-    public Result add(Map<String, String> paramsMap) {
+    public Result add(HttpServletRequest httpServletRequest,Map<String, String> paramsMap) {
+        String farmCode =paramsMap.get("farmCode");
+        if (farmCode==null) {
+            farmCode = TokenSign.getFarmCode(httpServletRequest);
+        }
+        QueryWrapper<Stock> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_code", farmCode);
+        Stock stock1 = stockMapper.selectOne(queryWrapper);
         Integer fatStock = Integer.parseInt(paramsMap.get("fatStock"));
         Integer cowStock = Integer.parseInt(paramsMap.get("cowStock"));
         Integer bullStock = Integer.parseInt(paramsMap.get("bullStock"));
-        Stock list = stockMapper.getList();
-        if (ObjectUtil.isEmpty(list)) {
+       // Stock list = stockMapper.getList();
+        if (ObjectUtil.isEmpty(stock1)) {
             Stock stock = new Stock();
             stock.setFatStock(fatStock);
             stock.setCowStock(cowStock);
             stock.setBullStock(bullStock);
+            stock.setFarmCode(farmCode);
             stockMapper.insert(stock);
             return new Result(ResultCode.SUCCESS);
         } else {
-            list.setFatStock(fatStock);
-            list.setCowStock(cowStock);
-            list.setBullStock(bullStock);
-            stockMapper.updateById(list);
+            stock1.setFatStock(fatStock);
+            stock1.setCowStock(cowStock);
+            stock1.setBullStock(bullStock);
+            stock1.setFarmCode(farmCode);
+            stockMapper.updateById(stock1);
             return new Result(ResultCode.SUCCESS);
         }
     }

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

@@ -98,6 +98,7 @@ public class SysFarmServiceImpl extends ServiceImpl<SysFarmMapper, SysFarm> impl
         sysFarm.setAddress(paramsMap.get("address"));
         sysFarm.setFarmStatus(Integer.parseInt(farmStatus));
         sysFarm.setRemark(paramsMap.get("remark"));
+        sysFarm.setAdcode(paramsMap.get("adCode"));
         return resultUtil.getResult(sysFarmMapper.insert(sysFarm));
     }
 
@@ -117,6 +118,7 @@ public class SysFarmServiceImpl extends ServiceImpl<SysFarmMapper, SysFarm> impl
         sysFarm.setAddress(paramsMap.get("address"));
         sysFarm.setFarmStatus(Integer.parseInt(farmStatus));
         sysFarm.setRemark(paramsMap.get("remark"));
+        sysFarm.setAdcode(paramsMap.get("adCode"));
         return resultUtil.getResult(sysFarmMapper.updateById(sysFarm));
     }
 

huimv-cattle/src/main/java/com/huimv/cattle/token/TokenSign.java

@@ -90,6 +90,7 @@ public class TokenSign {
         if (StringUtils.isBlank(jwtToken)) {
             return null;
         }
+        System.out.println(jwtToken);
         Claims claims = getClaims(jwtToken);
         return (String) claims.get("farmCode");
     }