bonus
/
gz_digital_signage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.0.75:3000/bonus/gz_digital_signage

This commit is contained in:
BianLzhaoMin 2025-04-30 10:36:30 +08:00
parent 4834cb7faf d8c7fb4dbc
commit f24efc7e33
12 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/bonus/digitalSignage/basic/controller/TbCablewaTransController.java
View File

@ -39,7 +39,7 @@ public class TbCablewaTransController {
@DecryptAndVerify(decryptedClass = TbCablewaTransVo.class)//加解密统一管理
@LogAnnotation(operModul = "杆塔管理-查询列表", operation = "查询列表", operDesc = "系统级事件",operType="查询")
public ServerResponse getTbTowerList(EncryptedReq<TbCablewaTransVo> dto) {
PageHelper.startPage(dto.getData().getPageNum(), dto.getData().getPageSize());
PageHelper.startPage(dto.getData().getPage(), dto.getData().getLimit());
return tbCablewaTransService.tbCablewaTransList(dto.getData());
}

2
src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java
View File

@ -39,7 +39,7 @@ public class TbProjectController {
@DecryptAndVerify(decryptedClass = TbProjectVo.class)//加解密统一管理
@LogAnnotation(operModul = "基础管理-线路工程管理", operation = "查询列表", operDesc = "系统级事件",operType="查询")
public ServerResponse getTbProjectList(EncryptedReq<TbProjectVo> dto) {
PageHelper.startPage(dto.getData().getPage(), dto.getData().getLimit());
return tbProjectService.getTbProjectList(dto.getData());
}

2
src/main/java/com/bonus/digitalSignage/basic/controller/TbThreeSpanController.java
View File

@ -39,7 +39,7 @@ public class TbThreeSpanController {
@DecryptAndVerify(decryptedClass = TbThreeSpanVo.class)//加解密统一管理
@LogAnnotation(operModul = "三跨管理-查询列表", operation = "查询列表", operDesc = "系统级事件",operType="查询")
public ServerResponse getTbThreeSpanList(EncryptedReq<TbThreeSpanVo> dto) {
PageHelper.startPage(dto.getData().getPageNum(), dto.getData().getPageSize());
PageHelper.startPage(dto.getData().getPage(), dto.getData().getLimit());
return tbThreeSpanService.getTbThreeSpanList(dto.getData());
}

2
src/main/java/com/bonus/digitalSignage/basic/controller/TbTowerController.java
View File

@ -41,7 +41,7 @@ public class TbTowerController {
@DecryptAndVerify(decryptedClass = TbTowerVo.class)//加解密统一管理
@LogAnnotation(operModul = "杆塔管理-查询列表", operation = "查询列表", operDesc = "系统级事件",operType="查询")
public ServerResponse getTbTowerList(EncryptedReq<TbTowerVo> dto) {
PageHelper.startPage(dto.getData().getPageNum(), dto.getData().getPageSize());
PageHelper.startPage(dto.getData().getPage(), dto.getData().getLimit());
return tbTowerService.getTbTowerList(dto.getData());
}

2
src/main/java/com/bonus/digitalSignage/basic/service/impl/TbCablewaTransServiceImpl.java
View File

@ -34,7 +34,7 @@ public class TbCablewaTransServiceImpl implements TbCablewaTransService {
try {
List<TbCablewaTransVo> tbCablewaTransVoList = tbCablewaTransMapper.tbCablewaTransList(data);
PageInfo<TbCablewaTransVo> pageInfo = new PageInfo<>(tbCablewaTransVoList);
return ServerResponse.createSuccessPage(pageInfo, data.getPageNum(), data.getPageSize());
return ServerResponse.createSuccessPage(pageInfo, data.getPage(), data.getLimit());
} catch (Exception e) {
log.error(e.toString(), e);
return ServerResponse.createErroe("索道运输-查询列表失败");

3
src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java
View File

@ -55,7 +55,6 @@ public class TbProjectServiceImpl implements TbProjectService {
List<Long> deptIds = UserUtil.getLoginUser().getDeparts();
//List<Long> deptIds = tbProjectMapper.getDataAuthByDeptId(deptId);
data.setDeptIds(deptIds);
PageHelper.startPage(data.getPageNum(), data.getPageSize());
//获取工程列表
List<TbProjectVo> tbProjectVoList = tbProjectMapper.getTbProjectList(data);
TbTowerVo tbTowerVo = new TbTowerVo();
@ -78,7 +77,7 @@ public class TbProjectServiceImpl implements TbProjectService {
}
}
PageInfo<TbProjectVo> pageInfo = new PageInfo<>(tbProjectVoList);
return ServerResponse.createSuccessPage(pageInfo, data.getPageNum(), data.getPageSize());
return ServerResponse.createSuccessPage(pageInfo, data.getPage(), data.getLimit());
} catch (Exception e) {
log.error(e.toString(), e);
return ServerResponse.createErroe("线路工程管理-查询列表失败");

2
src/main/java/com/bonus/digitalSignage/basic/service/impl/TbThreeSpanServiceImpl.java
View File

@ -48,7 +48,7 @@ public class TbThreeSpanServiceImpl implements TbThreeSpanService {
}
}
PageInfo<TbThreeSpanVo> pageInfo = new PageInfo<>(tbThreeSpanVoList);
return ServerResponse.createSuccessPage(pageInfo, data.getPageNum(), data.getPageSize());
return ServerResponse.createSuccessPage(pageInfo, data.getPage(), data.getLimit());
} catch (Exception e) {
log.error(e.toString(), e);
return ServerResponse.createErroe("三跨管理-查询列表失败");

2
src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java
View File

@ -34,7 +34,7 @@ public class TbTowerServiceImpl implements TbTowerService {
try {
List<TbTowerVo> tbTowerVoList = tbTowerMapper.getTbProjectList(data);
PageInfo<TbTowerVo> pageInfo = new PageInfo<>(tbTowerVoList);
return ServerResponse.createSuccessPage(pageInfo, data.getPageNum(), data.getPageSize());
return ServerResponse.createSuccessPage(pageInfo, data.getPage(), data.getLimit());
} catch (Exception e) {
log.error(e.toString(), e);
return ServerResponse.createErroe("杆塔管理-查询列表失败");

4
src/main/java/com/bonus/digitalSignage/basic/vo/TbCablewaTransVo.java
View File

@ -87,6 +87,6 @@ public class TbCablewaTransVo {
*/
private String keyWord;
private int pageNum = 1;
private int pageSize = 10;
private int page = 1;
private int limit = 10;
}

4
src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java
View File

@ -137,6 +137,6 @@ public class TbProjectVo {
*/
private List<TbCablewaTransVo> tbCablewaTransVoList;
private int pageNum = 1;
private int pageSize = 10;
private int page = 1;
private int limit = 10;
}

4
src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java
View File

@ -134,6 +134,6 @@ public class TbThreeSpanVo {
*/
private String keyWord;
private int pageNum = 1;
private int pageSize = 10;
private int page = 1;
private int limit = 10;
}

4
src/main/java/com/bonus/digitalSignage/basic/vo/TbTowerVo.java
View File

@ -103,6 +103,6 @@ public class TbTowerVo {
*/
private Long updateUserId;
private int pageNum = 1;
private int pageSize = 10;
private int page = 1;
private int limit = 10;
}