牧场功能、牧场存栏

huimv-admin/src/main/java/com/huimv/admin/controller/FarmController.java

@@ -3,6 +3,7 @@ package com.huimv.admin.controller;
 
 import com.huimv.admin.common.token.TokenSign;
 import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.Farm;
 import com.huimv.admin.service.IFarmService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -74,4 +75,10 @@ public class FarmController {
         farmService.removeByIds(ids);
         return new Result(10000,"删除成功",true);
     }
+
+    @PostMapping("/listFunction")
+    public Result listFunction(@RequestBody Map<String,String> paramsMap){
+        String farmId = paramsMap.get("farmId");
+        return  new Result(ResultCode.SUCCESS,farmService.getById(farmId));
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/controller/SysAccountMultilevelController.java

@@ -106,6 +106,4 @@ public class SysAccountMultilevelController {
         Integer userId = TokenSign.getMemberIdByJwtToken(request);
         return  accountMultilevelService.getLastFarmId(userId);
     }
-
-
 }

huimv-admin/src/main/java/com/huimv/admin/service/impl/ProdStockServiceImpl.java

@@ -61,7 +61,7 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
         //获取前12个月的第一天
         Calendar cal_1 = Calendar.getInstance();//获取当前日期
         cal_1.add(Calendar.MONTH, -12);
-        cal_1.set(Calendar.DAY_OF_MONTH, 1);//设置为1号
+        cal_1.set(Calendar.DAY_OF_MONTH, cal_1.getActualMaximum(Calendar.DAY_OF_MONTH));//设置为最后一天
         cal_1.set(Calendar.HOUR_OF_DAY, 0);
         cal_1.set(Calendar.MINUTE, 0);
         cal_1.set(Calendar.SECOND, 0);

huimv-admin/src/main/java/com/huimv/admin/timer/ShenChanTimer.java

@@ -45,7 +45,7 @@ public class ShenChanTimer {
         String token = login();
         System.out.println("token"+token);
 
-        DateTime dateTime = DateUtil.beginOfMonth(new Date());
+        DateTime dateTime = DateUtil.beginOfDay(new Date());
         ProdStock prodStock = prodStockService.getOne(new QueryWrapper<ProdStock>().ge("creat_time",dateTime).eq("farm_id", farmId).orderByDesc("creat_time").last("limit 1"));
 
         System.out.println(token);
@@ -75,8 +75,8 @@ public class ShenChanTimer {
                     prodStock.setByzcl(Integer.parseInt(stock.get(13).toString()));
                     prodStock.setYfzcl(Integer.parseInt(stock.get(14).toString()));
                     prodStock.setZcl(Integer.parseInt(stock.get(15).toString()));
-                    prodStockService.updateById(prodStock);
                     prodStock.setCreatTime(new Date());
+                    prodStockService.updateById(prodStock);
                 }else {
                     prodStock = new ProdStock();
                     prodStock.setZzcl(Integer.parseInt(stock.get(11).toString()));
@@ -92,8 +92,7 @@ public class ShenChanTimer {
                     prodStock.setKhzcl(212);
                     prodStock.setSpzcl(1020);
                     prodStock.setCreatTime(new Date());
-
-                    prodStockService.updateById(prodStock);
+                    prodStockService.save(prodStock);
                 }
 
             }