|
@@ -51,6 +51,8 @@ public class EcoDeviceServiceImpl extends ServiceImpl<EcoDeviceMapper, EcoDevice
|
|
|
device.setFarmId(farmId);
|
|
|
device.setDeviceCode(ecoDevice.getDeviceCode());
|
|
|
device.setUnitId(ecoDevice.getUnitId());
|
|
|
+ device.setPigpenId(ecoDevice.getPigpenId());
|
|
|
+ device.setLocation(ecoDevice.getLocation());
|
|
|
if (ecoDevice.getDeviceType().equals(code)) {
|
|
|
device.setDeviceType(code);
|
|
|
}
|
|
@@ -76,12 +78,16 @@ public class EcoDeviceServiceImpl extends ServiceImpl<EcoDeviceMapper, EcoDevice
|
|
|
ecoDevice2.setDeviceCode(ecoDevice.getDeviceCode());
|
|
|
ecoDevice2.setDeviceType(ecoDevice.getDeviceType());
|
|
|
ecoDevice2.setUnitId(ecoDevice.getUnitId());
|
|
|
+ ecoDevice2.setLocation(ecoDevice.getLocation());
|
|
|
+ ecoDevice2.setPigpenId(ecoDevice.getPigpenId());
|
|
|
baseMapper.insert(ecoDevice2);
|
|
|
} else {
|
|
|
ecoDevice1.setFarmId(Integer.parseInt(globalFarmCode));
|
|
|
ecoDevice1.setDeviceCode(ecoDevice.getDeviceCode());
|
|
|
ecoDevice1.setDeviceType(ecoDevice.getDeviceType());
|
|
|
ecoDevice1.setUnitId(ecoDevice.getUnitId());
|
|
|
+ ecoDevice1.setLocation(ecoDevice.getLocation());
|
|
|
+ ecoDevice1.setPigpenId(ecoDevice.getPigpenId());
|
|
|
baseMapper.updateById(ecoDevice1);
|
|
|
}
|
|
|
return new Result(ResultCode.SUCCESS,"编辑成功");
|