11

common/pom.xml

@@ -3,8 +3,8 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>campus-admission-server</artifactId>
-        <groupId>com.jpsoft.campus</groupId>
+        <artifactId>supervision-server</artifactId>
+        <groupId>com.jpsoft.supervision</groupId>
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

common/src/main/java/com/jpsoft/campus/modules/base/service/SchoolRelationService.java

@@ -1,17 +0,0 @@
-package com.jpsoft.campus.modules.base.service;
-
-import com.jpsoft.campus.modules.base.entity.SchoolRelation;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * @author 墨鱼_mo
- * @date 2020-7-2 14:31
- */
-public interface SchoolRelationService {
-
-
-    List<SchoolRelation> findByPrimaryId(String primaryId);
-}

common/src/main/java/com/jpsoft/campus/config/BaiduConfig.java → common/src/main/java/com/jpsoft/supervision/config/BaiduConfig.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.config;
+package com.jpsoft.supervision.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

common/src/main/java/com/jpsoft/campus/config/OSSConfig.java → common/src/main/java/com/jpsoft/supervision/config/OSSConfig.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.config;
+package com.jpsoft.supervision.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

common/src/main/java/com/jpsoft/campus/config/WechatConfig.java → common/src/main/java/com/jpsoft/supervision/config/WechatConfig.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.config;
+package com.jpsoft.supervision.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

common/src/main/java/com/jpsoft/campus/modules/base/dao/AdjustDetailDAO.java → common/src/main/java/com/jpsoft/supervision/modules/base/dao/AdjustDetailDAO.java

@@ -1,11 +1,11 @@
-package com.jpsoft.campus.modules.base.dao;
+package com.jpsoft.supervision.modules.base.dao;
 
 import java.util.List;
 
