Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

全局修改pageNum

Browse Source
This commit is contained in:
huangzj
2023-06-13 14:51:14 +08:00
parent 51df72fd78
commit ccb703f7d1
25 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectQueryParm.java
View File

@@ -19,8 +19,8 @@ public class AppProjectQueryParm {
@NotNull(message="当前页不能为空！") @NotNull(message="当前页不能为空！")
@Min(value = 1, message = "当前页不能为0") @Min(value = 1, message = "当前页不能为0")
@ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true) @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true)
private Integer currentPage; private Integer pageNum;
/**显示条数*/ /**显示条数*/
@NotNull(message="显示条数不能为空！") @NotNull(message="显示条数不能为空！")
@ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)

4
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppTopologyDiagramQueryPageParm.java
View File

@@ -19,8 +19,8 @@ public class AppTopologyDiagramQueryPageParm {
@NotNull(message="当前页不能为空！") @NotNull(message="当前页不能为空！")
@Min(value = 1, message = "当前页不能为0") @Min(value = 1, message = "当前页不能为0")
@ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true) @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true)
private Integer currentPage; private Integer pageNum;
/**显示条数*/ /**显示条数*/
@NotNull(message="显示条数不能为空！") @NotNull(message="显示条数不能为空！")
@ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)

4
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelQueryParm.java
View File

@@ -24,8 +24,8 @@ public class CsDevModelQueryParm {
@NotNull(message="当前页不能为空！") @NotNull(message="当前页不能为空！")
@Min(value = 1, message = "当前页不能为0") @Min(value = 1, message = "当前页不能为0")
@ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true) @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true)
private Integer currentPage; private Integer pageNum;
/**显示条数*/ /**显示条数*/
@NotNull(message="显示条数不能为空！") @NotNull(message="显示条数不能为空！")
@ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)

4
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAddParm.java
View File

@@ -54,8 +54,8 @@ public class CsEdDataAddParm {
* 版本日期 * 版本日期
*/ */
@ApiModelProperty(value = "版本日期") @ApiModelProperty(value = "版本日期")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date versionDate; private Date versionDate;
/** /**

4
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataQueryParm.java
View File

@@ -24,8 +24,8 @@ public class CsEdDataQueryParm {
@NotNull(message="当前页不能为空！") @NotNull(message="当前页不能为空！")
@Min(value = 1, message = "当前页不能为0") @Min(value = 1, message = "当前页不能为0")
@ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true) @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true)
private Integer currentPage; private Integer pageNum;
/**显示条数*/ /**显示条数*/
@NotNull(message="显示条数不能为空！") @NotNull(message="显示条数不能为空！")
@ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)

4
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEngineeringQueryPageParm.java
View File

@@ -19,8 +19,8 @@ public class CsEngineeringQueryPageParm {
@NotNull(message="当前页不能为空！") @NotNull(message="当前页不能为空！")
@Min(value = 1, message = "当前页不能为0") @Min(value = 1, message = "当前页不能为0")
@ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true) @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true)
private Integer currentPage; private Integer pageNum;
/**显示条数*/ /**显示条数*/
@NotNull(message="显示条数不能为空！") @NotNull(message="显示条数不能为空！")
@ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)

4
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentAlarmPageParm.java
View File

@@ -20,8 +20,8 @@ import java.time.LocalDateTime;
public class CsEquipmentAlarmPageParm { public class CsEquipmentAlarmPageParm {
@NotNull(message="当前页不能为空！") @NotNull(message="当前页不能为空！")
@Min(value = 1, message = "当前页不能为0") @Min(value = 1, message = "当前页不能为0")
@ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true) @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true)
private Integer currentPage; private Integer pageNum;
/**显示条数*/ /**显示条数*/
@NotNull(message="显示条数不能为空！") @NotNull(message="显示条数不能为空！")
@ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)

4
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/ProjectEquipmentQueryParm.java
View File

