Merge remote-tracking branch 'origin/master'

This commit is contained in:
mi9688
2024-12-19 16:06:38 +08:00
26 changed files with 1581 additions and 24 deletions

View File

@ -0,0 +1,110 @@
package com.fastbee.data.controller.userRecharge;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fastbee.common.annotation.Log;
import com.fastbee.common.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.enums.BusinessType;
import com.fastbee.rechargecard.domain.NgRechargeMachines;
import com.fastbee.rechargecard.service.INgRechargeMachinesService;
import com.fastbee.common.utils.poi.ExcelUtil;
import com.fastbee.common.core.page.TableDataInfo;
/**
* 充值机信息Controller
*
* @author kerwincui
* @date 2024-12-19
*/
@RestController
@RequestMapping("/rechargecard/machines")
@Api(tags = "充值机信息")
public class NgRechargeMachinesController extends BaseController
{
@Autowired
private INgRechargeMachinesService ngRechargeMachinesService;
/**
* 查询充值机信息列表
*/
@PreAuthorize("@ss.hasPermi('rechargecard:machines:list')")
@GetMapping("/list")
@ApiOperation("查询充值机信息列表")
public TableDataInfo list(NgRechargeMachines ngRechargeMachines)
{
startPage();
List<NgRechargeMachines> list = ngRechargeMachinesService.selectNgRechargeMachinesList(ngRechargeMachines);
return getDataTable(list);
}
/**
* 导出充值机信息列表
*/
@ApiOperation("导出充值机信息列表")
@PreAuthorize("@ss.hasPermi('rechargecard:machines:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, NgRechargeMachines ngRechargeMachines)
{
List<NgRechargeMachines> list = ngRechargeMachinesService.selectNgRechargeMachinesList(ngRechargeMachines);
ExcelUtil<NgRechargeMachines> util = new ExcelUtil<NgRechargeMachines>(NgRechargeMachines.class);
util.exportExcel(response, list, "充值机信息数据");
}
/**
* 获取充值机信息详细信息
*/
@PreAuthorize("@ss.hasPermi('rechargecard:machines:query')")
@GetMapping(value = "/{id}")
@ApiOperation("获取充值机信息详细信息")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(ngRechargeMachinesService.selectNgRechargeMachinesById(id));
}
/**
* 新增充值机信息
*/
@PreAuthorize("@ss.hasPermi('rechargecard:machines:add')")
@PostMapping
@ApiOperation("新增充值机信息")
public AjaxResult add(@RequestBody NgRechargeMachines ngRechargeMachines)
{
return toAjax(ngRechargeMachinesService.insertNgRechargeMachines(ngRechargeMachines));
}
/**
* 修改充值机信息
*/
@PreAuthorize("@ss.hasPermi('rechargecard:machines:edit')")
@PutMapping
@ApiOperation("修改充值机信息")
public AjaxResult edit(@RequestBody NgRechargeMachines ngRechargeMachines)
{
return toAjax(ngRechargeMachinesService.updateNgRechargeMachines(ngRechargeMachines));
}
/**
* 删除充值机信息
*/
@PreAuthorize("@ss.hasPermi('rechargecard:machines:remove')")
@DeleteMapping("/{ids}")
@ApiOperation("删除充值机信息")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(ngRechargeMachinesService.deleteNgRechargeMachinesByIds(ids));
}
}

View File

