修改在线服务 产业产值

huimv-cattle/src/main/java/com/huimv/cattle/controller/IndustryOutputController.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 IndustryOutputController {
     private IndustryOutputService industryOutputService;
 
     @PostMapping("/getIndustryOutput")
-    public Result getIndustryOutput(@RequestBody Map<String,String> paramsMap){
-        return industryOutputService.getIndustryOutput(paramsMap);
+    public Result getIndustryOutput(HttpServletRequest request, @RequestBody Map<String,String> paramsMap){
+        return industryOutputService.getIndustryOutput(request,paramsMap);
     }
 
     @PostMapping("/saveIndustryOutput")
-    public Result saveIndustryOutput(@RequestBody Map<String,String> paramsMap){
-        return industryOutputService.saveIndustryOutput(paramsMap);
+    public Result saveIndustryOutput(HttpServletRequest request,@RequestBody Map<String,String> paramsMap){
+        return industryOutputService.saveIndustryOutput(request,paramsMap);
     }
 
 }

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

@@ -6,6 +6,9 @@ import com.huimv.common.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  *  前端控制器
@@ -21,13 +24,13 @@ public class OnlineServiceController {
     private OnlineServiceService onlineServiceService;
 
     @PostMapping("/getOnlineService")
-    public Result getOnlineService(){
-        return onlineServiceService.getOnlineService();
+    public Result getOnlineService(HttpServletRequest request, @RequestBody Map<String, String> paramsMap){
+        return onlineServiceService.getOnlineService(request,paramsMap);
     }
 
     @PostMapping("/saveOnlineService")
-    public Result saveOnlineService(@RequestBody OnlineService onlineService){
-        return onlineServiceService.saveOnlineService(onlineService);
+    public Result saveOnlineService(HttpServletRequest request, @RequestBody Map<String, String> paramsMap){
+        return onlineServiceService.saveOnlineService(request,paramsMap);
     }
 }
 

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

@@ -18,5 +18,5 @@ import java.math.BigDecimal;
 @Repository
 public interface IndustryOutputMapper extends BaseMapper<IndustryOutput> {
 
-    void deleteAll();
+    void deleteAll(@Param("farmCode") String farmCode);
 }

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 org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -15,5 +16,5 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface OnlineServiceMapper extends BaseMapper<OnlineService> {
 
-    OnlineService getOnlineService();
+    OnlineService getOnlineService(@Param("farmCode") String farmCode);
 }

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

@@ -16,6 +16,6 @@
     </sql>
 
     <delete id="deleteAll">
-        delete from industry_output
+        delete from industry_output where farm_code = #{farmCode}
     </delete>
 </mapper>

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

@@ -17,7 +17,7 @@
     </sql>
 
     <select id="getOnlineService" resultType="com.huimv.cattle.pojo.OnlineService">
-        select * from online_service
+        select * from online_service where farm_code = #{farmCode}
     </select>
 
 </mapper>

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

@@ -4,6 +4,7 @@ import com.huimv.cattle.pojo.IndustryOutput;
 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 IndustryOutputService extends IService<IndustryOutput> {
 
-    Result getIndustryOutput(Map<String, String> paramsMap);
+    Result getIndustryOutput(HttpServletRequest request, Map<String, String> paramsMap);
 
-    Result saveIndustryOutput(Map<String, String> paramsMap);
+    Result saveIndustryOutput(HttpServletRequest request, Map<String, String> paramsMap);
 }

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

@@ -4,6 +4,9 @@ import com.huimv.cattle.pojo.OnlineService;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.common.utils.Result;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -14,7 +17,7 @@ import com.huimv.common.utils.Result;
  */
 public interface OnlineServiceService extends IService<OnlineService> {
 
-    Result getOnlineService();
+    Result getOnlineService(HttpServletRequest request, Map<String, String> paramsMap);
 
-    Result saveOnlineService(OnlineService onlineService);
+    Result saveOnlineService(HttpServletRequest request, Map<String, String> paramsMap);
 }

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

@@ -8,6 +8,7 @@ import com.huimv.cattle.pojo.IndustryOutput;
 import com.huimv.cattle.mapper.IndustryOutputMapper;
 import com.huimv.cattle.service.IndustryOutputService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.cattle.token.TokenSign;
 import com.huimv.cattle.utils.DateUtil;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
@@ -15,6 +16,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -35,17 +37,23 @@ public class IndustryOutputServiceImpl extends ServiceImpl<IndustryOutputMapper,
     private DateUtil dateUtil;
 
     @Override
-    public Result getIndustryOutput(Map<String, String> paramsMap) {
+    public Result getIndustryOutput(HttpServletRequest request, Map<String, String> paramsMap) {
+        String farmCode = paramsMap.get("farmCode");
+        if (StringUtils.isBlank(farmCode)){
+            farmCode = TokenSign.getFarmCode(request);
+        }
         String yearNum = paramsMap.get("yearNum");
         if (StringUtils.isBlank(yearNum)){
             yearNum = "0";
         }
         List<IndustryOutput> industryOutputs = industryOutputMapper.selectList(new QueryWrapper<IndustryOutput>()
                 .between("year", Integer.valueOf(dateUtil.getThisYear()) - Integer.valueOf(yearNum), Integer.valueOf(dateUtil.getThisYear()))
+                .eq("farm_code",farmCode)
                 .orderByDesc("year"));
         if (industryOutputs.isEmpty()) {
             IndustryOutput industryOutput = new IndustryOutput();
             industryOutput.setYear(Integer.valueOf(dateUtil.getThisYear()));
+            industryOutput.setFarmCode(farmCode);
             industryOutputMapper.insert(industryOutput);
             industryOutputs.add(industryOutput);
         }
@@ -53,8 +61,12 @@ public class IndustryOutputServiceImpl extends ServiceImpl<IndustryOutputMapper,
     }
 
     @Override
-    public Result saveIndustryOutput(Map<String, String> paramsMap) {
-        industryOutputMapper.deleteAll();
+    public Result saveIndustryOutput(HttpServletRequest request,Map<String, String> paramsMap) {
+        String farmCode = paramsMap.get("farmCode");
+        if (StringUtils.isBlank(farmCode)){
+            farmCode = TokenSign.getFarmCode(request);
+        }
+        industryOutputMapper.deleteAll(farmCode);
         String list = paramsMap.get("list");
         JSONArray listJa = JSONArray.parseArray(list);
         for (int a = listJa.size()-1; a >= 0 ; a--){
@@ -62,6 +74,7 @@ public class IndustryOutputServiceImpl extends ServiceImpl<IndustryOutputMapper,
             IndustryOutput industryOutput = new IndustryOutput();
             industryOutput.setYear(jsonObject.getInteger("year"));
             industryOutput.setSalesMoney(jsonObject.getBigDecimal("salesMoney"));
+            industryOutput.setFarmCode(farmCode);
             industryOutputMapper.insert(industryOutput);
         }
         return new Result(ResultCode.SUCCESS);

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

@@ -5,11 +5,16 @@ import com.huimv.cattle.pojo.OnlineService;
 import com.huimv.cattle.mapper.OnlineServiceMapper;
 import com.huimv.cattle.service.OnlineServiceService;
 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.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -24,27 +29,46 @@ public class OnlineServiceServiceImpl extends ServiceImpl<OnlineServiceMapper, O
     private OnlineServiceMapper onlineServiceMapper;
 
     @Override
-    public Result getOnlineService() {
-        OnlineService onlineService = onlineServiceMapper.getOnlineService();
+    public Result getOnlineService(HttpServletRequest request, Map<String, String> paramsMap) {
+        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 saveOnlineService(OnlineService onlineService) {
-        if (ObjectUtil.isEmpty(onlineServiceMapper.selectById(onlineService))){
-            OnlineService onlineService1 = new OnlineService();
-            onlineService1.setTreatCount(onlineService.getTreatCount());
-            onlineService1.setFarmerCount(onlineService.getFarmerCount());
-            onlineService1.setDoctorCount(onlineService.getDoctorCount());
+    public Result saveOnlineService(HttpServletRequest request, Map<String, String> paramsMap) {
+        String farmCode = paramsMap.get("farmCode");
+        if (StringUtils.isBlank(farmCode)){
+            farmCode = TokenSign.getFarmCode(request);
+        }
+        String treatCount = paramsMap.get("treatCount");
+        String farmerCount = paramsMap.get("farmerCount");
+        String doctorCount = paramsMap.get("doctorCount");
+        OnlineService onlineService1 = new OnlineService();
+        onlineService1.setTreatCount(Integer.valueOf(treatCount));
+        onlineService1.setFarmerCount(Integer.valueOf(farmerCount));
+        onlineService1.setDoctorCount(Integer.valueOf(doctorCount));
+        onlineService1.setFarmCode(farmCode);
+
+        OnlineService onlineService = onlineServiceMapper.getOnlineService(farmCode);
+        if (ObjectUtil.isEmpty(onlineService)){
             onlineServiceMapper.insert(onlineService1);
         }else {
+            onlineService.setTreatCount(Integer.valueOf(treatCount));
+            onlineService.setFarmerCount(Integer.valueOf(farmerCount));
+            onlineService.setDoctorCount(Integer.valueOf(doctorCount));
+            onlineService.setFarmCode(farmCode);
             onlineServiceMapper.updateById(onlineService);
         }
         return new Result(ResultCode.SUCCESS);

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

@@ -7,6 +7,7 @@ import com.huimv.cattle.pojo.StockStatus;
 import com.huimv.cattle.mapper.StockStatusMapper;
 import com.huimv.cattle.service.StockStatusService;
 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.apache.commons.lang3.StringUtils;
@@ -32,9 +33,9 @@ public class StockStatusServiceImpl extends ServiceImpl<StockStatusMapper, Stock
 
     @Override
     public Result getStockStatus(HttpServletRequest request, Map<String, String> paramsMap) {
-        String farmCode = request.getHeader("farmCode");
+        String farmCode = paramsMap.get("farmCode");
         if (StringUtils.isBlank(farmCode)){
-            farmCode = paramsMap.get("farmCode");
+            farmCode = TokenSign.getFarmCode(request);
         }
         StockStatus stockStatus = stockStatusMapper.getStockStatus(farmCode);
         if (ObjectUtil.isEmpty(stockStatus)){
@@ -42,6 +43,7 @@ public class StockStatusServiceImpl extends ServiceImpl<StockStatusMapper, Stock
             stockStatus.setBreedStock(0);
             stockStatus.setCalfStock(0);
             stockStatus.setRaiseStock(0);
+            stockStatus.setFarmCode(farmCode);
             stockStatusMapper.insert(stockStatus);
         }
         return new Result(ResultCode.SUCCESS,stockStatus);
@@ -49,9 +51,9 @@ public class StockStatusServiceImpl extends ServiceImpl<StockStatusMapper, Stock
 
     @Override
     public Result saveStockStatus(HttpServletRequest request, Map<String, String> paramsMap) {
-        String farmCode = request.getHeader("farmCode");
+        String farmCode = paramsMap.get("farmCode");
         if (StringUtils.isBlank(farmCode)){
-            farmCode = paramsMap.get("farmCode");
+            farmCode = TokenSign.getFarmCode(request);
         }
         String breedStock = paramsMap.get("breedStock");
         String raiseStock = paramsMap.get("raiseStock");
@@ -69,6 +71,7 @@ public class StockStatusServiceImpl extends ServiceImpl<StockStatusMapper, Stock
             stockStatus.setBreedStock(Integer.parseInt(breedStock));
             stockStatus.setCalfStock(Integer.parseInt(calfStock));
             stockStatus.setRaiseStock(Integer.parseInt(raiseStock));
+            stockStatus.setFarmCode(farmCode);
             stockStatusMapper.updateById(stockStatus);
         }
         return new Result(ResultCode.SUCCESS);