From ccb703f7d1207b005d238ed2b5b12708701b662b Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Tue, 13 Jun 2023 14:51:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E4=BF=AE=E6=94=B9pageNum?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/csdevice/pojo/param/AppProjectQueryParm.java   | 4 ++--
 .../pojo/param/AppTopologyDiagramQueryPageParm.java         | 4 ++--
 .../com/njcn/csdevice/pojo/param/CsDevModelQueryParm.java   | 4 ++--
 .../java/com/njcn/csdevice/pojo/param/CsEdDataAddParm.java  | 4 ++--
 .../com/njcn/csdevice/pojo/param/CsEdDataQueryParm.java     | 4 ++--
 .../csdevice/pojo/param/CsEngineeringQueryPageParm.java     | 4 ++--
 .../njcn/csdevice/pojo/param/CsEquipmentAlarmPageParm.java  | 4 ++--
 .../njcn/csdevice/pojo/param/ProjectEquipmentQueryParm.java | 4 ++--
 .../src/main/java/com/njcn/csdevice/pojo/vo/CsEdDataVO.java | 4 ++--
 .../com/njcn/csdevice/mapper/mapping/AppProjectMapper.xml   | 2 +-
 .../njcn/csdevice/service/impl/AppProjectServiceImpl.java   | 4 ++--
 .../service/impl/AppTopologyDiagramServiceImpl.java         | 4 ++--
 .../njcn/csdevice/service/impl/CsDevModelServiceImpl.java   | 2 +-
 .../com/njcn/csdevice/service/impl/CsEdDataServiceImpl.java | 2 +-
 .../csdevice/service/impl/CsEngineeringServiceImpl.java     | 6 +++---
 .../service/impl/CsEquipmentAlarmPOServiceImpl.java         | 4 ++--
 .../service/impl/CsEquipmentDeliveryServiceImpl.java        | 2 +-
 .../com/njcn/cssystem/pojo/param/CsFeedbackQueryParm.java   | 4 ++--
 .../njcn/cssystem/service/impl/CsFeedbackServiceImpl.java   | 4 ++--
 .../com/njcn/cswarn/pojo/parm/CsEquipmentAlarmPageParm.java | 4 ++--
 .../com/njcn/cswarn/pojo/parm/CsEventDetailPageParm.java    | 4 ++--
 .../com/njcn/cswarn/pojo/parm/CsStatLimitRatePageParm.java  | 4 ++--
 .../cswarn/service/impl/CsEquipmentAlarmPOServiceImpl.java  | 4 ++--
 .../cswarn/service/impl/CsEventDetailPOServiceImpl.java     | 2 +-
 .../cswarn/service/impl/CsStatLimitRateDPOServiceImpl.java  | 2 +-
 25 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectQueryParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectQueryParm.java
index 69a09f6..c43ca01 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectQueryParm.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectQueryParm.java
@@ -19,8 +19,8 @@ public class AppProjectQueryParm {
 
     @NotNull(message="当前页不能为空！")
     @Min(value = 1, message = "当前页不能为0")
-    @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true)
-    private Integer currentPage;
+    @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true)
+    private Integer pageNum;
     /**显示条数*/
     @NotNull(message="显示条数不能为空！")
     @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppTopologyDiagramQueryPageParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppTopologyDiagramQueryPageParm.java
index b7be8bf..2ad2c84 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppTopologyDiagramQueryPageParm.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppTopologyDiagramQueryPageParm.java
@@ -19,8 +19,8 @@ public class AppTopologyDiagramQueryPageParm {
 
     @NotNull(message="当前页不能为空！")
     @Min(value = 1, message = "当前页不能为0")
-    @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true)
-    private Integer currentPage;
+    @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true)
+    private Integer pageNum;
     /**显示条数*/
     @NotNull(message="显示条数不能为空！")
     @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelQueryParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelQueryParm.java
