分页

src/main/java/org/rcisoft/business/bcarousel/service/BCarouselService.java

@@ -2,7 +2,7 @@ package org.rcisoft.business.bcarousel.service;
 
 
 import org.rcisoft.business.bcarousel.entity.BCarousel;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 
 import java.util.List;

src/main/java/org/rcisoft/business/bcarousel/service/impl/BCarouselServiceImpl.java

 package org.rcisoft.business.bcarousel.service.impl;
 
-import lombok.extern.slf4j.Slf4j;
 import org.rcisoft.business.bcarousel.dao.BCarouselRepository;
 import org.rcisoft.business.bcarousel.entity.BCarousel;
 import org.rcisoft.business.bcarousel.service.BCarouselService;
 import org.rcisoft.business.bimage.dao.BImageRepository;
 import org.rcisoft.business.bimage.entity.BImage;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.constant.DelStatus;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;
@@ -18,7 +17,6 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

src/main/java/org/rcisoft/business/bchapter/service/BChapterService.java

@@ -6,7 +6,7 @@ import org.rcisoft.business.bchapter.dto.ScoreInfoDTO;
 import org.rcisoft.business.bchapter.dto.StuScoreDTO;
 import org.rcisoft.business.bchapter.entity.BChapter;
 import org.rcisoft.business.bchapter.vo.StudentChapterScoreVO;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 
 import java.util.List;

src/main/java/org/rcisoft/business/bchapter/service/impl/BChapterServiceImpl.java

@@ -12,7 +12,7 @@ import org.rcisoft.business.bchapter.vo.StudentChapterScoreVO;
 import org.rcisoft.business.brslstudent.dao.BRSlStudentRepository;
 import org.rcisoft.business.bsl.dao.BSlRepository;
 import org.rcisoft.business.bstudent.dao.BStudentRepository;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.result.ResultServiceEnums;

src/main/java/org/rcisoft/business/bclass/service/BClassService.java

@@ -3,7 +3,7 @@ package org.rcisoft.business.bclass.service;
 
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.rcisoft.business.bclass.entity.BClass;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 
 import java.io.IOException;

src/main/java/org/rcisoft/business/bclass/service/impl/BClassServiceImpl.java

@@ -6,7 +6,7 @@ import org.rcisoft.business.bclass.dao.BClassRepository;
 import org.rcisoft.business.bclass.entity.BClass;
 import org.rcisoft.business.bclass.service.BClassService;
 import org.rcisoft.business.brclassstudent.dao.BRClassStudentRepository;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.result.ResultServiceEnums;

src/main/java/org/rcisoft/business/bimage/service/BImageService.java

@@ -2,7 +2,7 @@ package org.rcisoft.business.bimage.service;
 
 
 import org.rcisoft.business.bimage.entity.BImage;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 
 import java.util.List;

src/main/java/org/rcisoft/business/bimage/service/impl/BImageServiceImpl.java

@@ -3,7 +3,7 @@ package org.rcisoft.business.bimage.service.impl;
 import org.rcisoft.business.bimage.dao.BImageRepository;
 import org.rcisoft.business.bimage.entity.BImage;
 import org.rcisoft.business.bimage.service.BImageService;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.constant.DelStatus;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;

src/main/java/org/rcisoft/business/blesson/service/BLessonService.java

@@ -3,7 +3,7 @@ package org.rcisoft.business.blesson.service;
 
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.rcisoft.business.blesson.entity.BLesson;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 
 import java.io.IOException;

src/main/java/org/rcisoft/business/blesson/service/impl/BLessonServiceImpl.java

@@ -7,7 +7,7 @@ import org.rcisoft.business.blesson.entity.BLesson;
 import org.rcisoft.business.blesson.service.BLessonService;
 import org.rcisoft.business.bsl.dao.BSlRepository;
 import org.rcisoft.common.component.Global;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.result.ResultServiceEnums;

src/main/java/org/rcisoft/business/bnews/service/BNewsService.java

@@ -2,7 +2,7 @@ package org.rcisoft.business.bnews.service;
 
 
 import org.rcisoft.business.bnews.entity.BNews;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 
 import java.util.List;

src/main/java/org/rcisoft/business/bnews/service/impl/BNewsServiceImpl.java

@@ -4,7 +4,7 @@ import org.rcisoft.business.bnews.dao.BNewsRepository;
 import org.rcisoft.business.bnews.entity.BNews;
 import org.rcisoft.business.bnews.enums.ReleaseEnum;
 import org.rcisoft.business.bnews.service.BNewsService;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.constant.DelStatus;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;

src/main/java/org/rcisoft/business/brclassstudent/service/BRClassStudentService.java

