xymp
/
backend
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 查询增加参数

Browse Source
dev
huangfeng 1 year ago
parent 5b91a516ad
commit 9b6ae38295
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File

13
xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java
Unescape Escape View File

@ -53,12 +53,14 @@ public class TerminalExtController extends BaseController {
@GetMapping("listWithAll") @GetMapping("listWithAll")
@ApiOperation("查询附带全部额外信息") @ApiOperation("查询附带全部额外信息")
public ResponseReult<TableDataInfo<View_Dy_Line_Tower_Terminals>> listWithAll(Integer dyId, Integer lineId, Integer towerId, String search, public ResponseReult<TableDataInfo<View_Dy_Line_Tower_Terminals>> listWithAll(Integer dyId, Integer lineId, Integer towerId, String search,
Integer isonline, Integer protocol,
Long start, Long end, Long start, Long end,
Integer channelId, Integer channelId,
Integer pageNum, Integer pageSize) { Integer pageNum, Integer pageSize) {
pageNum = this.initPageNum(pageNum); pageNum = this.initPageNum(pageNum);
pageSize = this.initPageSize(pageSize); pageSize = this.initPageSize(pageSize);
TableDataInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search, TableDataInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search,
isonline,protocol,
pageNum, pageSize); pageNum, pageSize);
if (!CollectionUtils.isEmpty(result.getList())) { if (!CollectionUtils.isEmpty(result.getList())) {
for (View_Dy_Line_Tower_Terminals terminal : result.getList()) { for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
@ -81,10 +83,12 @@ public class TerminalExtController extends BaseController {
@GetMapping("listWithGPS") @GetMapping("listWithGPS")
@ApiOperation("查询附带定位") @ApiOperation("查询附带定位")
public ResponseReult<TableDataInfo<View_Dy_Line_Tower_Terminals>> listWithGPS(Integer dyId, Integer lineId, Integer towerId, String search, public ResponseReult<TableDataInfo<View_Dy_Line_Tower_Terminals>> listWithGPS(Integer dyId, Integer lineId, Integer towerId, String search,
Integer isonline, Integer protocol,
Integer pageNum, Integer pageSize) { Integer pageNum, Integer pageSize) {
pageNum = this.initPageNum(pageNum); pageNum = this.initPageNum(pageNum);
pageSize = this.initPageSize(pageSize); pageSize = this.initPageSize(pageSize);
TableDataInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search, TableDataInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search,
isonline,protocol,
pageNum, pageSize); pageNum, pageSize);
if (!CollectionUtils.isEmpty(result.getList())) { if (!CollectionUtils.isEmpty(result.getList())) {
for (View_Dy_Line_Tower_Terminals terminal : result.getList()) { for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
@ -99,12 +103,14 @@ public class TerminalExtController extends BaseController {
@GetMapping("listWithPhoto") @GetMapping("listWithPhoto")
@ApiOperation("查询附带图片统计") @ApiOperation("查询附带图片统计")
public ResponseReult<TableDataInfo<View_Dy_Line_Tower_Terminals>> listWithPhoto(Integer dyId, Integer lineId, Integer towerId, String search, public ResponseReult<TableDataInfo<View_Dy_Line_Tower_Terminals>> listWithPhoto(Integer dyId, Integer lineId, Integer towerId, String search,
Integer isonline, Integer protocol,
@NotNull(message = "start不能为空!") Long start, @NotNull(message = "end不能为空!") Long end, @NotNull(message = "start不能为空!") Long start, @NotNull(message = "end不能为空!") Long end,
Integer channelId, Integer channelId,
Integer pageNum, Integer pageSize) { Integer pageNum, Integer pageSize) {
pageNum = this.initPageNum(pageNum); pageNum = this.initPageNum(pageNum);
pageSize = this.initPageSize(pageSize); pageSize = this.initPageSize(pageSize);
TableDataInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search, TableDataInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search,
isonline,protocol,
pageNum, pageSize); pageNum, pageSize);
if (!CollectionUtils.isEmpty(result.getList())) { if (!CollectionUtils.isEmpty(result.getList())) {
for (View_Dy_Line_Tower_Terminals terminal : result.getList()) { for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
@ -118,10 +124,12 @@ public class TerminalExtController extends BaseController {
@GetMapping("listWithWeather") @GetMapping("listWithWeather")
@ApiOperation("查询附带天气") @ApiOperation("查询附带天气")
public ResponseReult<TableDataInfo<View_Dy_Line_Tower_Terminals>> listWithWeather(Integer dyId, Integer lineId, Integer towerId, String search, public ResponseReult<TableDataInfo<View_Dy_Line_Tower_Terminals>> listWithWeather(Integer dyId, Integer lineId, Integer towerId, String search,
Integer isonline, Integer protocol,
Integer pageNum, Integer pageSize) { Integer pageNum, Integer pageSize) {
pageNum = this.initPageNum(pageNum); pageNum = this.initPageNum(pageNum);
pageSize = this.initPageSize(pageSize); pageSize = this.initPageSize(pageSize);
TableDataInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search, TableDataInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search,
isonline,protocol,
pageNum, pageSize); pageNum, pageSize);
if (!CollectionUtils.isEmpty(result.getList())) { if (!CollectionUtils.isEmpty(result.getList())) {
for (View_Dy_Line_Tower_Terminals terminal : result.getList()) { for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
@ -137,10 +145,12 @@ public class TerminalExtController extends BaseController {
@GetMapping("listWithLeadPull") @GetMapping("listWithLeadPull")
@ApiOperation("查询附带拉力") @ApiOperation("查询附带拉力")
public ResponseReult<TableDataInfo<View_Dy_Line_Tower_Terminals>> listWithLeadPull(Integer dyId, Integer lineId, Integer towerId, String search, public ResponseReult<TableDataInfo<View_Dy_Line_Tower_Terminals>> listWithLeadPull(Integer dyId, Integer lineId, Integer towerId, String search,
Integer isonline, Integer protocol,
Integer pageNum, Integer pageSize) { Integer pageNum, Integer pageSize) {
pageNum = this.initPageNum(pageNum); pageNum = this.initPageNum(pageNum);
pageSize = this.initPageSize(pageSize); pageSize = this.initPageSize(pageSize);
TableDataInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search, TableDataInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search,
isonline,protocol,
pageNum, pageSize); pageNum, pageSize);
if (!CollectionUtils.isEmpty(result.getList())) { if (!CollectionUtils.isEmpty(result.getList())) {
for (View_Dy_Line_Tower_Terminals terminal : result.getList()) { for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
@ -161,12 +171,15 @@ public class TerminalExtController extends BaseController {
} }
private TableDataInfo<View_Dy_Line_Tower_Terminals> getTerminalPage(Integer dyId, Integer lineId, Integer towerId, String search, private TableDataInfo<View_Dy_Line_Tower_Terminals> getTerminalPage(Integer dyId, Integer lineId, Integer towerId, String search,
Integer isonline, Integer protocol,
Integer pageNum, Integer pageSize) { Integer pageNum, Integer pageSize) {
TerminalSelectVo vo = new TerminalSelectVo(); TerminalSelectVo vo = new TerminalSelectVo();
vo.setDyId(dyId); vo.setDyId(dyId);
vo.setLineId(lineId); vo.setLineId(lineId);
vo.setTowerId(towerId); vo.setTowerId(towerId);
vo.setSearch(search); vo.setSearch(search);
vo.setIsonline(isonline);
vo.setProtocol(protocol);
vo.setPageindex(pageNum); vo.setPageindex(pageNum);
vo.setPagesize(pageSize); vo.setPagesize(pageSize);
TableDataInfo<View_Dy_Line_Tower_Terminals> result = terminalService.getTerminalList(vo).getData(); TableDataInfo<View_Dy_Line_Tower_Terminals> result = terminalService.getTerminalList(vo).getData();

Write Preview
Loading…
Cancel
Save