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

Merge branch 'schedule' of http://localhost:2080/git/xymp/backend into schedule

Browse Source
dev
liuguijing 1 year ago
parent 3d18e5bd70 0320bc934c
commit 06520e2830
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File

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

@ -53,14 +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,
Integer isonline, Integer protocol, Integer devType,
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,
isonline, protocol, devType,
pageNum, pageSize);
if (!CollectionUtils.isEmpty(result.getList())) {
for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
@ -83,12 +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 isonline, Integer protocol, Integer devType,
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,
isonline, protocol, devType,
pageNum, pageSize);
if (!CollectionUtils.isEmpty(result.getList())) {
for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
@ -103,14 +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,
Integer isonline, Integer protocol, Integer devType,
@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,
isonline, protocol, devType,
pageNum, pageSize);
if (!CollectionUtils.isEmpty(result.getList())) {
for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
@ -124,12 +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 isonline, Integer protocol, Integer devType,
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,
isonline, protocol, devType,
pageNum, pageSize);
if (!CollectionUtils.isEmpty(result.getList())) {
for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
@ -145,12 +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 isonline, Integer protocol, Integer devType,
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,
isonline, protocol, devType,
pageNum, pageSize);
if (!CollectionUtils.isEmpty(result.getList())) {
for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
@ -171,7 +171,7 @@ 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 isonline, Integer protocol, Integer devType,
Integer pageNum, Integer pageSize) {
TerminalSelectVo vo = new TerminalSelectVo();
vo.setDyId(dyId);
@ -180,6 +180,7 @@ public class TerminalExtController extends BaseController {
vo.setSearch(search);
vo.setIsonline(isonline);
vo.setProtocol(protocol);
vo.setDevType(devType);
vo.setPageindex(pageNum);
vo.setPagesize(pageSize);
TableDataInfo<View_Dy_Line_Tower_Terminals> result = terminalService.getTerminalList(vo).getData();

9
xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalSelectVo.java
Unescape Escape View File

@ -24,17 +24,20 @@ public class TerminalSelectVo {
@ApiModelProperty(value = "搜索内容", example = "搜索内容")
private String search;
@ApiModelProperty(value = "在线离线", example = "0--掉线 1--在线")
@ApiModelProperty(value = "在线离线", example = "")
private Integer isonline;
@ApiModelProperty(value = "在线离线", example = "0--掉线 1--在线")
@ApiModelProperty(value = "规约", example = "")
private Integer protocol;
@ApiModelProperty(value = "设备类型", example = "")
private Integer devType;
@Min(value = 1, message = "分页位置最小从1开始")
@ApiModelProperty(value = "分页位置从1开始", required = true, example = "1")
private int pageindex;
@Min(value = 1, message = "分页大小最小为1")
@ApiModelProperty(value = "分页大小", required = true, example = "1")
@ApiModelProperty(value = "分页大小", required = true, example = "10")
private int pagesize;
}

3
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java
Unescape Escape View File

@ -191,6 +191,9 @@ public class TerminalServiceImpl implements TerminalService {
View_Dy_Line_Tower_TerminalsExample.Criteria or2 = example.or();
or2.andProtocolEqualTo(protocolsearch);
}
if (vo.getDevType() != null) {
example.or().andDevTypeLike("%" + vo.getDevType() + "%");
}
int pageindex = vo.getPageindex();
int pagesize = vo.getPagesize();
PageUtils.SetPage(pageindex, pagesize);

Write Preview
Loading…
Cancel
Save