生物防控人员2

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

@@ -56,8 +56,8 @@ public class ShenChanTimer {
 
 //有个问题 正康的视频咋也看不了
 
-     @Scheduled(cron = "0 * * * * ? ")
-//    @Scheduled(cron = "1 0 * * * ?")
+//     @Scheduled(cron = "0 * * * * ? ")
+    @Scheduled(cron = "1 0 * * * ?")
 //    @GetMapping("/test")
     @Transactional
     public void getShenChan() throws Exception {
@@ -79,9 +79,9 @@ public class ShenChanTimer {
                 case "正康":
                     saveProdStrok(stockLoginDto,21,stock,dateTime);
                     break;
-                    case "下水碓":
-                        saveProdStrok(stockLoginDto, 22, stock, dateTime);
-                        break;
+                case "下水碓":
+                    saveProdStrok(stockLoginDto, 22, stock, dateTime);
+                    break;
                 case "东阳":
                     saveProdStrok(stockLoginDto,24,stock,dateTime);
                     break;
@@ -100,6 +100,9 @@ public class ShenChanTimer {
                 case "张村":
                     saveProdStrok(stockLoginDto,29,stock,dateTime);
                     break;
+                case "乐清":
+                    saveProdStrok(stockLoginDto,39,stock,dateTime);
+                    break;
 
                 case "三亩田":
                     break;
@@ -128,7 +131,7 @@ public class ShenChanTimer {
     //保存存栏
     private void saveProdStrok(StockLoginDto stockLoginDto,Integer farmId,List stock,DateTime dateTime) throws Exception {
 
-        ProdStock prodStock = prodStockService.getOne(new QueryWrapper<ProdStock>().ge("creat_time", dateTime).eq("farm_id", farmId).orderByDesc("creat_time").last("limit 1"));
+        ProdStock prodStock = prodStockService.getOne(new QueryWrapper<ProdStock>().ge("creat_time", dateTime).eq("farm_id", farmId).eq("display_type",0).orderByDesc("creat_time").last("limit 1"));
         Boolean isNew = false;
         if(ObjectUtil.isEmpty(prodStock)){
             prodStock = new ProdStock();
@@ -218,7 +221,7 @@ public class ShenChanTimer {
         double percentage = calculatePercentage(ZCL-intsw, ZCL);
         prodStock.setCheng(df.format(percentage));
         DateTime dateTime1 = DateUtil.offsetDay(dateTime, -1);
-        ProdStock prodStockZr = prodStockService.getOne(new QueryWrapper<ProdStock>().between("creat_time",dateTime1 ,dateTime).eq("farm_id", farmId).orderByDesc("creat_time").last("limit 1"));
+        ProdStock prodStockZr = prodStockService.getOne(new QueryWrapper<ProdStock>().between("creat_time",dateTime1 ,dateTime).eq("farm_id", farmId).eq("display_type",0).orderByDesc("creat_time").last("limit 1"));
         Integer zryf = 0;
         Integer zrInpig = 0;
         Integer zrOntpig = 0;