采集器添加修改7

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

@@ -4,12 +4,14 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.eartag2.manage2.mapper.EartagDeviceRegisterMapper;
 import com.huimv.eartag2.manage2.pojo.EartagAbnormalAlarm;
 import com.huimv.eartag2.manage2.pojo.EartagAbnormalCount;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.common.utils.ResultCode;
 import com.huimv.eartag2.manage2.mapper.EartagAbnormalAlarmMapper;
 import com.huimv.eartag2.manage2.mapper.EartagAbnormalCountMapper;
+import com.huimv.eartag2.manage2.pojo.EartagDeviceRegister;
 import com.huimv.eartag2.manage2.service.EartagAbnormalCountService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +35,8 @@ public class EartagAbnormalCountServiceImpl extends ServiceImpl<EartagAbnormalCo
     private EartagAbnormalCountMapper eartagAbnormalCountMapper;
     @Autowired
     private EartagAbnormalAlarmMapper eartagAbnormalAlarmMapper;
+    @Autowired
+    private EartagDeviceRegisterMapper registerMapper;
 
     @Override
     public Result listAbnormalCount(Map<String, String> map) {
@@ -85,18 +89,24 @@ public class EartagAbnormalCountServiceImpl extends ServiceImpl<EartagAbnormalCo
         wrapper.orderByDesc("id");
         Page<EartagAbnormalAlarm> eartagAbnormalAlarmPage = eartagAbnormalAlarmMapper.selectPage(
                 new Page<EartagAbnormalAlarm>(Long.parseLong(pageNo), Long.parseLong(pageSize)), wrapper);
+
+
         JSONObject jsonObject = new JSONObject();
+        QueryWrapper<EartagDeviceRegister> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("farm_id", farmId).eq("device_status",0);
+        List<EartagDeviceRegister> registerList = registerMapper.selectList(queryWrapper1);
+
         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);
-        List<EartagAbnormalAlarm> alarms1 = eartagAbnormalAlarmMapper.selectList(queryWrapper);
+//        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);
+//        List<EartagAbnormalAlarm> alarms1 = eartagAbnormalAlarmMapper.selectList(queryWrapper);
         jsonObject.put("dataCount", alarms.size());
-        jsonObject.put("statusCount", alarms1.size());
+        jsonObject.put("statusCount", registerList.size());
         return new Result(ResultCode.SUCCESS, eartagAbnormalAlarmPage, jsonObject);
     }
 }