@@ -3,7 +3,7 @@ package org.rcisoft.business.brclassstudent.service;
 
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.rcisoft.business.brclassstudent.entity.BRClassStudent;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 
 import java.io.IOException;

src/main/java/org/rcisoft/business/brclassstudent/service/impl/BRClassStudentServiceImpl.java

@@ -11,7 +11,7 @@ import org.rcisoft.business.brclassstudent.entity.BRClassStudent;
 import org.rcisoft.business.brclassstudent.service.BRClassStudentService;
 import org.rcisoft.business.bstudent.dao.BStudentRepository;
 import org.rcisoft.business.bstudent.entity.BStudent;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.result.ResultServiceEnums;

src/main/java/org/rcisoft/business/brslstudent/service/BRSlStudentService.java

@@ -3,7 +3,7 @@ package org.rcisoft.business.brslstudent.service;
 
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.rcisoft.business.brslstudent.entity.BRSlStudent;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 
 import java.io.IOException;

src/main/java/org/rcisoft/business/brslstudent/service/impl/BRSlStudentServiceImpl.java

@@ -10,7 +10,7 @@ import org.rcisoft.business.bsl.entity.BSl;
 import org.rcisoft.business.bstudent.dao.BStudentRepository;
 import org.rcisoft.business.bstudent.entity.BStudent;
 import org.rcisoft.common.component.Global;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.result.ResultServiceEnums;
@@ -20,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
 
 import java.io.IOException;
 import java.util.ArrayList;

src/main/java/org/rcisoft/business/bsl/service/BSlService.java

@@ -5,7 +5,7 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.rcisoft.business.bsl.dto.SlDTO;
 import org.rcisoft.business.bsl.dto.SlDetailDTO;
 import org.rcisoft.business.bsl.entity.BSl;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 
 import java.io.IOException;

src/main/java/org/rcisoft/business/bsl/service/impl/BSlServiceImpl.java

@@ -18,7 +18,7 @@ import org.rcisoft.business.bteacher.entity.BTeacher;
 import org.rcisoft.business.bterm.dao.BTermRepository;
 import org.rcisoft.business.bterm.entity.BTerm;
 import org.rcisoft.common.component.Global;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.result.ResultServiceEnums;
@@ -28,7 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;

src/main/java/org/rcisoft/business/bslapply/service/BSlApplyService.java

@@ -3,7 +3,7 @@ package org.rcisoft.business.bslapply.service;
 
 import org.rcisoft.business.bslapply.dto.ApplyDTO;
 import org.rcisoft.business.bslapply.entity.BSlApply;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 
 import java.io.UnsupportedEncodingException;

src/main/java/org/rcisoft/business/bslapply/service/impl/BSlApplyServiceImpl.java

@@ -15,7 +15,7 @@ import org.rcisoft.business.bteacher.dao.BTeacherRepository;
 import org.rcisoft.business.bteacher.entity.BTeacher;
 import org.rcisoft.business.bterm.dao.BTermRepository;
 import org.rcisoft.business.bterm.entity.BTerm;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.constant.DelStatus;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;

src/main/java/org/rcisoft/business/bstudent/service/BStudentService.java

@@ -3,7 +3,7 @@ package org.rcisoft.business.bstudent.service;
 
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.rcisoft.business.bstudent.entity.BStudent;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.sys.user.entity.SysUser;
 

src/main/java/org/rcisoft/business/bstudent/service/impl/BStudentServiceImpl.java

@@ -7,7 +7,7 @@ import org.rcisoft.business.bstudent.dao.BStudentRepository;
 import org.rcisoft.business.bstudent.entity.BStudent;
 import org.rcisoft.business.bstudent.service.BStudentService;
 import org.rcisoft.common.component.Global;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.entity.DataEntity;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;
@@ -22,7 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;

src/main/java/org/rcisoft/business/bteacher/service/BTeacherService.java

@@ -3,7 +3,7 @@ package org.rcisoft.business.bteacher.service;
 
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.rcisoft.business.bteacher.entity.BTeacher;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.sys.user.entity.SysUser;
 

src/main/java/org/rcisoft/business/bteacher/service/impl/BTeacherServiceImpl.java

@@ -7,7 +7,7 @@ import org.rcisoft.business.bteacher.dao.BTeacherRepository;
 import org.rcisoft.business.bteacher.entity.BTeacher;
 import org.rcisoft.business.bteacher.service.BTeacherService;
 import org.rcisoft.common.component.Global;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.entity.DataEntity;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;
@@ -22,7 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;

src/main/java/org/rcisoft/business/bterm/service/BTermService.java

@@ -2,7 +2,7 @@ package org.rcisoft.business.bterm.service;
 
 
 import org.rcisoft.business.bterm.entity.BTerm;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 
 import java.util.List;

