设备

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvDeviceController.java

@@ -81,6 +81,7 @@ public class EnvDeviceController {
         String farmId = (String) paramsMap.get("farmId");
         Integer deviceType = (Integer) paramsMap.get("deviceType");
         String deviceName = unitName;
+//        String deviceName = (String) paramsMap.get("deviceName");
         switch (deviceType){
             case 1: deviceName += "环控";
             break;

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

@@ -84,6 +84,10 @@ public class BaseBuildingServiceImpl extends ServiceImpl<BaseBuildingMapper, Bas
     @Override
     @Transactional
     public Result updateBuilding(BaseBuilding baseBuilding) {
+        Integer cageNum = baseBuildingMapper.selectById(baseBuilding).getCageNum();
+        if (cageNum > baseBuilding.getCageNum()){
+            return new Result(10001,"笼位数量不能小于原值",false);
+        }
         baseBuildingMapper.updateById(baseBuilding);
         Integer id = baseBuilding.getId();
         List<BaseBuilding> cageIds = baseBuildingMapper.selectList(new QueryWrapper<BaseBuilding>().eq("parent_id", id));
@@ -102,6 +106,19 @@ public class BaseBuildingServiceImpl extends ServiceImpl<BaseBuildingMapper, Bas
                 }
             }
         }
+        for (int i = cageNum+1; i <= baseBuilding.getCageNum(); i++) {
+            BaseBuilding building = new BaseBuilding();
+            building.setBuildName(baseBuilding.getBuildName()+i+"笼");
+            building.setParentId(Integer.valueOf(baseBuilding.getId()));
+            building.setFType(2);
+            building.setStageCode(baseBuilding.getStageCode());
+            building.setFarmId(baseBuilding.getFarmId());
+            building.setCageName(i+"笼");
+            if (baseBuildingMapper.insert(building) != 1){
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001,"操作失败",false);
+            }
+        }
         return ResultUtil.updateResult(1);
     }
 

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

@@ -1,6 +1,7 @@
 package com.huimv.guowei.admin.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.guowei.admin.common.utils.Result;
@@ -72,7 +73,8 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
     public  Result listGroup(Map map, List<Integer> allChildId) {
         Integer pageNum = (Integer)map.get("pageNum");
         Integer pageSize = (Integer)map.get("pageSize");
-        Page<Group> page = this.page(new Page<>(pageNum, pageSize), new QueryWrapper<Group>().in("account_id", allChildId).orderByDesc("id"));
+        String searchStr = (String) map.get("searchStr");
+        Page<Group> page = this.page(new Page<>(pageNum, pageSize), new QueryWrapper<Group>().like(StringUtils.isNotBlank(searchStr),"group_name",searchStr).in("account_id", allChildId).orderByDesc("id"));
         return new Result(ResultCode.SUCCESS,page);
     }