@@ -19,8 +19,8 @@ public class ProjectEquipmentQueryParm {
@NotNull(message="当前页不能为空！") @NotNull(message="当前页不能为空！")
@Min(value = 1, message = "当前页不能为0") @Min(value = 1, message = "当前页不能为0")
@ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true) @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true)
private Integer currentPage; private Integer pageNum;
/**显示条数*/ /**显示条数*/
@NotNull(message="显示条数不能为空！") @NotNull(message="显示条数不能为空！")
@ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)

4
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEdDataVO.java
View File

@@ -50,8 +50,8 @@ public class CsEdDataVO extends BaseEntity {
/** /**
* 版本日期 * 版本日期
*/ */
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty(value = "版本日期") @ApiModelProperty(value = "版本日期")
private Date versionDate; private Date versionDate;

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppProjectMapper.xml
View File

@@ -23,7 +23,7 @@
</sql> </sql>
<select id="getPageVo" resultType="com.njcn.csdevice.pojo.vo.AppProjectVO"> <select id="getPageVo" resultType="com.njcn.csdevice.pojo.vo.AppProjectVO">
select a.*,b.id as engineering_id,b.`Name` as engineering_name from cs_project a LEFT JOIN cs_ledger b on a.id = b.id where 1=1 select a.*,b.pid as engineering_id,(select name from cs_ledger c where c.id=b.pid) as engineering_name from cs_project a LEFT JOIN cs_ledger b on a.id = b.id where 1=1
and a.status ="1" and a.status ="1"
<if test="temp!=null and temp.projectId != null and temp.projectId !=''"> <if test="temp!=null and temp.projectId != null and temp.projectId !=''">
AND a.id = #{temp.projectId} AND a.id = #{temp.projectId}

4
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java
View File

@@ -141,7 +141,7 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
@Override @Override
public IPage<AppProjectVO> queryProject(AppProjectQueryParm appProjectQueryParm) { public IPage<AppProjectVO> queryProject(AppProjectQueryParm appProjectQueryParm) {
Page<AppProjectVO> returnpage = new Page<> (appProjectQueryParm.getCurrentPage ( ), appProjectQueryParm.getPageSize ( )); Page<AppProjectVO> returnpage = new Page<> (appProjectQueryParm.getPageNum ( ), appProjectQueryParm.getPageSize ( ));
returnpage = appProjectMapper.getPageVo (returnpage, appProjectQueryParm); returnpage = appProjectMapper.getPageVo (returnpage, appProjectQueryParm);
List<AppProjectVO> collect = returnpage.getRecords().stream().map(temp -> { List<AppProjectVO> collect = returnpage.getRecords().stream().map(temp -> {
AppTopologyDiagramQueryParm appTopologyDiagramQueryParm = new AppTopologyDiagramQueryParm(); AppTopologyDiagramQueryParm appTopologyDiagramQueryParm = new AppTopologyDiagramQueryParm();
@@ -152,7 +152,7 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
}).collect(Collectors.toList()); }).collect(Collectors.toList());
returnpage.setRecords(collect); returnpage.setRecords(collect);
// Page<AppProjectPO> appProjectPOPage = new Page<> (appProjectQueryParm.getCurrentPage ( ), appProjectQueryParm.getPageSize ( )); // Page<AppProjectPO> appProjectPOPage = new Page<> (appProjectQueryParm.getPageNum ( ), appProjectQueryParm.getPageSize ( ));
// QueryWrapper<AppProjectPO> queryWrapper = new QueryWrapper ( ); // QueryWrapper<AppProjectPO> queryWrapper = new QueryWrapper ( );
// queryWrapper.eq ("status", "1"). // queryWrapper.eq ("status", "1").
// eq (StringUtils.isNotBlank (appProjectQueryParm.getProjectId ( )), "id", appProjectQueryParm.getProjectId ( )). // eq (StringUtils.isNotBlank (appProjectQueryParm.getProjectId ( )), "id", appProjectQueryParm.getProjectId ( )).

4
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppTopologyDiagramServiceImpl.java
View File

@@ -115,8 +115,8 @@ public class AppTopologyDiagramServiceImpl extends ServiceImpl<AppTopologyDiagra
@Override @Override
public IPage<AppTopologyDiagramVO> queryTopologyDiagramPage(AppTopologyDiagramQueryPageParm appTopologyDiagramQueryPageParm) { public IPage<AppTopologyDiagramVO> queryTopologyDiagramPage(AppTopologyDiagramQueryPageParm appTopologyDiagramQueryPageParm) {
Page<AppTopologyDiagramVO> returnpage = new Page<> (appTopologyDiagramQueryPageParm.getCurrentPage ( ), appTopologyDiagramQueryPageParm.getPageSize ( )); Page<AppTopologyDiagramVO> returnpage = new Page<> (appTopologyDiagramQueryPageParm.getPageNum ( ), appTopologyDiagramQueryPageParm.getPageSize ( ));
Page<AppTopologyDiagramPO> tempPage = new Page<> (appTopologyDiagramQueryPageParm.getCurrentPage ( ), appTopologyDiagramQueryPageParm.getPageSize ( )); Page<AppTopologyDiagramPO> tempPage = new Page<> (appTopologyDiagramQueryPageParm.getPageNum ( ), appTopologyDiagramQueryPageParm.getPageSize ( ));
QueryWrapper<AppTopologyDiagramPO> queryWrapper = new QueryWrapper<> (); QueryWrapper<AppTopologyDiagramPO> queryWrapper = new QueryWrapper<> ();
queryWrapper.eq ("status","1"). queryWrapper.eq ("status","1").

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDevModelServiceImpl.java
View File

@@ -57,7 +57,7 @@ public class CsDevModelServiceImpl extends ServiceImpl<CsDevModelMapper, CsDevMo
@Override @Override
public IPage<CsDevModelPageVO> queryPage(CsDevModelQueryParm csDevModelQueryParm) { public IPage<CsDevModelPageVO> queryPage(CsDevModelQueryParm csDevModelQueryParm) {
Page<CsDevModelPageVO> returnpage = new Page<> (csDevModelQueryParm.getCurrentPage ( ), csDevModelQueryParm.getPageSize ( )); Page<CsDevModelPageVO> returnpage = new Page<> (csDevModelQueryParm.getPageNum ( ), csDevModelQueryParm.getPageSize ( ));
returnpage = this.getBaseMapper ().getPage(returnpage,csDevModelQueryParm); returnpage = this.getBaseMapper ().getPage(returnpage,csDevModelQueryParm);
return returnpage; return returnpage;

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEdDataServiceImpl.java
View File

@@ -64,7 +64,7 @@ public class CsEdDataServiceImpl extends ServiceImpl<CsEdDataMapper, CsEdDataPO>
@Override @Override
public IPage<CsEdDataVO> queryEdDataPage(CsEdDataQueryParm csEdDataQueryParm) { public IPage<CsEdDataVO> queryEdDataPage(CsEdDataQueryParm csEdDataQueryParm) {
Page<CsEdDataVO> returnpage = new Page<> (csEdDataQueryParm.getCurrentPage ( ), csEdDataQueryParm.getPageSize ( )); Page<CsEdDataVO> returnpage = new Page<> (csEdDataQueryParm.getPageNum ( ), csEdDataQueryParm.getPageSize ( ));
returnpage = this.getBaseMapper ().getPage(returnpage,csEdDataQueryParm); returnpage = this.getBaseMapper ().getPage(returnpage,csEdDataQueryParm);
return returnpage; return returnpage;

6
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java
View File

@@ -111,8 +111,8 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
@Override @Override
public IPage<CsEngineeringVO> queryEngineeringPage(CsEngineeringQueryPageParm csEngineeringQueryPageParm) { public IPage<CsEngineeringVO> queryEngineeringPage(CsEngineeringQueryPageParm csEngineeringQueryPageParm) {
Page<CsEngineeringPO> tempPage = new Page<> (csEngineeringQueryPageParm.getCurrentPage ( ), csEngineeringQueryPageParm.getPageSize ( )); Page<CsEngineeringPO> tempPage = new Page<> (csEngineeringQueryPageParm.getPageNum(), csEngineeringQueryPageParm.getPageSize ( ));
Page<CsEngineeringVO> returnPage = new Page<> (csEngineeringQueryPageParm.getCurrentPage ( ), csEngineeringQueryPageParm.getPageSize ( )); Page<CsEngineeringVO> returnPage = new Page<> (csEngineeringQueryPageParm.getPageNum ( ), csEngineeringQueryPageParm.getPageSize ( ));
QueryWrapper<CsEngineeringPO> queryWrapper = new QueryWrapper<> (); QueryWrapper<CsEngineeringPO> queryWrapper = new QueryWrapper<> ();
queryWrapper.eq (StringUtils.isNotBlank (csEngineeringQueryPageParm.getUserId ()),"user_id",csEngineeringQueryPageParm.getUserId ()). queryWrapper.eq (StringUtils.isNotBlank (csEngineeringQueryPageParm.getUserId ()),"user_id",csEngineeringQueryPageParm.getUserId ()).
@@ -136,7 +136,7 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
@Override @Override
public List<CsEngineeringPO> getEngineerings(List<String> list) { public List<CsEngineeringPO> getEngineerings(List<String> list) {
return this.lambdaQuery().in(CsEngineeringPO::getId,list).list(); return this.lambdaQuery().in(CsEngineeringPO::getId,list).eq(CsEngineeringPO::getStatus,"1").list();
} }

4
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentAlarmPOServiceImpl.java
View File

@@ -64,8 +64,8 @@ public class CsEquipmentAlarmPOServiceImpl extends ServiceImpl<CsEquipmentAlarmP
@Override @Override
public IPage<CsEquipmentAlarmVO> queryPage(CsEquipmentAlarmPageParm csEquipmentAlarmPageParm) { public IPage<CsEquipmentAlarmVO> queryPage(CsEquipmentAlarmPageParm csEquipmentAlarmPageParm) {
Page<CsEquipmentAlarmVO> returnpage = new Page<> (csEquipmentAlarmPageParm.getCurrentPage ( ), csEquipmentAlarmPageParm.getPageSize ( )); Page<CsEquipmentAlarmVO> returnpage = new Page<> (csEquipmentAlarmPageParm.getPageNum ( ), csEquipmentAlarmPageParm.getPageSize ( ));
Page<CsEquipmentAlarmPO> queryPage = new Page<> (csEquipmentAlarmPageParm.getCurrentPage ( ), csEquipmentAlarmPageParm.getPageSize ( )); Page<CsEquipmentAlarmPO> queryPage = new Page<> (csEquipmentAlarmPageParm.getPageNum ( ), csEquipmentAlarmPageParm.getPageSize ( ));
QueryWrapper<CsEquipmentAlarmPO> queryWrapper = new QueryWrapper<>(); QueryWrapper<CsEquipmentAlarmPO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("status", "1"); queryWrapper.eq("status", "1");
queryWrapper.eq(StringUtils.isNotBlank(csEquipmentAlarmPageParm.getProjectId()),CsEquipmentAlarmPO.COL_PROJECT_ID,csEquipmentAlarmPageParm.getProjectId()); queryWrapper.eq(StringUtils.isNotBlank(csEquipmentAlarmPageParm.getProjectId()),CsEquipmentAlarmPO.COL_PROJECT_ID,csEquipmentAlarmPageParm.getProjectId());

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
View File

@@ -86,7 +86,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
@Override @Override
public IPage<ProjectEquipmentVO> queryEquipmentByProject(ProjectEquipmentQueryParm projectEquipmentQueryParm) { public IPage<ProjectEquipmentVO> queryEquipmentByProject(ProjectEquipmentQueryParm projectEquipmentQueryParm) {
Page<ProjectEquipmentVO> returnpage = new Page<> (projectEquipmentQueryParm.getCurrentPage ( ), projectEquipmentQueryParm.getPageSize ( )); Page<ProjectEquipmentVO> returnpage = new Page<> (projectEquipmentQueryParm.getPageNum ( ), projectEquipmentQueryParm.getPageSize ( ));
Page<ProjectEquipmentVO> list = this.baseMapper.queryProjectEquipmentVO(returnpage,projectEquipmentQueryParm); Page<ProjectEquipmentVO> list = this.baseMapper.queryProjectEquipmentVO(returnpage,projectEquipmentQueryParm);

4
cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackQueryParm.java
View File

@@ -22,8 +22,8 @@ public class CsFeedbackQueryParm {
@NotNull(message="当前页不能为空！") @NotNull(message="当前页不能为空！")
@Min(value = 1, message = "当前页不能为0") @Min(value = 1, message = "当前页不能为0")
@ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true) @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true)
private Integer currentPage; private Integer pageNum;
/**显示条数*/ /**显示条数*/
@NotNull(message="显示条数不能为空！") @NotNull(message="显示条数不能为空！")
@ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)

4
cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java
View File

@@ -74,8 +74,8 @@ public class CsFeedbackServiceImpl extends ServiceImpl<CsFeedbackMapper, CsFeedb
@Override @Override
public IPage<CsFeedbackVO> queryFeedBackPage(CsFeedbackQueryParm csFeedbackQueryParm) { public IPage<CsFeedbackVO> queryFeedBackPage(CsFeedbackQueryParm csFeedbackQueryParm) {
Page<CsFeedbackPO> page = new Page<> (csFeedbackQueryParm.getCurrentPage ( ), csFeedbackQueryParm.getPageSize ( )); Page<CsFeedbackPO> page = new Page<> (csFeedbackQueryParm.getPageNum ( ), csFeedbackQueryParm.getPageSize ( ));
Page<CsFeedbackVO> returnpage = new Page<> (csFeedbackQueryParm.getCurrentPage ( ), csFeedbackQueryParm.getPageSize ( )); Page<CsFeedbackVO> returnpage = new Page<> (csFeedbackQueryParm.getPageNum ( ), csFeedbackQueryParm.getPageSize ( ));
QueryWrapper<CsFeedbackPO> queryWrapper = new QueryWrapper<> (); QueryWrapper<CsFeedbackPO> queryWrapper = new QueryWrapper<> ();
queryWrapper.eq ("user_id",csFeedbackQueryParm.getUserId ()). queryWrapper.eq ("user_id",csFeedbackQueryParm.getUserId ()).

4
cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEquipmentAlarmPageParm.java
View File

@@ -20,8 +20,8 @@ import java.time.LocalDateTime;
public class CsEquipmentAlarmPageParm { public class CsEquipmentAlarmPageParm {
@NotNull(message="当前页不能为空！") @NotNull(message="当前页不能为空！")
@Min(value = 1, message = "当前页不能为0") @Min(value = 1, message = "当前页不能为0")
@ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true) @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true)
private Integer currentPage; private Integer pageNum;
/**显示条数*/ /**显示条数*/
@NotNull(message="显示条数不能为空！") @NotNull(message="显示条数不能为空！")
@ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)

4
cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEventDetailPageParm.java
View File

@@ -20,8 +20,8 @@ import java.time.LocalDateTime;
public class CsEventDetailPageParm { public class CsEventDetailPageParm {
@NotNull(message="当前页不能为空！") @NotNull(message="当前页不能为空！")
@Min(value = 1, message = "当前页不能为0") @Min(value = 1, message = "当前页不能为0")
@ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true) @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true)
private Integer currentPage; private Integer pageNum;
/**显示条数*/ /**显示条数*/
@NotNull(message="显示条数不能为空！") @NotNull(message="显示条数不能为空！")
@ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)

4
cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsStatLimitRatePageParm.java
View File

@@ -20,8 +20,8 @@ import java.time.LocalDateTime;
public class CsStatLimitRatePageParm { public class CsStatLimitRatePageParm {
@NotNull(message="当前页不能为空！") @NotNull(message="当前页不能为空！")
@Min(value = 1, message = "当前页不能为0") @Min(value = 1, message = "当前页不能为0")
@ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true) @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true)
private Integer currentPage; private Integer pageNum;
/**显示条数*/ /**显示条数*/
@NotNull(message="显示条数不能为空！") @NotNull(message="显示条数不能为空！")
@ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)

4
cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsEquipmentAlarmPOServiceImpl.java
View File

@@ -76,8 +76,8 @@ public class CsEquipmentAlarmPOServiceImpl extends ServiceImpl<CsEquipmentAlarmP
@Override @Override
public IPage<CsEquipmentAlarmVO> queryPage(CsEquipmentAlarmPageParm csEquipmentAlarmPageParm) { public IPage<CsEquipmentAlarmVO> queryPage(CsEquipmentAlarmPageParm csEquipmentAlarmPageParm) {
Page<CsEquipmentAlarmVO> returnpage = new Page<> (csEquipmentAlarmPageParm.getCurrentPage ( ), csEquipmentAlarmPageParm.getPageSize ( )); Page<CsEquipmentAlarmVO> returnpage = new Page<> (csEquipmentAlarmPageParm.getPageNum ( ), csEquipmentAlarmPageParm.getPageSize ( ));
Page<CsEquipmentAlarmPO> queryPage = new Page<> (csEquipmentAlarmPageParm.getCurrentPage ( ), csEquipmentAlarmPageParm.getPageSize ( )); Page<CsEquipmentAlarmPO> queryPage = new Page<> (csEquipmentAlarmPageParm.getPageNum ( ), csEquipmentAlarmPageParm.getPageSize ( ));
QueryWrapper<CsEquipmentAlarmPO> queryWrapper = new QueryWrapper<>(); QueryWrapper<CsEquipmentAlarmPO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("status", "1"); queryWrapper.eq("status", "1");
queryWrapper.eq(StringUtils.isNotBlank(csEquipmentAlarmPageParm.getProjectId()),CsEquipmentAlarmPO.COL_PROJECT_ID,csEquipmentAlarmPageParm.getProjectId()); queryWrapper.eq(StringUtils.isNotBlank(csEquipmentAlarmPageParm.getProjectId()),CsEquipmentAlarmPO.COL_PROJECT_ID,csEquipmentAlarmPageParm.getProjectId());

2
cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsEventDetailPOServiceImpl.java
View File

@@ -27,7 +27,7 @@ public class CsEventDetailPOServiceImpl extends ServiceImpl<CsEventDetailPOMappe
@Override @Override
public IPage<CsEventDetailVO> queryPage(CsEventDetailPageParm csEventDetailPageParm) { public IPage<CsEventDetailVO> queryPage(CsEventDetailPageParm csEventDetailPageParm) {
Page<CsEventDetailVO> returnpage = new Page<> (csEventDetailPageParm.getCurrentPage ( ), csEventDetailPageParm.getPageSize ( )); Page<CsEventDetailVO> returnpage = new Page<> (csEventDetailPageParm.getPageNum ( ), csEventDetailPageParm.getPageSize ( ));
returnpage = this.getBaseMapper().queryPage(returnpage,csEventDetailPageParm); returnpage = this.getBaseMapper().queryPage(returnpage,csEventDetailPageParm);
return returnpage; return returnpage;
} }

2
cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsStatLimitRateDPOServiceImpl.java
View File

@@ -23,7 +23,7 @@ public class CsStatLimitRateDPOServiceImpl extends ServiceImpl<CsStatLimitRateDP
@Override @Override
public IPage<CsStatLimitRateDVO> queryPage(CsStatLimitRatePageParm csStatLimitRatePageParm) { public IPage<CsStatLimitRateDVO> queryPage(CsStatLimitRatePageParm csStatLimitRatePageParm) {
Page<CsStatLimitRateDVO> returnpage = new Page<> (csStatLimitRatePageParm.getCurrentPage ( ), csStatLimitRatePageParm.getPageSize ( )); Page<CsStatLimitRateDVO> returnpage = new Page<> (csStatLimitRatePageParm.getPageNum ( ), csStatLimitRatePageParm.getPageSize ( ));
returnpage = this.getBaseMapper().queryPage(returnpage,csStatLimitRatePageParm); returnpage = this.getBaseMapper().queryPage(returnpage,csStatLimitRatePageParm);
return returnpage; return returnpage;
} }