index d4010e1..0ce1b5d 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelQueryParm.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelQueryParm.java
@@ -24,8 +24,8 @@ public class CsDevModelQueryParm {
 
     @NotNull(message="当前页不能为空！")
     @Min(value = 1, message = "当前页不能为0")
-    @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true)
-    private Integer currentPage;
+    @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true)
+    private Integer pageNum;
     /**显示条数*/
     @NotNull(message="显示条数不能为空！")
     @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAddParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAddParm.java
index 0bb8aaf..73b0894 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAddParm.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAddParm.java
@@ -54,8 +54,8 @@ public class CsEdDataAddParm  {
      * 版本日期
      */
     @ApiModelProperty(value = "版本日期")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date versionDate;
 
     /**
diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataQueryParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataQueryParm.java
index 7ac450a..ba21164 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataQueryParm.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataQueryParm.java
@@ -24,8 +24,8 @@ public class CsEdDataQueryParm {
 
     @NotNull(message="当前页不能为空！")
     @Min(value = 1, message = "当前页不能为0")
-    @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true)
-    private Integer currentPage;
+    @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true)
+    private Integer pageNum;
     /**显示条数*/
     @NotNull(message="显示条数不能为空！")
     @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEngineeringQueryPageParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEngineeringQueryPageParm.java
index 141aa59..3c48119 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEngineeringQueryPageParm.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEngineeringQueryPageParm.java
@@ -19,8 +19,8 @@ public class CsEngineeringQueryPageParm {
 
     @NotNull(message="当前页不能为空！")
     @Min(value = 1, message = "当前页不能为0")
-    @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true)
-    private Integer currentPage;
+    @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true)
+    private Integer pageNum;
     /**显示条数*/
     @NotNull(message="显示条数不能为空！")
     @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentAlarmPageParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentAlarmPageParm.java
index b64909e..3ce21d9 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentAlarmPageParm.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentAlarmPageParm.java
@@ -20,8 +20,8 @@ import java.time.LocalDateTime;
 public class CsEquipmentAlarmPageParm {
     @NotNull(message="当前页不能为空！")
     @Min(value = 1, message = "当前页不能为0")
-    @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true)
-    private Integer currentPage;
+    @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true)
+    private Integer pageNum;
     /**显示条数*/
     @NotNull(message="显示条数不能为空！")
     @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/ProjectEquipmentQueryParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/ProjectEquipmentQueryParm.java
index 097ca2e..c94f31b 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/ProjectEquipmentQueryParm.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/ProjectEquipmentQueryParm.java
@@ -19,8 +19,8 @@ public class ProjectEquipmentQueryParm {
 
     @NotNull(message="当前页不能为空！")
     @Min(value = 1, message = "当前页不能为0")
-    @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true)
-    private Integer currentPage;
+    @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true)
+    private Integer pageNum;
     /**显示条数*/
     @NotNull(message="显示条数不能为空！")
     @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEdDataVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEdDataVO.java
