fix: 查询增加参数

dev
huangfeng 1 year ago
parent 5b91a516ad
commit 9b6ae38295

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

Loading…
Cancel
Save