耳标报警修改2

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/EartagAbnormalCountController.java

@@ -39,6 +39,14 @@ public class EartagAbnormalCountController {
     public Result listAbnoramDev(@RequestBody Map<String,String> map){
         return eartagAbnormalCountService.listAbnoramDev(map);
     }
+    @PostMapping("/listAbnoramAll1")
+    public Result listAbnoramAll1(@RequestBody Map<String,String> map){
+        return eartagAbnormalCountService.listAbnoramAll1(map);
+    }
+    @PostMapping("/listAbnoramDev1")
+    public Result listAbnoramDev1(@RequestBody Map<String,String> map){
+        return eartagAbnormalCountService.listAbnoramDev1(map);
+    }
 
 }
 

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

@@ -21,4 +21,8 @@ public interface EartagAbnormalCountService extends IService<EartagAbnormalCount
     Result listAbnoramAll(Map<String, String> map);
 
     Result listAbnoramDev(Map<String, String> map);
+
+    Result listAbnoramAll1(Map<String, String> map);
+
+    Result listAbnoramDev1(Map<String, String> map);
 }

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

@@ -109,4 +109,63 @@ public class EartagAbnormalCountServiceImpl extends ServiceImpl<EartagAbnormalCo
         jsonObject.put("statusCount", registerList.size());
         return new Result(ResultCode.SUCCESS, eartagAbnormalAlarmPage, jsonObject);
     }
+    @Override
+    public Result listAbnoramAll1(Map<String, String> map) {
+        String farmId = map.get("farmId");
+        String pageNo = map.get("pageNo");
+        String pageSize = map.get("pageSize");
+        QueryWrapper<EartagAbnormalAlarm> wrapper = new QueryWrapper<>();
+        wrapper.eq("alarm_from",2);
+        wrapper.eq("farm_code",farmId);
+        wrapper.orderByDesc("id");
+        Page<EartagAbnormalAlarm> eartagAbnormalAlarmPage = eartagAbnormalAlarmMapper.selectPage(
+                new Page<EartagAbnormalAlarm>(Long.parseLong(pageNo), Long.parseLong(pageSize)), wrapper);
+
+        JSONObject jsonObject = new JSONObject();
+        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);
+        List<EartagAbnormalAlarm> alarms1 = eartagAbnormalAlarmMapper.selectList(queryWrapper);
+        jsonObject.put("dataCount", alarms.size());
+        jsonObject.put("statusCount", alarms1.size());
+
+        return  new Result(ResultCode.SUCCESS,eartagAbnormalAlarmPage,jsonObject);
+    }
+
+    @Override
+    public Result listAbnoramDev1(Map<String, String> map) {
+        String farmId = map.get("farmId");
+        String pageNo = map.get("pageNo");
+        String pageSize = map.get("pageSize");
+        QueryWrapper<EartagAbnormalAlarm> wrapper = new QueryWrapper<>();
+        wrapper.eq("alarm_from",1);
+        wrapper.eq("farm_code",farmId);
+        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);
+        jsonObject.put("dataCount", alarms.size());
+        jsonObject.put("statusCount", registerList.size());
+        return new Result(ResultCode.SUCCESS, eartagAbnormalAlarmPage, jsonObject);
+    }
 }