更新密码

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

@@ -80,7 +80,7 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
         }
         QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(code), "duck_num", code)
-                .like(StringUtils.isNotBlank(location), "unit_name", location).eq("farm_id", farmId).orderByDesc("duck_birthday");
+                .like(StringUtils.isNotBlank(location), "unit_name", location).eq("farm_id", farmId).orderByDesc("id");
         Page<BaseDuckInfo> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, duckInfoMapper.selectPage(page, queryWrapper));
     }

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

@@ -51,7 +51,7 @@ public class BreedServiceImpl extends ServiceImpl<BreedMapper, Breed> implements
         }
         QueryWrapper<Breed> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank(unitName),"unit_name", unitName)
-                .orderByDesc("date");
+                .orderByDesc("id");
         Page<Breed> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, breedMapper.selectPage(page, queryWrapper));
     }

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

@@ -55,7 +55,7 @@ public class DepartureServiceImpl extends ServiceImpl<DepartureMapper, Departure
         }
         QueryWrapper<Departure> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank(unitName),"unit_name", unitName)
-                .orderByDesc("date");
+                .orderByDesc("id");
         Page<Departure> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, departureMapper.selectPage(page, queryWrapper));
     }

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

@@ -134,14 +134,14 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter {
             String str1 = s[i * 2 + 11] + s[i * 2 + 10];
             BigDecimal weight = new BigDecimal(Integer.parseInt(str1,16));
             BigDecimal subtract = weight.subtract(lastWeight);
-            if (subtract.compareTo(bigDecimal3)<0&& subtract.compareTo(bigDecimal0)>0){
+           /* if (subtract.compareTo(bigDecimal3)<0&& subtract.compareTo(bigDecimal0)>0){
                 System.out.println("波动小于0.3g，舍弃");
                 continue;
             }
             if (subtract.compareTo(bigDecimala3)>0 && subtract.compareTo(bigDecimal0)<0){
                 System.out.println("波动小于0.3g，舍弃");
                 continue;
-            }
+            }*/
 
             int compare = subtract.compareTo(new BigDecimal(1500));
             System.out.println(subtract +"------>"+weight+"----------->"+lastWeight);