采集器添加修改6

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/utils/Result.java

@@ -40,7 +40,7 @@ public class Result implements Serializable {
         this.data = data;
     }
     public Object getData2() {
-        return data;
+        return data2;
     }
 
     public void setData2(Object data2) {

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagAbnormalCountServiceImpl.java

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -57,19 +58,19 @@ public class EartagAbnormalCountServiceImpl extends ServiceImpl<EartagAbnormalCo
                 new Page<EartagAbnormalAlarm>(Long.parseLong(pageNo), Long.parseLong(pageSize)), wrapper);
 
         JSONObject jsonObject = new JSONObject();
-        wrapper.eq("alarm_type", 2).groupBy("farm_code");
-        Long count = eartagAbnormalAlarmMapper.selectCount(wrapper);
+        wrapper.eq("alarm_type", 2);
+        List<EartagAbnormalAlarm> alarms = eartagAbnormalAlarmMapper.selectList(wrapper);
 
         QueryWrapper<EartagAbnormalAlarm> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("alarm_from",2);
         queryWrapper.ge("add_time", DateUtil.beginOfDay(new Date()));
         queryWrapper.eq("farm_code",farmId);
-        queryWrapper.eq("alarm_type", 1).groupBy("farm_code");
-        Long count1 = eartagAbnormalAlarmMapper.selectCount(queryWrapper);
-        jsonObject.put("dataCount", count);
-        jsonObject.put("statusCount", count1);
+        queryWrapper.eq("alarm_type", 1);
+        List<EartagAbnormalAlarm> alarms1 = eartagAbnormalAlarmMapper.selectList(queryWrapper);
+        jsonObject.put("dataCount", alarms.size());
+        jsonObject.put("statusCount", alarms1.size());
 
-        return  new Result(ResultCode.SUCCESS,eartagAbnormalAlarmPage);
+        return  new Result(ResultCode.SUCCESS,eartagAbnormalAlarmPage,jsonObject);
     }
 
     @Override
@@ -85,17 +86,17 @@ public class EartagAbnormalCountServiceImpl extends ServiceImpl<EartagAbnormalCo
         Page<EartagAbnormalAlarm> eartagAbnormalAlarmPage = eartagAbnormalAlarmMapper.selectPage(
                 new Page<EartagAbnormalAlarm>(Long.parseLong(pageNo), Long.parseLong(pageSize)), wrapper);
         JSONObject jsonObject = new JSONObject();
-        wrapper.eq("alarm_type", 2).groupBy("farm_code");
-        Long count = eartagAbnormalAlarmMapper.selectCount(wrapper);
+        wrapper.eq("alarm_type", 2);
+        List<EartagAbnormalAlarm> alarms = eartagAbnormalAlarmMapper.selectList(wrapper);
 
         QueryWrapper<EartagAbnormalAlarm> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("alarm_from",1);
         queryWrapper.ge("add_time", DateUtil.beginOfDay(new Date()));
         queryWrapper.eq("farm_code",farmId);
-        queryWrapper.eq("alarm_type", 1).groupBy("farm_code");
-        Long count1 = eartagAbnormalAlarmMapper.selectCount(queryWrapper);
-        jsonObject.put("dataCount", count);
-        jsonObject.put("statusCount", count1);
+        queryWrapper.eq("alarm_type", 1);
+        List<EartagAbnormalAlarm> alarms1 = eartagAbnormalAlarmMapper.selectList(queryWrapper);
+        jsonObject.put("dataCount", alarms.size());
+        jsonObject.put("statusCount", alarms1.size());
         return new Result(ResultCode.SUCCESS, eartagAbnormalAlarmPage, jsonObject);
     }
 }