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

修改刷卡记录和灌溉记录中username和devicename获取验证

Browse Source
This commit is contained in:
ALEI_ALEI 2024-12-21 16:21:00 +08:00
parent 06723a9a43
commit f64fde7d0c
2 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserConsumptionDetailsServiceImpl.java
View File

@ -35,7 +35,10 @@ public class UserConsumptionDetailsServiceImpl implements IUserConsumptionDetail
{ {
UserConsumptionDetails userConsumptionDetails=value.get(i); UserConsumptionDetails userConsumptionDetails=value.get(i);
UserConsumptionDetailsDto temp=new UserConsumptionDetailsDto(); UserConsumptionDetailsDto temp=new UserConsumptionDetailsDto();
temp.setUserName(sysUserMapper.selectUserById(userConsumptionDetails.getUserId()).getUserName()); if(userConsumptionDetails.getUserId()!=null)
{
temp.setUserName(sysUserMapper.selectUserById(userConsumptionDetails.getUserId()).getUserName());
}
temp.setId(userConsumptionDetails.getId()); temp.setId(userConsumptionDetails.getId());
temp.setUserId(userConsumptionDetails.getUserId()); temp.setUserId(userConsumptionDetails.getUserId());
temp.setDeviceNumber(userConsumptionDetails.getDeviceNumber()); temp.setDeviceNumber(userConsumptionDetails.getDeviceNumber());
@ -114,7 +117,11 @@ public class UserConsumptionDetailsServiceImpl implements IUserConsumptionDetail
{ {
UserConsumptionDetails userConsumptionDetails=value.get(i); UserConsumptionDetails userConsumptionDetails=value.get(i);
UserConsumptionDetailsDto temp=new UserConsumptionDetailsDto(); UserConsumptionDetailsDto temp=new UserConsumptionDetailsDto();
temp.setUserName(sysUserMapper.selectUserById(userConsumptionDetails.getUserId()).getUserName()); if(userConsumptionDetails.getUserId()!=null)
{
temp.setUserName(sysUserMapper.selectUserById(userConsumptionDetails.getUserId()).getUserName());
}
temp.setId(userConsumptionDetails.getId()); temp.setId(userConsumptionDetails.getId());
temp.setUserId(userConsumptionDetails.getUserId()); temp.setUserId(userConsumptionDetails.getUserId());
temp.setDeviceNumber(userConsumptionDetails.getDeviceNumber()); temp.setDeviceNumber(userConsumptionDetails.getDeviceNumber());

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

@ -41,9 +41,17 @@ public class UserIrrigationRecordServiceImpl implements IUserIrrigationRecordSer
{ {
UserIrrigationRecordDto temp=new UserIrrigationRecordDto(); UserIrrigationRecordDto temp=new UserIrrigationRecordDto();
temp.id=list.get(i).getId(); temp.id=list.get(i).getId();
temp.userName= sysUserMapper.selectUserById(list.get(i).getUserId()).getUserName()==null ? "" :sysUserMapper.selectUserById(list.get(i).getUserId()).getUserName(); if(list.get(i).getUserId()!=null)
temp.deviceName=ngIrrigationControllersMapper.selectNgIrrigationControllersBySerialNumber(list.get(i).getDeviceNumber()).getControllerName() == null ? "":ngIrrigationControllersMapper.selectNgIrrigationControllersBySerialNumber(list.get(i).getDeviceNumber()).getControllerName(); {
temp.cardNumber=list.get(i).getCardNumber() == null ? "" : list.get(i).getCardNumber(); 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();
}
temp.cardNumber=list.get(i).getCardNumber() == null ? "" : list.get(i).getCardNumber();
temp.flow=list.get(i).getCurFlow()==null ? BigDecimal.valueOf(0) :list.get(i).getCurFlow(); temp.flow=list.get(i).getCurFlow()==null ? BigDecimal.valueOf(0) :list.get(i).getCurFlow();
temp.startTime=list.get(i).getStartTime()==null ? null : list.get(i).getStartTime(); temp.startTime=list.get(i).getStartTime()==null ? null : list.get(i).getStartTime();
temp.endTime=list.get(i).getEndTime()==null ? null :list.get(0).getEndTime(); temp.endTime=list.get(i).getEndTime()==null ? null :list.get(0).getEndTime();
@ -67,8 +75,16 @@ public class UserIrrigationRecordServiceImpl implements IUserIrrigationRecordSer
{ {
UserIrrigationRecordDto temp=new UserIrrigationRecordDto(); UserIrrigationRecordDto temp=new UserIrrigationRecordDto();
temp.id=list.get(i).getId(); temp.id=list.get(i).getId();
temp.userName= sysUserMapper.selectUserById(list.get(i).getUserId()).getUserName()==null ? "" :sysUserMapper.selectUserById(list.get(i).getUserId()).getUserName(); if(list.get(i).getUserId()!=null)
temp.deviceName=ngIrrigationControllersMapper.selectNgIrrigationControllersBySerialNumber(list.get(i).getDeviceNumber()).getControllerName() == null ? "":ngIrrigationControllersMapper.selectNgIrrigationControllersBySerialNumber(list.get(i).getDeviceNumber()).getControllerName(); {
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();
}
temp.cardNumber=list.get(i).getCardNumber() == null ? "" : list.get(i).getCardNumber(); temp.cardNumber=list.get(i).getCardNumber() == null ? "" : list.get(i).getCardNumber();
temp.flow=list.get(i).getCurFlow()==null ? BigDecimal.valueOf(0) :list.get(i).getCurFlow(); temp.flow=list.get(i).getCurFlow()==null ? BigDecimal.valueOf(0) :list.get(i).getCurFlow();
temp.startTime=list.get(i).getStartTime()==null ? null : list.get(i).getStartTime(); temp.startTime=list.get(i).getStartTime()==null ? null : list.get(i).getStartTime();
@ -94,8 +110,15 @@ public class UserIrrigationRecordServiceImpl implements IUserIrrigationRecordSer
{ {
UserIrrigationRecordDto temp=new UserIrrigationRecordDto(); UserIrrigationRecordDto temp=new UserIrrigationRecordDto();
temp.id=list.get(i).getId(); temp.id=list.get(i).getId();
temp.userName= sysUserMapper.selectUserById(list.get(i).getUserId()).getUserName(); if(list.get(i).getUserId()!=null)
temp.deviceName=ngIrrigationControllersMapper.selectNgIrrigationControllersBySerialNumber(list.get(i).getDeviceNumber()).getControllerName(); {
temp.userName= sysUserMapper.selectUserById(list.get(i).getUserId()).getUserName();
}
if(list.get(i).getDeviceNumber()!=null)
{
temp.deviceName=ngIrrigationControllersMapper.selectNgIrrigationControllersBySerialNumber(list.get(i).getDeviceNumber()).getControllerName();
}
temp.cardNumber=list.get(i).getCardNumber(); temp.cardNumber=list.get(i).getCardNumber();
temp.flow=list.get(i).getCurFlow(); temp.flow=list.get(i).getCurFlow();
temp.startTime=list.get(i).getStartTime(); temp.startTime=list.get(i).getStartTime();