称重数据修改

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

@@ -97,7 +97,7 @@ public class EnvMoveCallServiceImpl extends ServiceImpl<EnvMoveCallMapper, EnvMo
         String farmId = paramsMap.get("farmId");
         String unitName = paramsMap.get("unitName");
         QueryWrapper<EnvMoveCall> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).ne("duck_num",1)
+        queryWrapper.eq("farm_id", farmId).ne("duck_num",1).ne("duck_num",2)
                 .like(StringUtils.isNotBlank(unitName), "unit_name", unitName)
                 .orderByDesc("call_date").last(" limit 10");
         return new Result(ResultCode.SUCCESS, moveCallMapper.selectList(queryWrapper));

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

@@ -57,6 +57,12 @@ public class RawDataServiceImpl extends ServiceImpl<RawDataMapper, RawData> impl
         String endDate = paramsMap.get("endDate");
         String pageNum = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
+        if ("".equals(pageNum) || null == pageNum) {
+            pageNum = "1";
+        }
+        if ("".equals(pageSize) || null == pageSize) {
+            pageSize = "20";
+        }
 
         QueryWrapper<RawData> wrapper = new QueryWrapper<>();
         if (StringUtils.isNotBlank(deviceCode)){

huimv-admin/src/main/java/com/huimv/guowei/admin/timer/ProcudeFeed.java

@@ -41,7 +41,7 @@ public class ProcudeFeed {
 
 
     //    @Scheduled(cron = "*/5 * * * * ?")
-    @Scheduled(cron = "0 0 9 * * ?")
+//    @Scheduled(cron = "0 0 9 * * ?")
     private void saveOnlineDevice() {
         QueryWrapper<EnvDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", 21).eq("device_type", 3);