脚环读取

huimv-admin/src/main/java/com/huimv/guowei/admin/group/service/impl/GroupDuckInfoServiceImpl.java

@@ -81,6 +81,7 @@ public class GroupDuckInfoServiceImpl extends ServiceImpl<GroupDuckInfoMapper, G
         String farmId = paramsMap.get("farmId");
         String pageNum = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
+        String isLeave = paramsMap.get("isLeave");
         if ("".equals(pageNum) || null == pageNum) {
             pageNum = "1";
             pageSize = "20";
@@ -89,7 +90,7 @@ public class GroupDuckInfoServiceImpl extends ServiceImpl<GroupDuckInfoMapper, G
         String unitId = paramsMap.get("unitId");
         Page<GroupDuckInfo> page = new Page(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         QueryWrapper<GroupDuckInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(unitId), "unit_id", unitId);
+        queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(unitId), "unit_id", unitId).eq(StringUtils.isNotBlank(isLeave),"is_leave",isLeave);
         if (StringUtils.isNotBlank(keyword)) {
             queryWrapper.and(wrapper -> wrapper.like(StringUtils.isNotBlank(keyword), "device_code", keyword)
                     .or().like(StringUtils.isNotBlank(keyword), "batch_num", keyword));

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/BaseBuildingServiceImpl.java

@@ -3,6 +3,7 @@ package com.huimv.guowei.admin.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -87,7 +88,7 @@ public class BaseBuildingServiceImpl extends ServiceImpl<BaseBuildingMapper, Bas
     }
 
     @Override
-    @Transactional
+//    @Transactional
     public Result updateBuilding(BaseBuilding baseBuilding) {
         Integer cageNum = baseBuildingMapper.selectById(baseBuilding).getCageNum();
         if (cageNum > baseBuilding.getCageNum()){
@@ -109,15 +110,13 @@ public class BaseBuildingServiceImpl extends ServiceImpl<BaseBuildingMapper, Bas
                         baseDuckInfoMapper.updateById(baseDuckInfo);
                     }
                 }
-                List<GroupDuckInfo> groupDuckInfos = duckInfoMapper.selectList(new QueryWrapper<GroupDuckInfo>().eq("unit_id", building.getId()));
-                if (groupDuckInfos.size() != 0) {
-                    for (GroupDuckInfo groupDuckInfo : groupDuckInfos) {
-                        groupDuckInfo.setUnitName(baseBuilding.getBuildName());
-                        duckInfoMapper.updateById(groupDuckInfo);
-                    }
-                }
             }
         }
+
+        GroupDuckInfo groupDuckInfo = new GroupDuckInfo();
+        groupDuckInfo.setUnitName(baseBuilding.getBuildName());
+        duckInfoMapper.update(groupDuckInfo ,new UpdateWrapper<GroupDuckInfo>().eq("unit_id",id));
+
         for (int i = cageNum+1; i <= baseBuilding.getCageNum(); i++) {
             BaseBuilding building = new BaseBuilding();
             building.setBuildName(baseBuilding.getBuildName()+i+"笼");