src/main/java/org/rcisoft/business/bterm/service/impl/BTermServiceImpl.java

@@ -5,7 +5,7 @@ import org.rcisoft.business.bterm.dao.BTermRepository;
 import org.rcisoft.business.bterm.entity.BTerm;
 import org.rcisoft.business.bterm.enums.BTermEnum;
 import org.rcisoft.business.bterm.service.BTermService;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.result.ResultServiceEnums;

src/main/java/org/rcisoft/business/bvideo/service/BVideoService.java

 package org.rcisoft.business.bvideo.service;
 
 import org.rcisoft.business.bvideo.entity.BVideo;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 import org.springframework.web.multipart.MultipartFile;
 

src/main/java/org/rcisoft/business/bvideo/service/impl/BVideoServiceImpl.java

@@ -4,7 +4,7 @@ import org.rcisoft.business.bvideo.dao.BVideoRepository;
 import org.rcisoft.business.bvideo.entity.BVideo;
 import org.rcisoft.business.bvideo.service.BVideoService;
 import org.rcisoft.common.component.Global;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.constant.DelStatus;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.util.IdGen;

src/main/java/org/rcisoft/common/controller/PaginationController.java

 package org.rcisoft.common.controller;
 
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.common.model.CommonPageGridModel;
 import org.rcisoft.common.model.GridModel;
 import org.springframework.web.bind.annotation.ModelAttribute;

src/main/java/org/rcisoft/common/model/CommonPageGridModel.java

@@ -2,7 +2,7 @@ package org.rcisoft.common.model;
 
 
 
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 
 import java.util.List;
 

src/main/java/org/rcisoft/core/aop/IdGenAspect.java

@@ -2,25 +2,23 @@ package org.rcisoft.core.aop;
 
 import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.rcisoft.core.entity.IdEntity;
 import org.rcisoft.core.util.IdGen;
-import org.springframework.stereotype.Component;
 
 import java.util.Date;
 
 /**
  * Created by lcy on 17/11/23.
  */
-@Aspect
-@Component
+//@Aspect
+//@Component
 public class IdGenAspect {
     /**
      * 插入前  判断是否 存在id
      * @param joinPoint
      */
-    @Before("execution(* org.yxyqcy..*.dao.*Mapper.insert*(..))")
+    @Before("execution(* org.rcisoft..*.dao.*Mapper.insert*(..))")
     public void beforeInsert(JoinPoint joinPoint){
         Object model = joinPoint.getArgs()[0];
         if(model instanceof IdEntity) {

src/main/java/org/rcisoft/common/component/PageUtil.java → src/main/java/org/rcisoft/core/aop/PageUtil.java

-package org.rcisoft.common.component;
+package org.rcisoft.core.aop;
 
 
 import com.github.pagehelper.PageHelper;
 import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
 import org.rcisoft.common.model.CommonPageGridModel;
 import org.rcisoft.common.model.GridModel;
 import org.rcisoft.core.model.PageInfo;
@@ -17,6 +19,7 @@ import java.util.List;
  * Created by cy on 16/5/20.
  */
 @Component
+@Aspect
 public class PageUtil<T> extends PageInfo<T> implements Serializable {
 
     private static final long serialVersionUID = 8730332880750989562L;
@@ -63,6 +66,7 @@ public class PageUtil<T> extends PageInfo<T> implements Serializable {
      * @param proceedingJoinPoint
      * @return
      */
+    @Around("execution(* org.rcisoft..*.service.impl.*ServiceImpl.*ByPagination(..))")
     public List<T> preparedPageHeplerAndloadingPageInfoSetResults(ProceedingJoinPoint proceedingJoinPoint) {
         PageUtil paginationUtility = (PageUtil)proceedingJoinPoint.getArgs()[0];
         PageHelper.startPage(paginationUtility.getPageNum(), paginationUtility.getPageSize(), Boolean.parseBoolean(paginationUtility.getOrderBy()));
@@ -81,4 +85,7 @@ public class PageUtil<T> extends PageInfo<T> implements Serializable {
     public List<T> getList() {
         return super.getList();
     }
+
+
+
 }

src/main/java/org/rcisoft/sys/role/service/SysRoleService.java

@@ -2,7 +2,7 @@ package org.rcisoft.sys.role.service;
 
 
 
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.sys.dept.entity.DeptRole;
 import org.rcisoft.sys.role.entity.SysRole;

src/main/java/org/rcisoft/sys/role/service/impl/SysRoleServiceImpl.java

@@ -2,7 +2,7 @@ package org.rcisoft.sys.role.service.impl;
 
 
 import lombok.extern.slf4j.Slf4j;
-import org.rcisoft.common.component.PageUtil;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.constant.DelStatus;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.util.IdGen;