Merge remote-tracking branch 'origin/master'

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/BaseDuckInfoServiceImpl.java

@@ -262,6 +262,7 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
 
     }
 
+
     /**
      * 获取两个日期间的天数，精确到年月日
      *

input/src/main/java/com/huimv/input/server/EnvInputServerHandler.java

@@ -375,12 +375,12 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter   {
         BigDecimal minWeight = new BigDecimal(99999);
         //检蛋
         if(currentTime.isAfter(jianStartTime) && currentTime.isBefore(jianEndTime)){
-            List<EnvRegularCallEgg> call_date = envRegularCallEggMapper.selectList(new QueryWrapper<EnvRegularCallEgg>().eq("call_code",decId).ge("call_date", DateUtil.beginOfDay(new Date())));
-            if (ObjectUtil.isNotEmpty(call_date)){
+            List<EnvRegularCallEgg> callEgg = envRegularCallEggMapper.selectList(new QueryWrapper<EnvRegularCallEgg>().eq("call_code",decId).ge("call_date", DateUtil.beginOfDay(new Date())));
+            if (ObjectUtil.isNotEmpty(callEgg) ){
+                System.out.println(callEgg);
                 return;
             }
 
-            List<EnvRegularCallEgg> callEgg = envRegularCallEggMapper.selectList(new QueryWrapper<EnvRegularCallEgg>().eq("call_code",decId).ge("call_date", DateUtil.beginOfDay(new Date())));
             Integer eggCountNum =0;
             for (int i = 0; i < 60; i++) {
                 String str1 = s[i * 2 + 11] + s[i * 2 + 10];
@@ -393,7 +393,7 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter   {
                 BigDecimal subtract = weight.subtract(lastWeight);
                 int i1 = subtract.intValue();
 
-                if(i1>500&&ObjectUtil.isNotEmpty(callEgg)  && callEgg.size() >1) {
+                if(i1>500&&ObjectUtil.isNotEmpty(callEgg)  && callEgg.size() <2) {
 
                     if (eggCountNum >2){
                         continue;