luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改灌溉记录bug,添加充值报文处理

Browse Source
This commit is contained in:
mi9688
2025-01-07 12:56:40 +08:00
parent a9dde2c96b
commit 8d6f5216d5
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserIrrigationRecordServiceImpl.java
View File

@ -182,10 +182,14 @@ public class UserIrrigationRecordServiceImpl implements IUserIrrigationRecordSer
temp.userName= sysUserMapper.selectUserById(list.get(i).getUserId()).getUserName()==null ? "" :sysUserMapper.selectUserById(list.get(i).getUserId()).getUserName();
}
if(list.get(i).getDeviceNumber()!=null)
{
temp.deviceName=ngIrrigationControllersMapper.selectNgIrrigationControllersBySerialNumber(list.get(i).getDeviceNumber()).getControllerName() == null ? "":ngIrrigationControllersMapper.selectNgIrrigationControllersBySerialNumber(list.get(i).getDeviceNumber()).getControllerName();
if (list.get(i).getDeviceNumber() != null) {
String deviceNumber = list.get(i).getDeviceNumber();
String controllerName = "";
NgIrrigationControllers ngIrrigationControllers = ngIrrigationControllersMapper.selectNgIrrigationControllersBySerialNumber(deviceNumber);
if (ngIrrigationControllers != null) {
controllerName = ngIrrigationControllers.getControllerName();
}
temp.deviceName = (controllerName != null) ? controllerName : "";
}
temp.deviceNumber=list.get(i).getDeviceNumber();
temp.cardNumber=list.get(i).getCardNumber() == null ? "" : list.get(i).getCardNumber();