采集器添加修改5

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

@@ -39,9 +39,17 @@ public class Result implements Serializable {
     public void setData(Object data) {
         this.data = data;
     }
+    public Object getData2() {
+        return data;
+    }
 
+    public void setData2(Object data2) {
+        this.data2 = data2;
+    }
     private Object data;
 
+    private Object data2;
+
     //不需要返回数据时使用
     public Result(ResultCode code) {
         this.success = code.success;
@@ -56,6 +64,13 @@ public class Result implements Serializable {
         this.data = data;
     }
 
+    public Result(ResultCode code, Object data,Object data2) {
+        this.success = code.success;
+        this.code = code.code;
+        this.message = code.message;
+        this.data = data;
+        this.data2 = data2;
+    }
     public Result(Integer code, String message, boolean success) {
         this.code = code;
         this.message = message;

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

@@ -1,7 +1,9 @@
 package com.huimv.eartag2.manage2.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.eartag2.manage2.mapper.EartagDeviceRegisterMapper;
 import com.huimv.eartag2.manage2.pojo.BasePigpen;
+import com.huimv.eartag2.manage2.pojo.EartagDeviceRegister;
 import com.huimv.eartag2.manage2.service.BasePigpenService;
 import com.huimv.eartag2.manage2.utils.IDUtil;
 import com.huimv.eartag2.manage2.utils.ResultUtil;
@@ -35,6 +37,8 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
     private ResultUtil resultUtil;
     @Autowired
     private IDUtil idUtil;
+    @Autowired
+    private EartagDeviceRegisterMapper deviceRegisterMapper;
 
     /**
      * @Method      : addBuilding
@@ -104,7 +108,16 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             //删除子数据
             basePigpenMapper.deleteBatchIds(childIdList);
             basePigpenMapper.deleteBatchIds(idList);
+            QueryWrapper<EartagDeviceRegister> queryWrapper = new QueryWrapper<>();
+            queryWrapper.in("unit_id", childIdList);
+            List<EartagDeviceRegister> eartagDeviceRegisters = deviceRegisterMapper.selectList(queryWrapper);
+            for (EartagDeviceRegister register : eartagDeviceRegisters) {
+                register.setUnitId(null);
+                register.setPigpenId(null);
+                deviceRegisterMapper.updateById(register);
+            }
         }
+
         //删除当前id的数据
         return resultUtil.result(1);
     }

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

@@ -1,6 +1,7 @@
 package com.huimv.eartag2.manage2.service.impl;
 
 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.pojo.EartagAbnormalAlarm;
@@ -49,11 +50,25 @@ public class EartagAbnormalCountServiceImpl extends ServiceImpl<EartagAbnormalCo
         String pageSize = map.get("pageSize");
         QueryWrapper<EartagAbnormalAlarm> wrapper = new QueryWrapper<>();
         wrapper.eq("alarm_from",2);
-        wrapper.eq("alarm_type",2);
         wrapper.ge("add_time", DateUtil.beginOfDay(new Date()));
         wrapper.eq("farm_code",farmId);
         wrapper.orderByDesc("id");
-        Page<EartagAbnormalAlarm> eartagAbnormalAlarmPage = eartagAbnormalAlarmMapper.selectPage(new Page<EartagAbnormalAlarm>(Long.parseLong(pageNo), Long.parseLong(pageSize)), wrapper);
+        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);
+
+        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);
+
         return  new Result(ResultCode.SUCCESS,eartagAbnormalAlarmPage);
     }
 
@@ -64,11 +79,23 @@ public class EartagAbnormalCountServiceImpl extends ServiceImpl<EartagAbnormalCo
         String pageSize = map.get("pageSize");
         QueryWrapper<EartagAbnormalAlarm> wrapper = new QueryWrapper<>();
         wrapper.eq("alarm_from",1);
-        wrapper.eq("alarm_type",2);
         wrapper.ge("add_time", DateUtil.beginOfDay(new Date()));
         wrapper.eq("farm_code",farmId);
         wrapper.orderByDesc("id");
-        Page<EartagAbnormalAlarm> eartagAbnormalAlarmPage = eartagAbnormalAlarmMapper.selectPage(new Page<EartagAbnormalAlarm>(Long.parseLong(pageNo), Long.parseLong(pageSize)), wrapper);
-        return  new Result(ResultCode.SUCCESS,eartagAbnormalAlarmPage);
+        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);
+
+        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);
+        return new Result(ResultCode.SUCCESS, eartagAbnormalAlarmPage, jsonObject);
     }
 }