@ -0,0 +1,110 @@
package com.fastbee.data.controller.userRecharge;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fastbee.common.annotation.Log;
import com.fastbee.common.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.enums.BusinessType;
import com.fastbee.rechargecard.domain.NgUrbanMuRights;
import com.fastbee.rechargecard.service.INgUrbanMuRightsService;
import com.fastbee.common.utils.poi.ExcelUtil;
import com.fastbee.common.core.page.TableDataInfo;
/**
* 城镇亩均确权Controller
*
* @author kerwincui
* @date 2024-12-19
*/
@RestController
@RequestMapping("/rechargecard/rights")
@Api(tags = "城镇亩均确权")
public class NgUrbanMuRightsController extends BaseController
{
@Autowired
private INgUrbanMuRightsService ngUrbanMuRightsService;
/**
* 查询城镇亩均确权列表
*/
@PreAuthorize("@ss.hasPermi('rechargecard:rights:list')")
@GetMapping("/list")
@ApiOperation("查询城镇亩均确权列表")
public TableDataInfo list(NgUrbanMuRights ngUrbanMuRights)
{
startPage();
List<NgUrbanMuRights> list = ngUrbanMuRightsService.selectNgUrbanMuRightsList(ngUrbanMuRights);
return getDataTable(list);
}
/**
* 导出城镇亩均确权列表
*/
@ApiOperation("导出城镇亩均确权列表")
@PreAuthorize("@ss.hasPermi('rechargecard:rights:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, NgUrbanMuRights ngUrbanMuRights)
{
List<NgUrbanMuRights> list = ngUrbanMuRightsService.selectNgUrbanMuRightsList(ngUrbanMuRights);
ExcelUtil<NgUrbanMuRights> util = new ExcelUtil<NgUrbanMuRights>(NgUrbanMuRights.class);
util.exportExcel(response, list, "城镇亩均确权数据");
}
/**
* 获取城镇亩均确权详细信息
*/
@PreAuthorize("@ss.hasPermi('rechargecard:rights:query')")
@GetMapping(value = "/{muRightsId}")
@ApiOperation("获取城镇亩均确权详细信息")
public AjaxResult getInfo(@PathVariable("muRightsId") Long muRightsId)
{
return success(ngUrbanMuRightsService.selectNgUrbanMuRightsByMuRightsId(muRightsId));
}
/**
* 新增城镇亩均确权
*/
@PreAuthorize("@ss.hasPermi('rechargecard:rights:add')")
@PostMapping
@ApiOperation("新增城镇亩均确权")
public AjaxResult add(@RequestBody NgUrbanMuRights ngUrbanMuRights)
{
return toAjax(ngUrbanMuRightsService.insertNgUrbanMuRights(ngUrbanMuRights));
}
/**
* 修改城镇亩均确权
*/
@PreAuthorize("@ss.hasPermi('rechargecard:rights:edit')")
@PutMapping
@ApiOperation("修改城镇亩均确权")
public AjaxResult edit(@RequestBody NgUrbanMuRights ngUrbanMuRights)
{
return toAjax(ngUrbanMuRightsService.updateNgUrbanMuRights(ngUrbanMuRights));
}
/**
* 删除城镇亩均确权
*/
@PreAuthorize("@ss.hasPermi('rechargecard:rights:remove')")
@DeleteMapping("/{muRightsIds}")
@ApiOperation("删除城镇亩均确权")
public AjaxResult remove(@PathVariable Long[] muRightsIds)
{
return toAjax(ngUrbanMuRightsService.deleteNgUrbanMuRightsByMuRightsIds(muRightsIds));
}
}

View File

@ -0,0 +1,110 @@
package com.fastbee.data.controller.userRecharge;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fastbee.common.annotation.Log;
import com.fastbee.common.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.enums.BusinessType;
import com.fastbee.rechargecard.domain.NgUserRechargeRecords;
import com.fastbee.rechargecard.service.INgUserRechargeRecordsService;
import com.fastbee.common.utils.poi.ExcelUtil;
import com.fastbee.common.core.page.TableDataInfo;
/**
* 用户充值记录Controller
*
* @author kerwincui
* @date 2024-12-19
*/
@RestController
@RequestMapping("/rechargecard/records")
@Api(tags = "用户充值记录")
public class NgUserRechargeRecordsController extends BaseController
{
@Autowired
private INgUserRechargeRecordsService ngUserRechargeRecordsService;
/**
* 查询用户充值记录列表
*/
@PreAuthorize("@ss.hasPermi('rechargecard:records:list')")
@GetMapping("/list")
@ApiOperation("查询用户充值记录列表")
public TableDataInfo list(NgUserRechargeRecords ngUserRechargeRecords)
{
startPage();
List<NgUserRechargeRecords> list = ngUserRechargeRecordsService.selectNgUserRechargeRecordsList(ngUserRechargeRecords);
return getDataTable(list);
}
/**
* 导出用户充值记录列表
*/
@ApiOperation("导出用户充值记录列表")
@PreAuthorize("@ss.hasPermi('rechargecard:records:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, NgUserRechargeRecords ngUserRechargeRecords)
{
List<NgUserRechargeRecords> list = ngUserRechargeRecordsService.selectNgUserRechargeRecordsList(ngUserRechargeRecords);
ExcelUtil<NgUserRechargeRecords> util = new ExcelUtil<NgUserRechargeRecords>(NgUserRechargeRecords.class);
util.exportExcel(response, list, "用户充值记录数据");
}
/**
* 获取用户充值记录详细信息
*/
@PreAuthorize("@ss.hasPermi('rechargecard:records:query')")
@GetMapping(value = "/{userId}")
@ApiOperation("获取用户充值记录详细信息")
public AjaxResult getInfo(@PathVariable("userId") Long userId)
{
return success(ngUserRechargeRecordsService.selectNgUserRechargeRecordsById(userId));
}
/**
* 新增用户充值记录
*/
@PreAuthorize("@ss.hasPermi('rechargecard:records:add')")
@PostMapping
@ApiOperation("新增用户充值记录")
public AjaxResult add(@RequestBody NgUserRechargeRecords ngUserRechargeRecords)
{
return toAjax(ngUserRechargeRecordsService.insertNgUserRechargeRecords(ngUserRechargeRecords));
}
/**
* 修改用户充值记录
*/
@PreAuthorize("@ss.hasPermi('rechargecard:records:edit')")
@PutMapping
@ApiOperation("修改用户充值记录")
public AjaxResult edit(@RequestBody NgUserRechargeRecords ngUserRechargeRecords)
{
return toAjax(ngUserRechargeRecordsService.updateNgUserRechargeRecords(ngUserRechargeRecords));
}
/**
* 删除用户充值记录
*/
@PreAuthorize("@ss.hasPermi('rechargecard:records:remove')")
@DeleteMapping("/{ids}")
@ApiOperation("删除用户充值记录")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(ngUserRechargeRecordsService.deleteNgUserRechargeRecordsByIds(ids));
}
}

View File

@ -65,13 +65,13 @@ public class UserIrrigationRecordController extends BaseController
/**
* 获取用户灌溉记录展示详细信息列表
*/
@PreAuthorize("@ss.hasPermi('rechargecard:record:query')")
/*@PreAuthorize("@ss.hasPermi('rechargecard:record:query')")
@GetMapping(value = "/list/show/{cardNumber}")
@ApiOperation("获取灌溉记录详细信息")
public AjaxResult getShowInfo(@PathVariable("cardNumber") String cardNumber)
{
return success(userIrrigationRecordService.selectUserIrrigationRecordListShowBycardNumber(cardNumber));
}
}*/
/**
* 导出灌溉记录列表