index 32a26b4..5a6f746 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEdDataVO.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEdDataVO.java
@@ -50,8 +50,8 @@ public class CsEdDataVO  extends BaseEntity {
     /**
      * 版本日期
      */
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @ApiModelProperty(value = "版本日期")
     private Date versionDate;
 
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppProjectMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppProjectMapper.xml
index 64826c2..81f986c 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppProjectMapper.xml
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppProjectMapper.xml
@@ -23,7 +23,7 @@
   </sql>
 
   <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"
     <if test="temp!=null and temp.projectId != null and temp.projectId !=''">
       AND a.id  = #{temp.projectId}
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java
index c13e86a..7eb4171 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java
@@ -141,7 +141,7 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
     @Override
     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);
         List<AppProjectVO> collect = returnpage.getRecords().stream().map(temp -> {
             AppTopologyDiagramQueryParm appTopologyDiagramQueryParm = new AppTopologyDiagramQueryParm();
@@ -152,7 +152,7 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
         }).collect(Collectors.toList());
         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.eq ("status", "1").
 //                eq (StringUtils.isNotBlank (appProjectQueryParm.getProjectId ( )), "id", appProjectQueryParm.getProjectId ( )).
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppTopologyDiagramServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppTopologyDiagramServiceImpl.java
index f00eb63..441eaf3 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppTopologyDiagramServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppTopologyDiagramServiceImpl.java
@@ -115,8 +115,8 @@ public class AppTopologyDiagramServiceImpl extends ServiceImpl<AppTopologyDiagra
     @Override
     public IPage<AppTopologyDiagramVO> queryTopologyDiagramPage(AppTopologyDiagramQueryPageParm appTopologyDiagramQueryPageParm) {
 
-        Page<AppTopologyDiagramVO> returnpage = new Page<> (appTopologyDiagramQueryPageParm.getCurrentPage ( ), appTopologyDiagramQueryPageParm.getPageSize ( ));
-        Page<AppTopologyDiagramPO> tempPage = new Page<> (appTopologyDiagramQueryPageParm.getCurrentPage ( ), appTopologyDiagramQueryPageParm.getPageSize ( ));
+        Page<AppTopologyDiagramVO> returnpage = new Page<> (appTopologyDiagramQueryPageParm.getPageNum ( ), appTopologyDiagramQueryPageParm.getPageSize ( ));
+        Page<AppTopologyDiagramPO> tempPage = new Page<> (appTopologyDiagramQueryPageParm.getPageNum ( ), appTopologyDiagramQueryPageParm.getPageSize ( ));
 
         QueryWrapper<AppTopologyDiagramPO> queryWrapper = new QueryWrapper<> ();
         queryWrapper.eq ("status","1").
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDevModelServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDevModelServiceImpl.java
index e2629af..a8db5a3 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDevModelServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDevModelServiceImpl.java
@@ -57,7 +57,7 @@ public class CsDevModelServiceImpl extends ServiceImpl<CsDevModelMapper, CsDevMo
 
     @Override
     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);
         return returnpage;
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEdDataServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEdDataServiceImpl.java
index 60527b3..58a8943 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEdDataServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEdDataServiceImpl.java
@@ -64,7 +64,7 @@ public class CsEdDataServiceImpl extends ServiceImpl<CsEdDataMapper, CsEdDataPO>
 
     @Override
     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);
         return returnpage;
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java
index 9a52564..fab1bb8 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java
@@ -111,8 +111,8 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
 
     @Override
     public IPage<CsEngineeringVO> queryEngineeringPage(CsEngineeringQueryPageParm csEngineeringQueryPageParm) {
-        Page<CsEngineeringPO> tempPage = new Page<> (csEngineeringQueryPageParm.getCurrentPage ( ), csEngineeringQueryPageParm.getPageSize ( ));
-        Page<CsEngineeringVO> returnPage = new Page<> (csEngineeringQueryPageParm.getCurrentPage ( ), csEngineeringQueryPageParm.getPageSize ( ));
+        Page<CsEngineeringPO> tempPage = new Page<> (csEngineeringQueryPageParm.getPageNum(), csEngineeringQueryPageParm.getPageSize ( ));
+        Page<CsEngineeringVO> returnPage = new Page<> (csEngineeringQueryPageParm.getPageNum ( ), csEngineeringQueryPageParm.getPageSize ( ));
 
         QueryWrapper<CsEngineeringPO> queryWrapper = new QueryWrapper<> ();
         queryWrapper.eq (StringUtils.isNotBlank (csEngineeringQueryPageParm.getUserId ()),"user_id",csEngineeringQueryPageParm.getUserId ()).
@@ -136,7 +136,7 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
 
     @Override
     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();
     }
 
 
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentAlarmPOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentAlarmPOServiceImpl.java
index e544846..c050153 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentAlarmPOServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentAlarmPOServiceImpl.java
@@ -64,8 +64,8 @@ public class CsEquipmentAlarmPOServiceImpl extends ServiceImpl<CsEquipmentAlarmP
 
     @Override
     public IPage<CsEquipmentAlarmVO> queryPage(CsEquipmentAlarmPageParm csEquipmentAlarmPageParm) {
-        Page<CsEquipmentAlarmVO> returnpage = new Page<> (csEquipmentAlarmPageParm.getCurrentPage ( ), csEquipmentAlarmPageParm.getPageSize ( ));
-        Page<CsEquipmentAlarmPO> queryPage = new Page<> (csEquipmentAlarmPageParm.getCurrentPage ( ), csEquipmentAlarmPageParm.getPageSize ( ));
+        Page<CsEquipmentAlarmVO> returnpage = new Page<> (csEquipmentAlarmPageParm.getPageNum ( ), csEquipmentAlarmPageParm.getPageSize ( ));
+        Page<CsEquipmentAlarmPO> queryPage = new Page<> (csEquipmentAlarmPageParm.getPageNum ( ), csEquipmentAlarmPageParm.getPageSize ( ));
         QueryWrapper<CsEquipmentAlarmPO> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("status", "1");
         queryWrapper.eq(StringUtils.isNotBlank(csEquipmentAlarmPageParm.getProjectId()),CsEquipmentAlarmPO.COL_PROJECT_ID,csEquipmentAlarmPageParm.getProjectId());
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
index 5400236..2a09109 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
@@ -86,7 +86,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
 
         @Override
     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);
diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackQueryParm.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackQueryParm.java
index be3e2f0..2a65770 100644
--- a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackQueryParm.java
+++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackQueryParm.java
@@ -22,8 +22,8 @@ public class CsFeedbackQueryParm {
 
     @NotNull(message="当前页不能为空！")
     @Min(value = 1, message = "当前页不能为0")
-    @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true)
-    private Integer currentPage;
+    @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true)
+    private Integer pageNum;
     /**显示条数*/
     @NotNull(message="显示条数不能为空！")
     @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java
index aee98ca..9c17687 100644
--- a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java
+++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java
@@ -74,8 +74,8 @@ public class CsFeedbackServiceImpl extends ServiceImpl<CsFeedbackMapper, CsFeedb
 
     @Override
     public IPage<CsFeedbackVO> queryFeedBackPage(CsFeedbackQueryParm csFeedbackQueryParm) {
-        Page<CsFeedbackPO> page = new Page<> (csFeedbackQueryParm.getCurrentPage ( ), csFeedbackQueryParm.getPageSize ( ));
-        Page<CsFeedbackVO> returnpage = new Page<> (csFeedbackQueryParm.getCurrentPage ( ), csFeedbackQueryParm.getPageSize ( ));
+        Page<CsFeedbackPO> page = new Page<> (csFeedbackQueryParm.getPageNum ( ), csFeedbackQueryParm.getPageSize ( ));
+        Page<CsFeedbackVO> returnpage = new Page<> (csFeedbackQueryParm.getPageNum ( ), csFeedbackQueryParm.getPageSize ( ));
 
         QueryWrapper<CsFeedbackPO> queryWrapper = new QueryWrapper<> ();
         queryWrapper.eq ("user_id",csFeedbackQueryParm.getUserId ()).
diff --git a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEquipmentAlarmPageParm.java b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEquipmentAlarmPageParm.java
index 77f4578..59cc747 100644
--- a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEquipmentAlarmPageParm.java
+++ b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEquipmentAlarmPageParm.java
@@ -20,8 +20,8 @@ import java.time.LocalDateTime;
 public class CsEquipmentAlarmPageParm {
     @NotNull(message="当前页不能为空！")
     @Min(value = 1, message = "当前页不能为0")
-    @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true)
-    private Integer currentPage;
+    @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true)
+    private Integer pageNum;
     /**显示条数*/
     @NotNull(message="显示条数不能为空！")
     @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
