后台修改

huimv-admin/src/main/java/com/huimv/admin/service/impl/FeedAreaServiceImpl.java

@@ -248,9 +248,18 @@ public class FeedAreaServiceImpl extends ServiceImpl<FeedAreaMapper, FeedArea> i
     @Override
     public Result feedEnvList(Map<String, String> paramsMap) {
         String deviceCode = paramsMap.get("deviceCode");
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        if ("".equals(pageNum) || null == pageNum) {
+            pageNum = "1";
+        }
+        if ("".equals(pageSize) || null == pageSize) {
+            pageSize = "10";
+        }
         QueryWrapper<FeedingEnv> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(deviceCode), "device_code", deviceCode);
-        return new Result(ResultCode.SUCCESS, envMapper.selectList(queryWrapper));
+        Page<FeedingEnv> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS, envMapper.selectPage(page,queryWrapper));
     }
 
     @Override
@@ -258,6 +267,10 @@ public class FeedAreaServiceImpl extends ServiceImpl<FeedAreaMapper, FeedArea> i
         String deviceCode = paramsMap.get("deviceCode");
         String pageNum = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
+        String type = paramsMap.get("type");
+        if ("".equals(type) || null == type) {
+            type = "0";
+        }
         if ("".equals(pageNum) || null == pageNum) {
             pageNum = "1";
         }
@@ -265,7 +278,7 @@ public class FeedAreaServiceImpl extends ServiceImpl<FeedAreaMapper, FeedArea> i
             pageSize = "10";
         }
         QueryWrapper<FeedingData> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(StringUtils.isNotBlank(deviceCode), "device_code", deviceCode);
+        queryWrapper.eq(StringUtils.isNotBlank(deviceCode), "device_code", deviceCode).eq("device_type", type);
         Page<FeedingData> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, dataMapper.selectPage(page, queryWrapper));
     }

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

@@ -99,7 +99,7 @@ public class FeedTimer {
                     SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
                     data.setUploadTime(dateFormat.parse(stringMap.get("createTime").toString()));
                     data.setBlanking(stringMap.get("zkAlram").toString());
-                    data.setDeviceType(Integer.parseInt(stringMap.get("fdType").toString()));
+                    data.setDeviceType(feedArea.getType());
 
                     QueryWrapper<FeedingEnv> queryWrapper1 = new QueryWrapper<>();
                     queryWrapper1.eq("device_code", stringMap.get("fdQrcode"));
@@ -236,12 +236,13 @@ public class FeedTimer {
             if (type.equals(feedPig.getType())) {
                 feedPig.setNumber(number.toString());
                 pigMapper.updateById(feedPig);
-            } else {
-                FeedPig pig = new FeedPig();
-                pig.setType(type);
-                pig.setNumber(number.toString());
-                pigMapper.insert(pig);
             }
+//            else {
+//                FeedPig pig = new FeedPig();
+//                pig.setType(type);
+//                pig.setNumber(number.toString());
+//                pigMapper.insert(pig);
+//            }
         }
 
     }