【fix】根据牧场id查询采集器信息

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

@@ -62,13 +62,12 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
         String pigpenId = mapList.get(0).get("pigpenId");
         String unitId = mapList.get(0).get("unitId");
         //批量更新
-        UpdateWrapper<EartagDeviceRegister> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.lambda().in(EartagDeviceRegister::getUnitId,ids);
-        EartagDeviceRegister eartagDeviceRegister1 = new EartagDeviceRegister();
-        eartagDeviceRegister1.setPigpenId(Integer.valueOf(pigpenId));
-        eartagDeviceRegister1.setUnitId(Integer.valueOf(unitId));
-
-        return resultUtil.result(eartagDeviceRegisterMapper.update(eartagDeviceRegister1,updateWrapper));
+        for (Integer id : ids) {
+            UpdateWrapper<EartagDeviceRegister> queryWrapper = new UpdateWrapper<>();
+            queryWrapper.set("pigpen_id",pigpenId).set("unit_id",unitId).eq("id",id);
+            eartagDeviceRegisterMapper.update(null,queryWrapper);
+        }
+        return resultUtil.result(1);
     }
 
     @Override
@@ -80,8 +79,6 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
     @Override
     public Result update(Map<String, String> maps) {
         String id = maps.get("id");
-        String pigpenId = maps.get("pigpenId");
-        String unitId = maps.get("unitId");
 
         String chipId = maps.get("chipId");
         String deviceCode = maps.get("deviceCode");
@@ -91,8 +88,6 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
 
         String remark = maps.get("remark");
         EartagDeviceRegister eartagDeviceRegister = eartagDeviceRegisterMapper.selectById(id);
-        eartagDeviceRegister.setPigpenId(Integer.valueOf(pigpenId));
-        eartagDeviceRegister.setUnitId(Integer.valueOf(unitId));
         eartagDeviceRegister.setChipId(chipId);
         eartagDeviceRegister.setDeviceAlias(deviceAlias);
         eartagDeviceRegister.setDeviceCode(deviceCode);
@@ -113,6 +108,7 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
         String activeStatus = paramsMap.get("activeStatus");
         String pageSize = paramsMap.get("pageSize");
         String pageNo = paramsMap.get("pageNo");
+        String farmId = paramsMap.get("farmId");
 
         if (StringUtils.isBlank(pageNo)){
             pageNo="1";
@@ -131,7 +127,7 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
         wrapper.like(StringUtils.isNotBlank(deviceAlias),"device_alias",deviceAlias);
         wrapper.like(StringUtils.isNotBlank(deviceStatus),"device_status",deviceStatus);
         wrapper.like(StringUtils.isNotBlank(activeStatus),"active_status",activeStatus);
-
+        wrapper.eq("farm_id",farmId);
         Page<EartagDeviceRegister> page = this.page(new Page<>(Long.parseLong(pageNo), Long.parseLong(pageSize)), wrapper);
         Page<EartagDeviceRegisterVo> eartagDeviceRegisterVoPage = new Page<>();
         //复制
@@ -158,44 +154,40 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
 
     @Override
     public Result add(Map<String, String> mapList) {
-        String pigpenId = mapList.get("pigpenId");
-        String unitId = mapList.get("unitId");
-
+        String farmId = mapList.get("farmId");
         String chipId = mapList.get("chipId");
-        String deviceCode = mapList.get("deviceCode");
         String deviceAlias = mapList.get("deviceAlias");
         String activeStatus = mapList.get("activeStatus");
         String deviceStatus = mapList.get("deviceStatus");
         String remark = mapList.get("remark");
 
+        String deviceCode = (String)getDeviceCode(farmId).getData();
         EartagDeviceRegister eartagDeviceRegister = new EartagDeviceRegister();
-        eartagDeviceRegister.setPigpenId(Integer.valueOf(pigpenId));
-        eartagDeviceRegister.setUnitId(Integer.valueOf(unitId));
         eartagDeviceRegister.setChipId(chipId);
         eartagDeviceRegister.setDeviceAlias(deviceAlias);
         eartagDeviceRegister.setDeviceCode(deviceCode);
         eartagDeviceRegister.setActiveStatus(Integer.valueOf(activeStatus));
         eartagDeviceRegister.setRemark(remark);
         eartagDeviceRegister.setDeviceStatus(Integer.valueOf(deviceStatus));
+        eartagDeviceRegister.setFarmId(farmId);
         return resultUtil.result(eartagDeviceRegisterMapper.insert(eartagDeviceRegister));
     }
 
     @Override
     public Result cancel(String ids) {
         List<Integer> convert = idUtil.convert(ids);
-
-        UpdateWrapper<EartagDeviceRegister> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.lambda().in(EartagDeviceRegister::getUnitId,convert);
-        EartagDeviceRegister eartagDeviceRegister = new EartagDeviceRegister();
-        eartagDeviceRegister.setPigpenId(null);
-        eartagDeviceRegister.setUnitId(null);
-        return resultUtil.result(eartagDeviceRegisterMapper.update(eartagDeviceRegister,updateWrapper));
+        for (Integer id : convert) {
+            UpdateWrapper<EartagDeviceRegister> queryWrapper = new UpdateWrapper<>();
+            queryWrapper.set("pigpen_id",null).set("unit_id",null).eq("id",id);
+            eartagDeviceRegisterMapper.update(null,queryWrapper);
+        }
+        return resultUtil.result(1);
     }
 
     @Override
     public Result getDeviceCode(String farmCode) {
         QueryWrapper<EartagDeviceRegister> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_code",farmCode);
+        queryWrapper.eq("farm_id",farmCode);
         List<EartagDeviceRegister> eartagDeviceRegisters = eartagDeviceRegisterMapper.selectList(queryWrapper);
         if (null == eartagDeviceRegisters || eartagDeviceRegisters.size() == 0){
             return new Result(ResultCode.SUCCESS,farmCode+"000001");