-import com.jpsoft.campus.modules.base.entity.AdjustDetail;
+import com.jpsoft.supervision.modules.base.entity.AdjustDetail;
 import org.springframework.stereotype.Repository;
 import java.util.Map;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 @Repository
 public interface AdjustDetailDAO {

common/src/main/java/com/jpsoft/campus/modules/base/dao/ApplicationMiddleDAO.java → common/src/main/java/com/jpsoft/supervision/modules/base/dao/ApplicationMiddleDAO.java

@@ -1,12 +1,12 @@
-package com.jpsoft.campus.modules.base.dao;
+package com.jpsoft.supervision.modules.base.dao;
 
 import java.util.List;
 
-import com.jpsoft.campus.modules.base.dto.ApplicationMiddleDTO;
-import com.jpsoft.campus.modules.base.entity.ApplicationMiddle;
+import com.jpsoft.supervision.modules.base.dto.ApplicationMiddleDTO;
+import com.jpsoft.supervision.modules.base.entity.ApplicationMiddle;
 import org.springframework.stereotype.Repository;
 import java.util.Map;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 @Repository
 public interface ApplicationMiddleDAO {

common/src/main/java/com/jpsoft/campus/modules/base/dao/ApplicationPrimaryDAO.java → common/src/main/java/com/jpsoft/supervision/modules/base/dao/ApplicationPrimaryDAO.java

@@ -1,12 +1,12 @@
-package com.jpsoft.campus.modules.base.dao;
+package com.jpsoft.supervision.modules.base.dao;
 
 import java.util.List;
 
-import com.jpsoft.campus.modules.base.dto.ApplicationPrimaryDTO;
-import com.jpsoft.campus.modules.base.entity.ApplicationPrimary;
+import com.jpsoft.supervision.modules.base.dto.ApplicationPrimaryDTO;
+import com.jpsoft.supervision.modules.base.entity.ApplicationPrimary;
 import org.springframework.stereotype.Repository;
 import java.util.Map;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 @Repository
 public interface ApplicationPrimaryDAO {

common/src/main/java/com/jpsoft/campus/modules/base/dao/ApportionDAO.java → common/src/main/java/com/jpsoft/supervision/modules/base/dao/ApportionDAO.java

@@ -1,11 +1,11 @@
-package com.jpsoft.campus.modules.base.dao;
+package com.jpsoft.supervision.modules.base.dao;
 
 import java.util.List;
 
-import com.jpsoft.campus.modules.base.entity.Apportion;
+import com.jpsoft.supervision.modules.base.entity.Apportion;
 import org.springframework.stereotype.Repository;
 import java.util.Map;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 @Repository
 public interface ApportionDAO {

common/src/main/java/com/jpsoft/campus/modules/base/dao/ApportionDetailDAO.java → common/src/main/java/com/jpsoft/supervision/modules/base/dao/ApportionDetailDAO.java

@@ -1,12 +1,12 @@
-package com.jpsoft.campus.modules.base.dao;
+package com.jpsoft.supervision.modules.base.dao;
 
 import java.util.List;
 
-import com.jpsoft.campus.modules.base.dto.ApportionDetailDTO;
-import com.jpsoft.campus.modules.base.entity.ApportionDetail;
+import com.jpsoft.supervision.modules.base.dto.ApportionDetailDTO;
+import com.jpsoft.supervision.modules.base.entity.ApportionDetail;
 import org.springframework.stereotype.Repository;
 import java.util.Map;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 @Repository
 public interface ApportionDetailDAO {

common/src/main/java/com/jpsoft/campus/modules/base/dao/ApprovalInfoDAO.java → common/src/main/java/com/jpsoft/supervision/modules/base/dao/ApprovalInfoDAO.java

@@ -1,11 +1,11 @@
-package com.jpsoft.campus.modules.base.dao;
+package com.jpsoft.supervision.modules.base.dao;
 
 import java.util.List;
 
-import com.jpsoft.campus.modules.base.entity.ApprovalInfo;
+import com.jpsoft.supervision.modules.base.entity.ApprovalInfo;
 import org.springframework.stereotype.Repository;
 import java.util.Map;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 @Repository
 public interface ApprovalInfoDAO {

common/src/main/java/com/jpsoft/campus/modules/base/dao/DistrictInfoDAO.java → common/src/main/java/com/jpsoft/supervision/modules/base/dao/DistrictInfoDAO.java

@@ -1,11 +1,11 @@
-package com.jpsoft.campus.modules.base.dao;
+package com.jpsoft.supervision.modules.base.dao;
 
 import java.util.List;
 
-import com.jpsoft.campus.modules.base.entity.DistrictInfo;
+import com.jpsoft.supervision.modules.base.entity.DistrictInfo;
 import org.springframework.stereotype.Repository;
 import java.util.Map;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 @Repository
 public interface DistrictInfoDAO {

common/src/main/java/com/jpsoft/campus/modules/base/dao/EnrollControlDAO.java → common/src/main/java/com/jpsoft/supervision/modules/base/dao/EnrollControlDAO.java

@@ -1,7 +1,7 @@
-package com.jpsoft.campus.modules.base.dao;
+package com.jpsoft.supervision.modules.base.dao;
 
-import com.jpsoft.campus.modules.base.entity.EnrollControl;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.base.entity.EnrollControl;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

common/src/main/java/com/jpsoft/campus/modules/base/dao/NewsInfoDAO.java → common/src/main/java/com/jpsoft/supervision/modules/base/dao/NewsInfoDAO.java

@@ -1,12 +1,12 @@
-package com.jpsoft.campus.modules.base.dao;
+package com.jpsoft.supervision.modules.base.dao;
 
 import java.util.List;
 
-import com.jpsoft.campus.modules.base.entity.NewsInfo;
+import com.jpsoft.supervision.modules.base.entity.NewsInfo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import java.util.Map;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 @Repository
 public interface NewsInfoDAO {

common/src/main/java/com/jpsoft/campus/modules/base/dao/OfferInfoDAO.java → common/src/main/java/com/jpsoft/supervision/modules/base/dao/OfferInfoDAO.java

@@ -1,11 +1,11 @@
-package com.jpsoft.campus.modules.base.dao;
+package com.jpsoft.supervision.modules.base.dao;
 
 import java.util.List;
 
-import com.jpsoft.campus.modules.base.entity.OfferInfo;
+import com.jpsoft.supervision.modules.base.entity.OfferInfo;
 import org.springframework.stereotype.Repository;
 import java.util.Map;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 @Repository
 public interface OfferInfoDAO {

common/src/main/java/com/jpsoft/campus/modules/base/dao/PersonInfoDAO.java → common/src/main/java/com/jpsoft/supervision/modules/base/dao/PersonInfoDAO.java

@@ -1,12 +1,12 @@
-package com.jpsoft.campus.modules.base.dao;
+package com.jpsoft.supervision.modules.base.dao;
 
 import java.util.List;
 
-import com.jpsoft.campus.modules.base.entity.PersonInfo;
+import com.jpsoft.supervision.modules.base.entity.PersonInfo;
 import org.springframework.stereotype.Repository;
 
 import java.util.Map;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 @Repository
 public interface PersonInfoDAO {

common/src/main/java/com/jpsoft/campus/modules/base/dao/PersonStudentDAO.java → common/src/main/java/com/jpsoft/supervision/modules/base/dao/PersonStudentDAO.java

@@ -1,11 +1,11 @@
-package com.jpsoft.campus.modules.base.dao;
+package com.jpsoft.supervision.modules.base.dao;
 
 import java.util.List;
 
-import com.jpsoft.campus.modules.base.entity.PersonStudent;
+import com.jpsoft.supervision.modules.base.entity.PersonStudent;
 import org.springframework.stereotype.Repository;
 import java.util.Map;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 @Repository
 public interface PersonStudentDAO {

common/src/main/java/com/jpsoft/campus/modules/base/dao/SchoolInfoDAO.java → common/src/main/java/com/jpsoft/supervision/modules/base/dao/SchoolInfoDAO.java

@@ -1,12 +1,12 @@
-package com.jpsoft.campus.modules.base.dao;
+package com.jpsoft.supervision.modules.base.dao;
 
 import java.util.List;
 
-import com.jpsoft.campus.modules.base.entity.SchoolInfo;
+import com.jpsoft.supervision.modules.base.entity.SchoolInfo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import java.util.Map;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 @Repository
 public interface SchoolInfoDAO {

common/src/main/java/com/jpsoft/campus/modules/base/dao/SchoolRelationDAO.java → common/src/main/java/com/jpsoft/supervision/modules/base/dao/SchoolRelationDAO.java

@@ -1,8 +1,7 @@
-package com.jpsoft.campus.modules.base.dao;
+package com.jpsoft.supervision.modules.base.dao;
 
-import com.jpsoft.campus.modules.base.entity.SchoolInfo;
-import com.jpsoft.campus.modules.base.entity.SchoolRelation;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.base.entity.SchoolRelation;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

common/src/main/java/com/jpsoft/campus/modules/base/dao/StudentFilesDAO.java → common/src/main/java/com/jpsoft/supervision/modules/base/dao/StudentFilesDAO.java

@@ -1,11 +1,11 @@
-package com.jpsoft.campus.modules.base.dao;
+package com.jpsoft.supervision.modules.base.dao;
 
 import java.util.List;
 
-import com.jpsoft.campus.modules.base.entity.StudentFiles;
+import com.jpsoft.supervision.modules.base.entity.StudentFiles;
 import org.springframework.stereotype.Repository;
 import java.util.Map;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 @Repository
 public interface StudentFilesDAO {

common/src/main/java/com/jpsoft/campus/modules/base/dao/StudentInfoDAO.java → common/src/main/java/com/jpsoft/supervision/modules/base/dao/StudentInfoDAO.java

@@ -1,11 +1,11 @@
-package com.jpsoft.campus.modules.base.dao;
+package com.jpsoft.supervision.modules.base.dao;
 
 import java.util.List;
 
-import com.jpsoft.campus.modules.base.entity.StudentInfo;
+import com.jpsoft.supervision.modules.base.entity.StudentInfo;
 import org.springframework.stereotype.Repository;
 import java.util.Map;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 @Repository
 public interface StudentInfoDAO {

common/src/main/java/com/jpsoft/campus/modules/base/dto/AdjustDetailDTO.java → common/src/main/java/com/jpsoft/supervision/modules/base/dto/AdjustDetailDTO.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.base.dto;
+package com.jpsoft.supervision.modules.base.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/jpsoft/campus/modules/base/dto/ApplicationMiddleDTO.java → common/src/main/java/com/jpsoft/supervision/modules/base/dto/ApplicationMiddleDTO.java

@@ -1,8 +1,7 @@
-package com.jpsoft.campus.modules.base.dto;
+package com.jpsoft.supervision.modules.base.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jpsoft.campus.modules.base.entity.ApplicationMiddle;
-import com.jpsoft.campus.modules.base.entity.ApportionDetail;
+import com.jpsoft.supervision.modules.base.entity.ApportionDetail;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;

common/src/main/java/com/jpsoft/campus/modules/base/dto/ApplicationPrimaryDTO.java → common/src/main/java/com/jpsoft/supervision/modules/base/dto/ApplicationPrimaryDTO.java

@@ -1,7 +1,7 @@
-package com.jpsoft.campus.modules.base.dto;
+package com.jpsoft.supervision.modules.base.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jpsoft.campus.modules.base.entity.ApportionDetail;
+import com.jpsoft.supervision.modules.base.entity.ApportionDetail;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;

common/src/main/java/com/jpsoft/campus/modules/base/dto/ApportionDetailDTO.java → common/src/main/java/com/jpsoft/supervision/modules/base/dto/ApportionDetailDTO.java

@@ -1,14 +1,9 @@
-package com.jpsoft.campus.modules.base.dto;
+package com.jpsoft.supervision.modules.base.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
 
 @Data
 public class ApportionDetailDTO implements Serializable {

common/src/main/java/com/jpsoft/campus/modules/base/dto/AttachmentDTO.java → common/src/main/java/com/jpsoft/supervision/modules/base/dto/AttachmentDTO.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.base.dto;
+package com.jpsoft.supervision.modules.base.dto;
 
 import lombok.Data;
 

common/src/main/java/com/jpsoft/campus/modules/base/dto/NewsDTO.java → common/src/main/java/com/jpsoft/supervision/modules/base/dto/NewsDTO.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.base.dto;
+package com.jpsoft.supervision.modules.base.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

common/src/main/java/com/jpsoft/campus/modules/base/dto/SchoolInfoDTO.java → common/src/main/java/com/jpsoft/supervision/modules/base/dto/SchoolInfoDTO.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.base.dto;
+package com.jpsoft.supervision.modules.base.dto;
 
 import lombok.Data;
 

common/src/main/java/com/jpsoft/campus/modules/base/entity/AdjustDetail.java → common/src/main/java/com/jpsoft/supervision/modules/base/entity/AdjustDetail.java

@@ -1,9 +1,7 @@
-package com.jpsoft.campus.modules.base.entity;
+package com.jpsoft.supervision.modules.base.entity;
 
-import java.io.Serializable;
 import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
+
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;

common/src/main/java/com/jpsoft/campus/modules/base/entity/ApplicationMiddle.java → common/src/main/java/com/jpsoft/supervision/modules/base/entity/ApplicationMiddle.java

@@ -1,9 +1,6 @@
-package com.jpsoft.campus.modules.base.entity;
+package com.jpsoft.supervision.modules.base.entity;
 
-import java.io.Serializable;
 import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
 
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;

common/src/main/java/com/jpsoft/campus/modules/base/entity/ApplicationPrimary.java → common/src/main/java/com/jpsoft/supervision/modules/base/entity/ApplicationPrimary.java

@@ -1,9 +1,6 @@
-package com.jpsoft.campus.modules.base.entity;
+package com.jpsoft.supervision.modules.base.entity;
 
-import java.io.Serializable;
 import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
 
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;

common/src/main/java/com/jpsoft/campus/modules/base/entity/Apportion.java → common/src/main/java/com/jpsoft/supervision/modules/base/entity/Apportion.java

@@ -1,9 +1,7 @@
-package com.jpsoft.campus.modules.base.entity;
+package com.jpsoft.supervision.modules.base.entity;
 
-import java.io.Serializable;
 import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
+
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;

common/src/main/java/com/jpsoft/campus/modules/base/entity/ApportionDetail.java → common/src/main/java/com/jpsoft/supervision/modules/base/entity/ApportionDetail.java

@@ -1,9 +1,7 @@
-package com.jpsoft.campus.modules.base.entity;
+package com.jpsoft.supervision.modules.base.entity;
 
-import java.io.Serializable;
 import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
+
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;

common/src/main/java/com/jpsoft/campus/modules/base/entity/ApprovalInfo.java → common/src/main/java/com/jpsoft/supervision/modules/base/entity/ApprovalInfo.java

@@ -1,9 +1,6 @@
-package com.jpsoft.campus.modules.base.entity;
+package com.jpsoft.supervision.modules.base.entity;
 
-import java.io.Serializable;
 import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
 import java.util.List;
 
 import org.springframework.format.annotation.DateTimeFormat;

common/src/main/java/com/jpsoft/campus/modules/base/entity/DistrictInfo.java → common/src/main/java/com/jpsoft/supervision/modules/base/entity/DistrictInfo.java

@@ -1,9 +1,6 @@
-package com.jpsoft.campus.modules.base.entity;
+package com.jpsoft.supervision.modules.base.entity;
 
-import java.io.Serializable;
 import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
 
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;

common/src/main/java/com/jpsoft/campus/modules/base/entity/EnrollControl.java → common/src/main/java/com/jpsoft/supervision/modules/base/entity/EnrollControl.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.base.entity;
+package com.jpsoft.supervision.modules.base.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;

common/src/main/java/com/jpsoft/campus/modules/base/entity/NewsInfo.java → common/src/main/java/com/jpsoft/supervision/modules/base/entity/NewsInfo.java

@@ -1,9 +1,7 @@
-package com.jpsoft.campus.modules.base.entity;
+package com.jpsoft.supervision.modules.base.entity;
 
-import java.io.Serializable;
 import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
+
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;

common/src/main/java/com/jpsoft/campus/modules/base/entity/OfferInfo.java → common/src/main/java/com/jpsoft/supervision/modules/base/entity/OfferInfo.java

@@ -1,9 +1,7 @@
-package com.jpsoft.campus.modules.base.entity;
+package com.jpsoft.supervision.modules.base.entity;
 
-import java.io.Serializable;
 import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
+
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;

common/src/main/java/com/jpsoft/campus/modules/base/entity/PersonInfo.java → common/src/main/java/com/jpsoft/supervision/modules/base/entity/PersonInfo.java

@@ -1,9 +1,7 @@
-package com.jpsoft.campus.modules.base.entity;
+package com.jpsoft.supervision.modules.base.entity;
 
-import java.io.Serializable;
 import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
+
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;

common/src/main/java/com/jpsoft/campus/modules/base/entity/PersonStudent.java → common/src/main/java/com/jpsoft/supervision/modules/base/entity/PersonStudent.java

@@ -1,9 +1,7 @@
-package com.jpsoft.campus.modules.base.entity;
+package com.jpsoft.supervision.modules.base.entity;
 
-import java.io.Serializable;
 import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
+
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;

common/src/main/java/com/jpsoft/campus/modules/base/entity/SchoolInfo.java → common/src/main/java/com/jpsoft/supervision/modules/base/entity/SchoolInfo.java

@@ -1,9 +1,6 @@
-package com.jpsoft.campus.modules.base.entity;
+package com.jpsoft.supervision.modules.base.entity;
 
-import java.io.Serializable;
 import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
 
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;

common/src/main/java/com/jpsoft/campus/modules/base/entity/SchoolRelation.java → common/src/main/java/com/jpsoft/supervision/modules/base/entity/SchoolRelation.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.base.entity;
+package com.jpsoft.supervision.modules.base.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;

common/src/main/java/com/jpsoft/campus/modules/base/entity/StudentFiles.java → common/src/main/java/com/jpsoft/supervision/modules/base/entity/StudentFiles.java

@@ -1,9 +1,6 @@
-package com.jpsoft.campus.modules.base.entity;
+package com.jpsoft.supervision.modules.base.entity;
 
-import java.io.Serializable;
 import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
 
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;

common/src/main/java/com/jpsoft/campus/modules/base/entity/StudentInfo.java → common/src/main/java/com/jpsoft/supervision/modules/base/entity/StudentInfo.java

@@ -1,9 +1,6 @@
-package com.jpsoft.campus.modules.base.entity;
+package com.jpsoft.supervision.modules.base.entity;
 
-import java.io.Serializable;
 import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
 
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;

common/src/main/java/com/jpsoft/campus/modules/base/service/AdjustDetailService.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/AdjustDetailService.java

@@ -1,11 +1,11 @@
-package com.jpsoft.campus.modules.base.service;
+package com.jpsoft.supervision.modules.base.service;
 
 import java.util.List;
 import java.util.Map;
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.base.dto.AdjustDetailDTO;
-import com.jpsoft.campus.modules.base.entity.AdjustDetail;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.base.dto.AdjustDetailDTO;
+import com.jpsoft.supervision.modules.base.entity.AdjustDetail;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 public interface AdjustDetailService {
 	AdjustDetail get(String id);

common/src/main/java/com/jpsoft/campus/modules/base/service/ApplicationMiddleService.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/ApplicationMiddleService.java

@@ -1,11 +1,11 @@
-package com.jpsoft.campus.modules.base.service;
+package com.jpsoft.supervision.modules.base.service;
 
 import java.util.List;
 import java.util.Map;
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.base.dto.ApplicationMiddleDTO;
-import com.jpsoft.campus.modules.base.entity.ApplicationMiddle;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.base.dto.ApplicationMiddleDTO;
+import com.jpsoft.supervision.modules.base.entity.ApplicationMiddle;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 public interface ApplicationMiddleService {
 	ApplicationMiddle get(String id);

common/src/main/java/com/jpsoft/campus/modules/base/service/ApplicationPrimaryService.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/ApplicationPrimaryService.java

@@ -1,12 +1,11 @@
-package com.jpsoft.campus.modules.base.service;
+package com.jpsoft.supervision.modules.base.service;
 
 import java.util.List;
 import java.util.Map;
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.base.dto.ApplicationPrimaryDTO;
-import com.jpsoft.campus.modules.base.entity.ApplicationPrimary;
-import com.jpsoft.campus.modules.base.entity.ApprovalInfo;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.base.dto.ApplicationPrimaryDTO;
+import com.jpsoft.supervision.modules.base.entity.ApplicationPrimary;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 public interface ApplicationPrimaryService {
 	ApplicationPrimary get(String id);

common/src/main/java/com/jpsoft/campus/modules/base/service/ApportionDetailService.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/ApportionDetailService.java

@@ -1,11 +1,11 @@
-package com.jpsoft.campus.modules.base.service;
+package com.jpsoft.supervision.modules.base.service;
 
 import java.util.List;
 import java.util.Map;
 
-import com.jpsoft.campus.modules.base.dto.ApportionDetailDTO;
-import com.jpsoft.campus.modules.base.entity.ApportionDetail;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.base.dto.ApportionDetailDTO;
+import com.jpsoft.supervision.modules.base.entity.ApportionDetail;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 import com.github.pagehelper.Page;
 
 public interface ApportionDetailService {

common/src/main/java/com/jpsoft/campus/modules/base/service/ApportionService.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/ApportionService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.campus.modules.base.service;
+package com.jpsoft.supervision.modules.base.service;
 
 import java.util.List;
 import java.util.Map;
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.base.entity.Apportion;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.base.entity.Apportion;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 public interface ApportionService {
 	Apportion get(String id);

common/src/main/java/com/jpsoft/campus/modules/base/service/ApprovalInfoService.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/ApprovalInfoService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.campus.modules.base.service;
+package com.jpsoft.supervision.modules.base.service;
 
 import java.util.List;
 import java.util.Map;
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.base.entity.ApprovalInfo;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.base.entity.ApprovalInfo;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 public interface ApprovalInfoService {
 	ApprovalInfo get(String id);

common/src/main/java/com/jpsoft/campus/modules/base/service/DistrictInfoService.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/DistrictInfoService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.campus.modules.base.service;
+package com.jpsoft.supervision.modules.base.service;
 
 import java.util.List;
 import java.util.Map;
 
-import com.jpsoft.campus.modules.base.entity.DistrictInfo;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.base.entity.DistrictInfo;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 import com.github.pagehelper.Page;
 
 public interface DistrictInfoService {

common/src/main/java/com/jpsoft/campus/modules/base/service/EnrollControlService.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/EnrollControlService.java

@@ -1,8 +1,8 @@
-package com.jpsoft.campus.modules.base.service;
+package com.jpsoft.supervision.modules.base.service;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.base.entity.EnrollControl;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.base.entity.EnrollControl;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 import java.util.List;
 import java.util.Map;

common/src/main/java/com/jpsoft/campus/modules/base/service/NewsInfoService.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/NewsInfoService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.campus.modules.base.service;
+package com.jpsoft.supervision.modules.base.service;
 
 import java.util.List;
 import java.util.Map;
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.base.entity.NewsInfo;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.base.entity.NewsInfo;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 public interface NewsInfoService {
 	NewsInfo get(String id);

common/src/main/java/com/jpsoft/campus/modules/base/service/OfferInfoService.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/OfferInfoService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.campus.modules.base.service;
+package com.jpsoft.supervision.modules.base.service;
 
 import java.util.List;
 import java.util.Map;
 
-import com.jpsoft.campus.modules.base.entity.OfferInfo;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.base.entity.OfferInfo;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 import com.github.pagehelper.Page;
 
 public interface OfferInfoService {

common/src/main/java/com/jpsoft/campus/modules/base/service/PersonInfoService.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/PersonInfoService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.campus.modules.base.service;
+package com.jpsoft.supervision.modules.base.service;
 
 import java.util.List;
 import java.util.Map;
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.base.entity.PersonInfo;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.base.entity.PersonInfo;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 public interface PersonInfoService {
 	PersonInfo get(String id);

common/src/main/java/com/jpsoft/campus/modules/base/service/PersonStudentService.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/PersonStudentService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.campus.modules.base.service;
+package com.jpsoft.supervision.modules.base.service;
 
 import java.util.List;
 import java.util.Map;
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.base.entity.PersonStudent;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.base.entity.PersonStudent;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 public interface PersonStudentService {
 	PersonStudent get(String id);

common/src/main/java/com/jpsoft/campus/modules/base/service/SchoolInfoService.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/SchoolInfoService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.campus.modules.base.service;
+package com.jpsoft.supervision.modules.base.service;
 
 import java.util.List;
 import java.util.Map;
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.base.entity.SchoolInfo;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.base.entity.SchoolInfo;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 public interface SchoolInfoService {
 	SchoolInfo get(String id);

common/src/main/java/com/jpsoft/supervision/modules/base/service/SchoolRelationService.java

@@ -0,0 +1,15 @@
+package com.jpsoft.supervision.modules.base.service;
+
+import com.jpsoft.supervision.modules.base.entity.SchoolRelation;
+
+import java.util.List;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2020-7-2 14:31
+ */
+public interface SchoolRelationService {
+
+
+    List<SchoolRelation> findByPrimaryId(String primaryId);
+}

common/src/main/java/com/jpsoft/campus/modules/base/service/StudentFilesService.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/StudentFilesService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.campus.modules.base.service;
+package com.jpsoft.supervision.modules.base.service;
 
 import java.util.List;
 import java.util.Map;
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.base.entity.StudentFiles;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.base.entity.StudentFiles;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 public interface StudentFilesService {
 	StudentFiles get(String id);

common/src/main/java/com/jpsoft/campus/modules/base/service/StudentInfoService.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/StudentInfoService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.campus.modules.base.service;
+package com.jpsoft.supervision.modules.base.service;
 
 import java.util.List;
 import java.util.Map;
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.base.entity.StudentInfo;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.base.entity.StudentInfo;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 public interface StudentInfoService {
 	StudentInfo get(String id);

common/src/main/java/com/jpsoft/campus/modules/base/service/impl/AdjustDetailServiceImpl.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/AdjustDetailServiceImpl.java

@@ -1,18 +1,17 @@
-package com.jpsoft.campus.modules.base.service.impl;
+package com.jpsoft.supervision.modules.base.service.impl;
 
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 import javax.annotation.Resource;
 
-import com.jpsoft.campus.modules.base.dao.AdjustDetailDAO;
-import com.jpsoft.campus.modules.base.dto.AdjustDetailDTO;
-import com.jpsoft.campus.modules.base.entity.AdjustDetail;
-import com.jpsoft.campus.modules.base.service.AdjustDetailService;
+import com.jpsoft.supervision.modules.base.dao.AdjustDetailDAO;
+import com.jpsoft.supervision.modules.base.dto.AdjustDetailDTO;
+import com.jpsoft.supervision.modules.base.entity.AdjustDetail;
+import com.jpsoft.supervision.modules.base.service.AdjustDetailService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

common/src/main/java/com/jpsoft/campus/modules/base/service/impl/ApplicationMiddleServiceImpl.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/ApplicationMiddleServiceImpl.java

@@ -1,18 +1,17 @@
-package com.jpsoft.campus.modules.base.service.impl;
+package com.jpsoft.supervision.modules.base.service.impl;
 
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 import javax.annotation.Resource;
 
-import com.jpsoft.campus.modules.base.dao.ApplicationMiddleDAO;
-import com.jpsoft.campus.modules.base.dto.ApplicationMiddleDTO;
-import com.jpsoft.campus.modules.base.entity.ApplicationMiddle;
-import com.jpsoft.campus.modules.base.service.ApplicationMiddleService;
+import com.jpsoft.supervision.modules.base.dao.ApplicationMiddleDAO;
+import com.jpsoft.supervision.modules.base.dto.ApplicationMiddleDTO;
+import com.jpsoft.supervision.modules.base.entity.ApplicationMiddle;
+import com.jpsoft.supervision.modules.base.service.ApplicationMiddleService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

common/src/main/java/com/jpsoft/campus/modules/base/service/impl/ApplicationPrimaryServiceImpl.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/ApplicationPrimaryServiceImpl.java

@@ -1,18 +1,17 @@
-package com.jpsoft.campus.modules.base.service.impl;
+package com.jpsoft.supervision.modules.base.service.impl;
 
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 import javax.annotation.Resource;
 
-import com.jpsoft.campus.modules.base.dao.ApplicationPrimaryDAO;
-import com.jpsoft.campus.modules.base.dto.ApplicationPrimaryDTO;
-import com.jpsoft.campus.modules.base.entity.ApplicationPrimary;
-import com.jpsoft.campus.modules.base.service.ApplicationPrimaryService;
+import com.jpsoft.supervision.modules.base.dao.ApplicationPrimaryDAO;
+import com.jpsoft.supervision.modules.base.dto.ApplicationPrimaryDTO;
+import com.jpsoft.supervision.modules.base.entity.ApplicationPrimary;
+import com.jpsoft.supervision.modules.base.service.ApplicationPrimaryService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

common/src/main/java/com/jpsoft/campus/modules/base/service/impl/ApportionDetailServiceImpl.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/ApportionDetailServiceImpl.java

@@ -1,18 +1,17 @@
-package com.jpsoft.campus.modules.base.service.impl;
+package com.jpsoft.supervision.modules.base.service.impl;
 
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 import javax.annotation.Resource;
 
-import com.jpsoft.campus.modules.base.dao.ApportionDetailDAO;
-import com.jpsoft.campus.modules.base.dto.ApportionDetailDTO;
-import com.jpsoft.campus.modules.base.entity.ApportionDetail;
-import com.jpsoft.campus.modules.base.service.ApportionDetailService;
+import com.jpsoft.supervision.modules.base.dao.ApportionDetailDAO;
+import com.jpsoft.supervision.modules.base.dto.ApportionDetailDTO;
+import com.jpsoft.supervision.modules.base.entity.ApportionDetail;
+import com.jpsoft.supervision.modules.base.service.ApportionDetailService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

common/src/main/java/com/jpsoft/campus/modules/base/service/impl/ApportionServiceImpl.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/ApportionServiceImpl.java

@@ -1,17 +1,16 @@
-package com.jpsoft.campus.modules.base.service.impl;
+package com.jpsoft.supervision.modules.base.service.impl;
 
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 import javax.annotation.Resource;
 
-import com.jpsoft.campus.modules.base.dao.ApportionDAO;
-import com.jpsoft.campus.modules.base.entity.Apportion;
-import com.jpsoft.campus.modules.base.service.ApportionService;
+import com.jpsoft.supervision.modules.base.dao.ApportionDAO;
+import com.jpsoft.supervision.modules.base.entity.Apportion;
+import com.jpsoft.supervision.modules.base.service.ApportionService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

common/src/main/java/com/jpsoft/campus/modules/base/service/impl/ApprovalInfoServiceImpl.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/ApprovalInfoServiceImpl.java

@@ -1,17 +1,16 @@
-package com.jpsoft.campus.modules.base.service.impl;
+package com.jpsoft.supervision.modules.base.service.impl;
 
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 import javax.annotation.Resource;
 
-import com.jpsoft.campus.modules.base.dao.ApprovalInfoDAO;
-import com.jpsoft.campus.modules.base.entity.ApprovalInfo;
-import com.jpsoft.campus.modules.base.service.ApprovalInfoService;
+import com.jpsoft.supervision.modules.base.dao.ApprovalInfoDAO;
+import com.jpsoft.supervision.modules.base.entity.ApprovalInfo;
+import com.jpsoft.supervision.modules.base.service.ApprovalInfoService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

common/src/main/java/com/jpsoft/campus/modules/base/service/impl/DistrictInfoServiceImpl.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/DistrictInfoServiceImpl.java

@@ -1,17 +1,16 @@
-package com.jpsoft.campus.modules.base.service.impl;
+package com.jpsoft.supervision.modules.base.service.impl;
 
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 import javax.annotation.Resource;
 
-import com.jpsoft.campus.modules.base.dao.DistrictInfoDAO;
-import com.jpsoft.campus.modules.base.entity.DistrictInfo;
-import com.jpsoft.campus.modules.base.service.DistrictInfoService;
+import com.jpsoft.supervision.modules.base.dao.DistrictInfoDAO;
+import com.jpsoft.supervision.modules.base.entity.DistrictInfo;
+import com.jpsoft.supervision.modules.base.service.DistrictInfoService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

common/src/main/java/com/jpsoft/campus/modules/base/service/impl/EnrollControlServiceImpl.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/EnrollControlServiceImpl.java

@@ -1,11 +1,11 @@
-package com.jpsoft.campus.modules.base.service.impl;
+package com.jpsoft.supervision.modules.base.service.impl;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import com.jpsoft.campus.modules.base.dao.EnrollControlDAO;
-import com.jpsoft.campus.modules.base.entity.EnrollControl;
-import com.jpsoft.campus.modules.base.service.EnrollControlService;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.base.dao.EnrollControlDAO;
+import com.jpsoft.supervision.modules.base.entity.EnrollControl;
+import com.jpsoft.supervision.modules.base.service.EnrollControlService;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 

common/src/main/java/com/jpsoft/campus/modules/base/service/impl/NewsInfoServiceImpl.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/NewsInfoServiceImpl.java

@@ -1,17 +1,16 @@
-package com.jpsoft.campus.modules.base.service.impl;
+package com.jpsoft.supervision.modules.base.service.impl;
 
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 import javax.annotation.Resource;
 
-import com.jpsoft.campus.modules.base.dao.NewsInfoDAO;
-import com.jpsoft.campus.modules.base.entity.NewsInfo;
-import com.jpsoft.campus.modules.base.service.NewsInfoService;
+import com.jpsoft.supervision.modules.base.dao.NewsInfoDAO;
+import com.jpsoft.supervision.modules.base.entity.NewsInfo;
+import com.jpsoft.supervision.modules.base.service.NewsInfoService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

common/src/main/java/com/jpsoft/campus/modules/base/service/impl/OfferInfoServiceImpl.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/OfferInfoServiceImpl.java

@@ -1,18 +1,17 @@
-package com.jpsoft.campus.modules.base.service.impl;
+package com.jpsoft.supervision.modules.base.service.impl;
 
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 import javax.annotation.Resource;
 
-import com.jpsoft.campus.modules.base.dao.OfferInfoDAO;
-import com.jpsoft.campus.modules.base.entity.OfferInfo;
-import com.jpsoft.campus.modules.base.service.OfferInfoService;
+import com.jpsoft.supervision.modules.base.dao.OfferInfoDAO;
+import com.jpsoft.supervision.modules.base.entity.OfferInfo;
+import com.jpsoft.supervision.modules.base.service.OfferInfoService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

common/src/main/java/com/jpsoft/campus/modules/base/service/impl/PersonInfoServiceImpl.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/PersonInfoServiceImpl.java

@@ -1,17 +1,16 @@
-package com.jpsoft.campus.modules.base.service.impl;
+package com.jpsoft.supervision.modules.base.service.impl;
 
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 import javax.annotation.Resource;
 
-import com.jpsoft.campus.modules.base.dao.PersonInfoDAO;
-import com.jpsoft.campus.modules.base.entity.PersonInfo;
-import com.jpsoft.campus.modules.base.service.PersonInfoService;
+import com.jpsoft.supervision.modules.base.dao.PersonInfoDAO;
+import com.jpsoft.supervision.modules.base.entity.PersonInfo;
+import com.jpsoft.supervision.modules.base.service.PersonInfoService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

common/src/main/java/com/jpsoft/campus/modules/base/service/impl/PersonStudentServiceImpl.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/PersonStudentServiceImpl.java

@@ -1,17 +1,16 @@
-package com.jpsoft.campus.modules.base.service.impl;
+package com.jpsoft.supervision.modules.base.service.impl;
 
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 import javax.annotation.Resource;
 
-import com.jpsoft.campus.modules.base.dao.PersonStudentDAO;
-import com.jpsoft.campus.modules.base.entity.PersonStudent;
-import com.jpsoft.campus.modules.base.service.PersonStudentService;
+import com.jpsoft.supervision.modules.base.dao.PersonStudentDAO;
+import com.jpsoft.supervision.modules.base.entity.PersonStudent;
+import com.jpsoft.supervision.modules.base.service.PersonStudentService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

common/src/main/java/com/jpsoft/campus/modules/base/service/impl/SchoolInfoServiceImpl.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/SchoolInfoServiceImpl.java

@@ -1,17 +1,16 @@
-package com.jpsoft.campus.modules.base.service.impl;
+package com.jpsoft.supervision.modules.base.service.impl;
 
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 import javax.annotation.Resource;
 
-import com.jpsoft.campus.modules.base.dao.SchoolInfoDAO;
-import com.jpsoft.campus.modules.base.entity.SchoolInfo;
-import com.jpsoft.campus.modules.base.service.SchoolInfoService;
+import com.jpsoft.supervision.modules.base.dao.SchoolInfoDAO;
+import com.jpsoft.supervision.modules.base.entity.SchoolInfo;
+import com.jpsoft.supervision.modules.base.service.SchoolInfoService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

common/src/main/java/com/jpsoft/campus/modules/base/service/impl/SchoolRelationServiceImpl.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/SchoolRelationServiceImpl.java

@@ -1,10 +1,9 @@
-package com.jpsoft.campus.modules.base.service.impl;
+package com.jpsoft.supervision.modules.base.service.impl;
 
-import com.jpsoft.campus.modules.base.dao.SchoolRelationDAO;
-import com.jpsoft.campus.modules.base.entity.SchoolRelation;
-import com.jpsoft.campus.modules.base.service.SchoolRelationService;
+import com.jpsoft.supervision.modules.base.dao.SchoolRelationDAO;
+import com.jpsoft.supervision.modules.base.entity.SchoolRelation;
+import com.jpsoft.supervision.modules.base.service.SchoolRelationService;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;

common/src/main/java/com/jpsoft/campus/modules/base/service/impl/StudentFilesServiceImpl.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/StudentFilesServiceImpl.java

@@ -1,17 +1,16 @@
-package com.jpsoft.campus.modules.base.service.impl;
+package com.jpsoft.supervision.modules.base.service.impl;
 
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 import javax.annotation.Resource;
 
-import com.jpsoft.campus.modules.base.dao.StudentFilesDAO;
-import com.jpsoft.campus.modules.base.entity.StudentFiles;
-import com.jpsoft.campus.modules.base.service.StudentFilesService;
+import com.jpsoft.supervision.modules.base.dao.StudentFilesDAO;
+import com.jpsoft.supervision.modules.base.entity.StudentFiles;
+import com.jpsoft.supervision.modules.base.service.StudentFilesService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

common/src/main/java/com/jpsoft/campus/modules/base/service/impl/StudentInfoServiceImpl.java → common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/StudentInfoServiceImpl.java

@@ -1,17 +1,16 @@
-package com.jpsoft.campus.modules.base.service.impl;
+package com.jpsoft.supervision.modules.base.service.impl;
 
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 import javax.annotation.Resource;
 
-import com.jpsoft.campus.modules.base.dao.StudentInfoDAO;
-import com.jpsoft.campus.modules.base.entity.StudentInfo;
-import com.jpsoft.campus.modules.base.service.StudentInfoService;
+import com.jpsoft.supervision.modules.base.dao.StudentInfoDAO;
+import com.jpsoft.supervision.modules.base.entity.StudentInfo;
+import com.jpsoft.supervision.modules.base.service.StudentInfoService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

common/src/main/java/com/jpsoft/campus/modules/common/dto/MessageResult.java → common/src/main/java/com/jpsoft/supervision/modules/common/dto/MessageResult.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.common.dto;
+package com.jpsoft.supervision.modules.common.dto;
 
 public class MessageResult<T> {
 	private boolean result;

common/src/main/java/com/jpsoft/campus/modules/common/dto/Sort.java → common/src/main/java/com/jpsoft/supervision/modules/common/dto/Sort.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.common.dto;
+package com.jpsoft.supervision.modules.common.dto;
 
 import java.io.Serializable;
 

common/src/main/java/com/jpsoft/campus/modules/common/service/BaseService.java → common/src/main/java/com/jpsoft/supervision/modules/common/service/BaseService.java

@@ -1,7 +1,7 @@
-package com.jpsoft.campus.modules.common.service;
+package com.jpsoft.supervision.modules.common.service;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.supervision.modules.common.dto.Sort;
 
 import java.util.List;
 import java.util.Map;

common/src/main/java/com/jpsoft/campus/modules/common/service/IRedisService.java → common/src/main/java/com/jpsoft/supervision/modules/common/service/IRedisService.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.common.service;
+package com.jpsoft.supervision.modules.common.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.HashOperations;

common/src/main/java/com/jpsoft/campus/modules/common/service/impl/RedisServiceImpl.java → common/src/main/java/com/jpsoft/supervision/modules/common/service/impl/RedisServiceImpl.java

@@ -1,6 +1,6 @@
-package com.jpsoft.campus.modules.common.service.impl;
+package com.jpsoft.supervision.modules.common.service.impl;
 
-import com.jpsoft.campus.modules.common.service.IRedisService;
+import com.jpsoft.supervision.modules.common.service.IRedisService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 

common/src/main/java/com/jpsoft/campus/modules/common/utils/AESUtil.java → common/src/main/java/com/jpsoft/supervision/modules/common/utils/AESUtil.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.common.utils;
+package com.jpsoft.supervision.modules.common.utils;
 
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 

common/src/main/java/com/jpsoft/campus/modules/common/utils/BASE64DecodedMultipartFile.java → common/src/main/java/com/jpsoft/supervision/modules/common/utils/BASE64DecodedMultipartFile.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.common.utils;
+package com.jpsoft.supervision.modules.common.utils;
 
 import org.springframework.web.multipart.MultipartFile;
 import sun.misc.BASE64Decoder;

common/src/main/java/com/jpsoft/campus/modules/common/utils/BaiduOCR.java → common/src/main/java/com/jpsoft/supervision/modules/common/utils/BaiduOCR.java

@@ -1,6 +1,5 @@
-package com.jpsoft.campus.modules.common.utils;
+package com.jpsoft.supervision.modules.common.utils;
 
-import net.sf.json.JSON;
 import net.sf.json.JSONObject;
 
 import java.io.BufferedReader;
@@ -8,8 +7,6 @@ import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLEncoder;
-import java.util.List;
-import java.util.Map;
 
 public class BaiduOCR {
     /**

common/src/main/java/com/jpsoft/campus/modules/common/utils/Base64.java → common/src/main/java/com/jpsoft/supervision/modules/common/utils/Base64.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.common.utils;
+package com.jpsoft.supervision.modules.common.utils;
 
 public final class Base64 {
 

common/src/main/java/com/jpsoft/campus/modules/common/utils/CheckIdCard.java → common/src/main/java/com/jpsoft/supervision/modules/common/utils/CheckIdCard.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.common.utils;
+package com.jpsoft.supervision.modules.common.utils;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;

common/src/main/java/com/jpsoft/campus/modules/common/utils/DES3.java → common/src/main/java/com/jpsoft/supervision/modules/common/utils/DES3.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.common.utils;
+package com.jpsoft.supervision.modules.common.utils;
 
 import javax.crypto.Cipher;
 import javax.crypto.SecretKeyFactory;

common/src/main/java/com/jpsoft/campus/modules/common/utils/FileUtil.java → common/src/main/java/com/jpsoft/supervision/modules/common/utils/FileUtil.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.common.utils;
+package com.jpsoft.supervision.modules.common.utils;
 
 import java.io.*;
 

common/src/main/java/com/jpsoft/campus/modules/common/utils/Generator/AbstractCaptchaA.java → common/src/main/java/com/jpsoft/supervision/modules/common/utils/Generator/AbstractCaptchaA.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.common.utils.Generator;
+package com.jpsoft.supervision.modules.common.utils.Generator;
 
 import cn.hutool.captcha.ICaptcha;
 import cn.hutool.captcha.generator.CodeGenerator;

common/src/main/java/com/jpsoft/campus/modules/common/utils/Generator/AbstractGeneratorA.java → common/src/main/java/com/jpsoft/supervision/modules/common/utils/Generator/AbstractGeneratorA.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.common.utils.Generator;
+package com.jpsoft.supervision.modules.common.utils.Generator;
 
 import cn.hutool.captcha.generator.CodeGenerator;
 

common/src/main/java/com/jpsoft/campus/modules/common/utils/Generator/CaptchaUtilA.java → common/src/main/java/com/jpsoft/supervision/modules/common/utils/Generator/CaptchaUtilA.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.common.utils.Generator;
+package com.jpsoft.supervision.modules.common.utils.Generator;
 
 import cn.hutool.captcha.CircleCaptcha;
 import cn.hutool.captcha.LineCaptcha;

common/src/main/java/com/jpsoft/campus/modules/common/utils/Generator/CircleCaptchaA.java → common/src/main/java/com/jpsoft/supervision/modules/common/utils/Generator/CircleCaptchaA.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.common.utils.Generator;
+package com.jpsoft.supervision.modules.common.utils.Generator;
 
 import cn.hutool.core.img.GraphicsUtil;
 import cn.hutool.core.img.ImgUtil;

common/src/main/java/com/jpsoft/campus/modules/common/utils/Generator/RandomGeneratorA.java → common/src/main/java/com/jpsoft/supervision/modules/common/utils/Generator/RandomGeneratorA.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.common.utils.Generator;
+package com.jpsoft.supervision.modules.common.utils.Generator;
 
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;

common/src/main/java/com/jpsoft/campus/modules/common/utils/HttpConnectionUtil.java → common/src/main/java/com/jpsoft/supervision/modules/common/utils/HttpConnectionUtil.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.common.utils;
+package com.jpsoft.supervision.modules.common.utils;
 
 import net.sf.json.JSONObject;
 import org.apache.http.HttpEntity;

common/src/main/java/com/jpsoft/campus/modules/common/utils/HttpUtil.java → common/src/main/java/com/jpsoft/supervision/modules/common/utils/HttpUtil.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.common.utils;
+package com.jpsoft.supervision.modules.common.utils;
 
 import lombok.extern.slf4j.Slf4j;
 

common/src/main/java/com/jpsoft/campus/modules/common/utils/MyX509TrustManager.java → common/src/main/java/com/jpsoft/supervision/modules/common/utils/MyX509TrustManager.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.common.utils;
+package com.jpsoft.supervision.modules.common.utils;
 
 import javax.net.ssl.X509TrustManager;
 import java.security.cert.CertificateException;

common/src/main/java/com/jpsoft/campus/modules/common/utils/OSSUtil.java → common/src/main/java/com/jpsoft/supervision/modules/common/utils/OSSUtil.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.common.utils;
+package com.jpsoft.supervision.modules.common.utils;
 
 import cn.hutool.core.codec.Base64Encoder;
 import cn.hutool.core.date.DateTime;
@@ -8,7 +8,7 @@ import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.model.GeneratePresignedUrlRequest;
 import com.aliyun.oss.model.OSSObject;
 import com.aliyun.oss.model.PutObjectResult;
-import com.jpsoft.campus.config.OSSConfig;
+import com.jpsoft.supervision.config.OSSConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 

common/src/main/java/com/jpsoft/campus/modules/common/utils/POIUtils.java → common/src/main/java/com/jpsoft/supervision/modules/common/utils/POIUtils.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.common.utils;
+package com.jpsoft.supervision.modules.common.utils;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.converter.ExcelToHtmlConverter;

common/src/main/java/com/jpsoft/campus/modules/common/utils/PojoUtils.java → common/src/main/java/com/jpsoft/supervision/modules/common/utils/PojoUtils.java

@@ -1,4 +1,4 @@
-package com.jpsoft.campus.modules.common.utils;
+package com.jpsoft.supervision.modules.common.utils;
 
 import com.github.dozermapper.core.DozerBeanMapperBuilder;
 import com.github.dozermapper.core.Mapper;

common/src/main/java/com/jpsoft/campus/modules/common/utils/SMSUtil.java → common/src/main/java/com/jpsoft/supervision/modules/common/utils/SMSUtil.java

@@ -1,6 +1,6 @@
-package com.jpsoft.campus.modules.common.utils;
+package com.jpsoft.supervision.modules.common.utils;
 
-import com.jpsoft.campus.modules.common.dto.MessageResult;
+import com.jpsoft.supervision.modules.common.dto.MessageResult;
 import com.taobao.api.ApiException;
 import com.taobao.api.DefaultTaobaoClient;
 import com.taobao.api.TaobaoClient;