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

修改 用户充值记录、刷卡记录、灌溉记录接口

Browse Source
This commit is contained in:
ALEI_ALEI
2024-12-20 17:23:44 +08:00
parent c925f0ea99
commit 27e86b32fa
15 changed files with 267 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgUserRechargeRecordsController.java
View File

@ -68,13 +68,31 @@ public class NgUserRechargeRecordsController extends BaseController
* 获取用户充值记录详细信息
*/
// @PreAuthorize("@ss.hasPermi('rechargecard:records:query')")
@GetMapping(value = "/{userId}")
@GetMapping(value = "/user")
@ApiOperation("获取用户充值记录详细信息")
public AjaxResult getInfo(@PathVariable("userId") Long userId)
public TableDataInfo getInfo(NgUserRechargeRecords ngUserRechargeRecords)
{
return success(ngUserRechargeRecordsService.selectNgUserRechargeRecordsById(userId));
startPage();
List<NgUserRechargeRecords> list = ngUserRechargeRecordsService.selectNgUserRechargeRecordsByCardNumber(ngUserRechargeRecords);
return getDataTable(list);
}
/**
* 获取充值机充值记录详细信息
*/
// @PreAuthorize("@ss.hasPermi('rechargecard:records:query')")
/*@GetMapping(value = "/serial/{serialNumber}")*/
@GetMapping(value = "/serial")
@ApiOperation("获取充值机充值记录详细信息")
public TableDataInfo getSerialInfo(NgUserRechargeRecords ngUserRechargeRecords)
{
startPage();
List<NgUserRechargeRecords> list = ngUserRechargeRecordsService.selectNgUserRechargeRecordsBySerialNumber(ngUserRechargeRecords);
return getDataTable(list);
}
/**
* 新增用户充值记录
*/

13
fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserConsumptionDetailsController.java
View File

@ -63,6 +63,7 @@ public class UserConsumptionDetailsController extends BaseController
return getDataTable(list);
}
/**
* 导出用户充值卡账单明细记录列表
*/
@ -76,14 +77,16 @@ public class UserConsumptionDetailsController extends BaseController
}
/**
* 获取用户充值卡账单明细记录详细信息列表
* 获取单用户刷卡详细信息
*/
@GetMapping(value = "/list/{cardNumber}")
@ApiOperation("获取用户充值卡账单明细记录详细信息列表")
public AjaxResult getInfo(@PathVariable("cardNumber") String cardNumber)
@GetMapping(value = "/list/show/swip")
@ApiOperation("获取单用户刷卡记录详细信息展示列表")
public TableDataInfo getInfo(UserConsumptionDetails userConsumptionDetails)
{
//return success(userConsumptionDetailsService.selectUserConsumptionDetailsById(cardNumber));
return success(userConsumptionDetailsService.selectUserConsumptionDetailsListById(cardNumber));
startPage();
List<UserConsumptionDetailsDto> list = userConsumptionDetailsService.selectUserConsumptionDetailsListByCardNumber(userConsumptionDetails);
return getDataTable(list);
}
/**

32
fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserIrrigationRecordController.java
View File

@ -3,6 +3,7 @@ package com.fastbee.data.controller.userRecharge;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.fastbee.rechargecard.domain.UserConsumptionDetails;
import com.fastbee.rechargecard.domain.dto.UserIrrigationRecordDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -64,7 +65,7 @@ public class UserIrrigationRecordController extends BaseController
}
/**
* 获取用户灌溉记录展示详细信息列表
* 获取全部灌溉记录展示详细信息列表
*/
// @PreAuthorize("@ss.hasPermi('rechargecard:record:list')")
@GetMapping("/list/show")
@ -75,20 +76,33 @@ public class UserIrrigationRecordController extends BaseController
List<UserIrrigationRecordDto> list = userIrrigationRecordService.selectUserIrrigationRecordShowList(userIrrigationRecord);
return getDataTable(list);
}
/**
* 获取用户灌溉记录展示详细信息列表
*/
/*@PreAuthorize("@ss.hasPermi('rechargecard:record:list')")
@GetMapping("/list/show/{cardNumber}")
@ApiOperation("查询灌溉记录列表")
public TableDataInfo ShowlistByCardNumber(@PathVariable("cardNumber") String cardNumber)
// @PreAuthorize("@ss.hasPermi('rechargecard:record:list')")
@GetMapping("/list/show/user")
@ApiOperation("查询用户灌溉记录列表")
public TableDataInfo ShowlistByCardNumber(UserIrrigationRecord userIrrigationRecord)
{
startPage();
UserIrrigationRecord userIrrigationRecord=new UserIrrigationRecord();
userIrrigationRecord.setCardNumber(cardNumber);
List<UserIrrigationRecordDto> list = userIrrigationRecordService.selectUserIrrigationRecordShowList(userIrrigationRecord);
List<UserIrrigationRecordDto> list = userIrrigationRecordService.selectUserIrrigationRecordShowListByCardNumber(userIrrigationRecord);
return getDataTable(list);
}*/
}
/**
* 获取灌溉控制器灌溉记录展示详细信息列表
*/
// @PreAuthorize("@ss.hasPermi('rechargecard:record:list')")
@GetMapping("/list/device/{deviceNumber}")
@ApiOperation("查询灌溉控制器灌溉记录列表")
public TableDataInfo ShowlistByDeviceNumber(@PathVariable("deviceNumber") String deviceNumber)
{
startPage();
List<UserIrrigationRecord> list = userIrrigationRecordService.selectUserIrrigationRecordShowListByDeviceNumber(deviceNumber);
return getDataTable(list);
}
/**
* 导出灌溉记录列表