设备管理

huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/EcoDeviceServiceImpl.java

@@ -48,7 +48,7 @@ public class EcoDeviceServiceImpl extends ServiceImpl<EcoDeviceMapper, EcoDevice
             }
             EcoDevice device = new EcoDevice();
 
-            device.setFarmId(farmId);
+            device.setFarmId(ecoDevice.getFarmId());
             device.setDeviceCode(ecoDevice.getDeviceCode());
             device.setUnitId(ecoDevice.getUnitId());
             device.setPigpenId(ecoDevice.getPigpenId());
@@ -74,7 +74,7 @@ public class EcoDeviceServiceImpl extends ServiceImpl<EcoDeviceMapper, EcoDevice
         EcoDevice ecoDevice1 = ecoDeviceMapper.selectOne(wrapper);
         if (ecoDevice1==null) {
             EcoDevice ecoDevice2 = new EcoDevice();
-            ecoDevice2.setFarmId(Integer.parseInt(globalFarmCode));
+            ecoDevice2.setFarmId(ecoDevice.getFarmId());
             ecoDevice2.setDeviceCode(ecoDevice.getDeviceCode());
             ecoDevice2.setDeviceType(ecoDevice.getDeviceType());
             ecoDevice2.setUnitId(ecoDevice.getUnitId());
@@ -82,7 +82,7 @@ public class EcoDeviceServiceImpl extends ServiceImpl<EcoDeviceMapper, EcoDevice
             ecoDevice2.setPigpenId(ecoDevice.getPigpenId());
             baseMapper.insert(ecoDevice2);
         } else {
-            ecoDevice1.setFarmId(Integer.parseInt(globalFarmCode));
+            ecoDevice1.setFarmId(ecoDevice.getFarmId());
             ecoDevice1.setDeviceCode(ecoDevice.getDeviceCode());
             ecoDevice1.setDeviceType(ecoDevice.getDeviceType());
             ecoDevice1.setUnitId(ecoDevice.getUnitId());
@@ -115,12 +115,12 @@ public class EcoDeviceServiceImpl extends ServiceImpl<EcoDeviceMapper, EcoDevice
             pageSize = "10";
         }
         //farmId
-        String farmId = paramsMap.get("farm_id");
+        String farmId = paramsMap.get("farmId");
         if (farmId == null) {
             farmId = globalFarmCode;
         }
         QueryWrapper<EcoDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId);
+        queryWrapper.eq(StringUtils.isNotBlank(farmId),"farm_id", farmId);
         Page<EcoDevice> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS,ecoDeviceMapper.selectPage(page,queryWrapper));
     }