Ver Fonte

fix:
1.baseQuery

caozixuan há 1 ano atrás
pai
commit
80fefc151f

+ 0 - 3
src/main/java/cn/com/qmth/print/manage/service/impl/ExamServiceImpl.java

@@ -108,9 +108,7 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
     @Override
     public IPage<ExamVo> pageQuery(ExamQuery query) {
         Page<ExamVo> page = new Page<>(query.getPageNumber(), query.getPageSize());
-        long mainQueryS = System.currentTimeMillis();
         IPage<ExamVo> iPage = this.baseMapper.pageExam(page, query);
-        System.out.println("主查询时间: " + (System.currentTimeMillis() - mainQueryS));
         for (ExamVo record : iPage.getRecords()) {
             // 考生总量
             record.setStudentCount(examStudentService.count(new QueryWrapper<ExamStudentEntity>().lambda().eq(ExamStudentEntity::getExamId,record.getId())));
@@ -155,7 +153,6 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
             }
             record.setProgress(progress);
         }
-        System.out.println("总查询时间: " + (System.currentTimeMillis() - mainQueryS));
         return iPage;
     }
 

+ 38 - 0
src/main/java/cn/com/qmth/print/manage/service/query/BaseQuery.java

@@ -0,0 +1,38 @@
+package cn.com.qmth.print.manage.service.query;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class BaseQuery {
+
+    @ApiModelProperty(value = "第几页(从1开始)")
+    protected Integer pageNumber;
+
+    @ApiModelProperty(value = "每页条数")
+    protected Integer pageSize;
+
+    public Integer getPageNumber() {
+        // 默认值
+        if (pageNumber == null || pageNumber < 1) {
+        	pageNumber = 1;
+        }
+
+        return pageNumber;
+    }
+
+    public Integer getPageSize() {
+        // 默认值
+        if (pageSize == null || pageSize < 1) {
+            pageSize = 10;
+        }
+
+        return pageSize;
+    }
+
+    public void setPageNumber(Integer pageNumber) {
+        this.pageNumber = pageNumber;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+}

+ 1 - 17
src/main/java/cn/com/qmth/print/manage/service/query/ExamQuery.java

@@ -1,16 +1,12 @@
 package cn.com.qmth.print.manage.service.query;
 
-import cn.com.qmth.print.manage.entity.ExamEntity;
-import com.qmth.boot.mybatis.query.BaseQuery;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.validation.annotation.Validated;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
 @Validated
-public class ExamQuery extends BaseQuery<ExamEntity> {
+public class ExamQuery extends BaseQuery {
 
     private static final long serialVersionUID = 3260496142491163981L;
 
@@ -46,16 +42,4 @@ public class ExamQuery extends BaseQuery<ExamEntity> {
     public void setEnable(boolean enable) {
         this.enable = enable;
     }
-
-    @Min(1)
-    public long getPageNumber() {
-        return super.getPageNumber();
-    }
-
-    @Min(1)
-    @Max(100)
-    public long getPageSize() {
-        return super.getPageSize();
-    }
-
 }

+ 1 - 16
src/main/java/cn/com/qmth/print/manage/service/query/ExamStudentQuery.java

@@ -1,15 +1,12 @@
 package cn.com.qmth.print.manage.service.query;
 
-import cn.com.qmth.print.manage.entity.ExamStudentEntity;
-import com.qmth.boot.mybatis.query.BaseQuery;
 import org.springframework.validation.annotation.Validated;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
 
 @Validated
-public class ExamStudentQuery extends BaseQuery<ExamStudentEntity> {
+public class ExamStudentQuery extends BaseQuery {
 
     private static final long serialVersionUID = 3260496142491163981L;
 
@@ -62,16 +59,4 @@ public class ExamStudentQuery extends BaseQuery<ExamStudentEntity> {
     public void setExamRoom(String examRoom) {
         this.examRoom = examRoom;
     }
-
-    @Min(1)
-    public long getPageNumber() {
-        return super.getPageNumber();
-    }
-
-    @Min(1)
-    @Max(100)
-    public long getPageSize() {
-        return super.getPageSize();
-    }
-
 }

+ 1 - 20
src/main/java/cn/com/qmth/print/manage/service/query/OrgQuery.java

@@ -1,16 +1,9 @@
 package cn.com.qmth.print.manage.service.query;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-
 import org.springframework.validation.annotation.Validated;
 
-import cn.com.qmth.print.manage.entity.OrgEntity;
-
-import com.qmth.boot.mybatis.query.BaseQuery;
-
 @Validated
-public class OrgQuery extends BaseQuery<OrgEntity> {
+public class OrgQuery extends BaseQuery {
 
     private static final long serialVersionUID = 3260496142491163981L;
 
@@ -33,16 +26,4 @@ public class OrgQuery extends BaseQuery<OrgEntity> {
     public void setCode(String code) {
         this.code = code;
     }
-
-    @Min(1)
-    public long getPageNumber() {
-        return super.getPageNumber();
-    }
-
-    @Min(1)
-    @Max(100)
-    public long getPageSize() {
-        return super.getPageSize();
-    }
-
 }

+ 3 - 21
src/main/java/cn/com/qmth/print/manage/service/query/RecordQuery.java

@@ -1,19 +1,13 @@
 package cn.com.qmth.print.manage.service.query;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-
-import org.apache.poi.ss.formula.functions.T;
-import org.springframework.validation.annotation.Validated;
-
 import cn.com.qmth.print.manage.enums.GroupType;
 import cn.com.qmth.print.manage.enums.RecordStatus;
+import org.springframework.validation.annotation.Validated;
 
-import com.qmth.boot.mybatis.query.BaseQuery;
+import javax.validation.constraints.NotNull;
 
 @Validated
-public class RecordQuery extends BaseQuery<T> {
+public class RecordQuery extends BaseQuery {
 
     private static final long serialVersionUID = 7620438258556212381L;
 
@@ -47,16 +41,4 @@ public class RecordQuery extends BaseQuery<T> {
     public void setStatus(RecordStatus status) {
         this.status = status;
     }
-
-    @Min(1)
-    public long getPageNumber() {
-        return super.getPageNumber();
-    }
-
-    @Min(1)
-    @Max(100)
-    public long getPageSize() {
-        return super.getPageSize();
-    }
-
 }

+ 1 - 17
src/main/java/cn/com/qmth/print/manage/service/query/UserQuery.java

@@ -1,16 +1,12 @@
 package cn.com.qmth.print.manage.service.query;
 
-import cn.com.qmth.print.manage.entity.UserEntity;
 import cn.com.qmth.print.manage.enums.RoleMeta;
-import com.qmth.boot.mybatis.query.BaseQuery;
 import org.springframework.validation.annotation.Validated;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
 @Validated
-public class UserQuery extends BaseQuery<UserEntity> {
+public class UserQuery extends BaseQuery {
 
     private static final long serialVersionUID = 3260496142491163981L;
 
@@ -44,16 +40,4 @@ public class UserQuery extends BaseQuery<UserEntity> {
     public void setEnable(boolean enable) {
         this.enable = enable;
     }
-
-    @Min(1)
-    public long getPageNumber() {
-        return super.getPageNumber();
-    }
-
-    @Min(1)
-    @Max(100)
-    public long getPageSize() {
-        return super.getPageSize();
-    }
-
 }