diff --git a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEventDetailPageParm.java b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEventDetailPageParm.java
index 9b84fe4..458b446 100644
--- a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEventDetailPageParm.java
+++ b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEventDetailPageParm.java
@@ -20,8 +20,8 @@ import java.time.LocalDateTime;
 public class CsEventDetailPageParm {
     @NotNull(message="当前页不能为空！")
     @Min(value = 1, message = "当前页不能为0")
-    @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true)
-    private Integer currentPage;
+    @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true)
+    private Integer pageNum;
     /**显示条数*/
     @NotNull(message="显示条数不能为空！")
     @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
diff --git a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsStatLimitRatePageParm.java b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsStatLimitRatePageParm.java
index ecf9b01..0d4149d 100644
--- a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsStatLimitRatePageParm.java
+++ b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsStatLimitRatePageParm.java
@@ -20,8 +20,8 @@ import java.time.LocalDateTime;
 public class CsStatLimitRatePageParm {
     @NotNull(message="当前页不能为空！")
     @Min(value = 1, message = "当前页不能为0")
-    @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true)
-    private Integer currentPage;
+    @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true)
+    private Integer pageNum;
     /**显示条数*/
     @NotNull(message="显示条数不能为空！")
     @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsEquipmentAlarmPOServiceImpl.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsEquipmentAlarmPOServiceImpl.java
index 477183d..e9de07c 100644
--- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsEquipmentAlarmPOServiceImpl.java
+++ b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsEquipmentAlarmPOServiceImpl.java
@@ -76,8 +76,8 @@ public class CsEquipmentAlarmPOServiceImpl extends ServiceImpl<CsEquipmentAlarmP
 
     @Override
     public IPage<CsEquipmentAlarmVO> queryPage(CsEquipmentAlarmPageParm csEquipmentAlarmPageParm) {
-        Page<CsEquipmentAlarmVO> returnpage = new Page<> (csEquipmentAlarmPageParm.getCurrentPage ( ), csEquipmentAlarmPageParm.getPageSize ( ));
-        Page<CsEquipmentAlarmPO> queryPage = new Page<> (csEquipmentAlarmPageParm.getCurrentPage ( ), csEquipmentAlarmPageParm.getPageSize ( ));
+        Page<CsEquipmentAlarmVO> returnpage = new Page<> (csEquipmentAlarmPageParm.getPageNum ( ), csEquipmentAlarmPageParm.getPageSize ( ));
+        Page<CsEquipmentAlarmPO> queryPage = new Page<> (csEquipmentAlarmPageParm.getPageNum ( ), csEquipmentAlarmPageParm.getPageSize ( ));
         QueryWrapper<CsEquipmentAlarmPO> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("status", "1");
         queryWrapper.eq(StringUtils.isNotBlank(csEquipmentAlarmPageParm.getProjectId()),CsEquipmentAlarmPO.COL_PROJECT_ID,csEquipmentAlarmPageParm.getProjectId());
diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsEventDetailPOServiceImpl.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsEventDetailPOServiceImpl.java
index 40d13da..47a6775 100644
--- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsEventDetailPOServiceImpl.java
+++ b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsEventDetailPOServiceImpl.java
@@ -27,7 +27,7 @@ public class CsEventDetailPOServiceImpl extends ServiceImpl<CsEventDetailPOMappe
 
     @Override
     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);
         return returnpage;
     }
diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsStatLimitRateDPOServiceImpl.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsStatLimitRateDPOServiceImpl.java
index d262c00..11470d5 100644
--- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsStatLimitRateDPOServiceImpl.java
+++ b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsStatLimitRateDPOServiceImpl.java
@@ -23,7 +23,7 @@ public class CsStatLimitRateDPOServiceImpl extends ServiceImpl<CsStatLimitRateDP
 
     @Override
     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);
         return returnpage;
     }