更新密码

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

@@ -380,6 +380,8 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter   {
                 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];
                 BigDecimal weight = new BigDecimal(Integer.parseInt(str1, 16));
@@ -390,10 +392,10 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter   {
 //                BigDecimal subtract = lastWeight.subtract(weight);
                 BigDecimal subtract = weight.subtract(lastWeight);
                 int i1 = subtract.intValue();
-                if(i1>500) {
 
-                    List<EnvRegularCallEgg> callEgg = envRegularCallEggMapper.selectList(new QueryWrapper<EnvRegularCallEgg>().eq("call_code",decId).ge("call_date", DateUtil.beginOfDay(new Date())));
-                    if (ObjectUtil.isNotEmpty(callEgg)  && callEgg.size() >1){
+                if(i1>500&&ObjectUtil.isNotEmpty(callEgg)  && callEgg.size() >1) {
+
+                    if (eggCountNum >2){
                         continue;
                     }
                     EnvRegularCallEgg envRegularCallEgg = new EnvRegularCallEgg();
@@ -410,10 +412,12 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter   {
                     envRegularCallEgg.setJiaoNum(baseDuckInfo.getJiaoNum());
                     envRegularCallEgg.setBatchNum(baseDuckInfo.getBatchNum());
                     if (  i1 <1000) {
+                        eggCountNum+=1;
                         envRegularCallEgg.setEggNum(1);
-                    } /*else if (i1 >1400 && i1 <2000 ) {
+                    } else if (i1 >1400 && i1 <2000 ) {
+                        eggCountNum +=2;
                         envRegularCallEgg.setEggNum(2);
-                     }*/else {
+                     }else {
                         continue;
                     }
                     if (weight.compareTo(bigDecimal0) == 0) {