1.国网下穿实体类位置调整

pqs-common/common-web/src/main/java/com/njcn/web/pojo/dto/PmsHttpResult.java

@@ -0,0 +1,41 @@
+package com.njcn.web.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2024/5/9
+ */
+@Data
+public class PmsHttpResult<T> implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("返回提示信息")
+    private String msg;
+
+    @ApiModelProperty("返回状态码")
+    private Integer code;
+
+    @ApiModelProperty("返回数据")
+    private T data;
+
+    @ApiModelProperty("状态")
+    private String sucess;
+
+    @ApiModelProperty("返回机密数据")
+    private String encrypt_data;
+
+    @ApiModelProperty("返回其他数据")
+    private String other;
+
+
+    public PmsHttpResult(Integer code, T data) {
+        this.code = code;
+        this.data = data;
+    }
+}

pqs-common/common-web/src/main/java/com/njcn/web/pojo/dto/PmsPage.java

@@ -1,10 +1,8 @@
-package com.njcn.harmonic.pojo.vo.upload;
+package com.njcn.web.pojo.dto;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.apache.poi.ss.formula.functions.T;
 
+import java.io.Serializable;
 import java.util.Collections;
 import java.util.List;
 
@@ -15,7 +13,9 @@ import java.util.List;
  * @date 2024/5/15
  */
 @Data
-public class PmsPage<T> {
+public class PmsPage<T> implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     public List<T> list = Collections.emptyList();
 
@@ -39,6 +39,17 @@ public class PmsPage<T> {
     public long prePage;
     public long startRow;
 
+    private int endRow;
+    private boolean hasNextPage;
+    private boolean hasPreviousPage;
+    private boolean isFirstPage;
+    private boolean isLastPage;
+    private int navigateFirstPage;
+    private int navigateLastPage;
+    private int navigatePages;
+    private List<String> navigatepageNums;
+    private int nextPage;
+
 
     public PmsPage(long current, long size) {
         this.current = current;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/upload/PmsHttpResult.java

@@ -1,30 +0,0 @@
-package com.njcn.harmonic.pojo.vo.upload;
-
-import lombok.Data;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2024/5/9
- */
-@Data
-public class PmsHttpResult<T> {
-    private String msg;
-
-    private Integer code;
-
-    private T data;
-
-    private String sucess;
-
-    private String encrypt_data;
-
-    private String other;
-
-
-    public PmsHttpResult(Integer code,T data){
-        this.code = code;
-        this.data = data;
-    }
-}