Merge branch 'master' of ssh://192.168.8.213:10022/sinotech/hz-gzpt

hzgzpt-admin/src/main/java/com/miaxis/app/controller/news/NewsInfoController.java

@@ -2,7 +2,11 @@ package com.miaxis.app.controller.news;
 
 import java.util.List;
 
+import com.miaxis.app.news.domain.NewsInfo;
+import com.miaxis.app.news.service.INewsInfoService;
 import com.miaxis.common.constant.Constants;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.*;
 import com.miaxis.common.core.domain.Response;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -19,10 +23,6 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.enums.BusinessTypeEnum;
-import com.miaxis.app.user.domain.NewsInfo;
-import com.miaxis.app.user.service.INewsInfoService;
-import com.miaxis.common.utils.poi.ExcelUtil;
-import com.miaxis.common.core.page.ResponsePageInfo;
 
 /**
  * 【新闻(首页资讯、通知、公告相关)】Controller

hzgzpt-admin/src/main/java/com/miaxis/app/controller/school/SchoolRegionController.java

@@ -1,6 +1,11 @@
 package com.miaxis.app.controller.school;
 
 import java.util.List;
+
+import com.miaxis.app.school.domain.SchoolRegion;
+import com.miaxis.app.school.service.ISchoolRegionService;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.*;
 import com.miaxis.common.core.domain.Response;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -17,10 +22,7 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.enums.BusinessTypeEnum;
-import com.miaxis.app.user.domain.SchoolRegion;
-import com.miaxis.app.user.service.ISchoolRegionService;
-import com.miaxis.common.utils.poi.ExcelUtil;
-import com.miaxis.common.core.page.ResponsePageInfo;
+
 
 /**
  * 【驾校训练场】Controller

hzgzpt-admin/src/main/java/com/miaxis/app/controller/sms/SmsController.java

@@ -1,10 +1,10 @@
 package com.miaxis.app.controller.sms;
 
+import com.miaxis.app.sms.ISmsService;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.SysUser;
 import com.miaxis.common.utils.SecurityUtils;
-import com.miaxis.app.user.service.ISmsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

hzgzpt-service-app/src/main/java/com/miaxis/app/user/domain/NewsInfo.java → hzgzpt-service-app/src/main/java/com/miaxis/app/news/domain/NewsInfo.java

@@ -1,17 +1,14 @@
-package com.miaxis.app.user.domain;
+package com.miaxis.app.news.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.miaxis.common.annotation.Excel;
 import com.miaxis.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
 import lombok.Data;
+
 /**
  * 新闻(首页资讯、通知、公告相关)对象 news_info
  *

hzgzpt-service-app/src/main/java/com/miaxis/app/user/mapper/NewsInfoMapper.java → hzgzpt-service-app/src/main/java/com/miaxis/app/news/mapper/NewsInfoMapper.java

@@ -1,8 +1,8 @@
-package com.miaxis.app.user.mapper;
+package com.miaxis.app.news.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.app.user.domain.NewsInfo;
+import com.miaxis.app.news.domain.NewsInfo;
 
 import java.util.List;
 

hzgzpt-service-app/src/main/java/com/miaxis/app/user/service/INewsInfoService.java → hzgzpt-service-app/src/main/java/com/miaxis/app/news/service/INewsInfoService.java

@@ -1,8 +1,8 @@
-package com.miaxis.app.user.service;
+package com.miaxis.app.news.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.app.user.domain.NewsInfo;
+import com.miaxis.app.news.domain.NewsInfo;
 
 import java.util.List;
 

hzgzpt-service-app/src/main/java/com/miaxis/app/user/service/impl/NewsInfoServiceImpl.java → hzgzpt-service-app/src/main/java/com/miaxis/app/news/service/impl/NewsInfoServiceImpl.java

@@ -1,12 +1,11 @@
-package com.miaxis.app.user.service.impl;
+package com.miaxis.app.news.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.app.user.domain.NewsInfo;
-import com.miaxis.app.user.mapper.NewsInfoMapper;
-import com.miaxis.app.user.service.INewsInfoService;
+import com.miaxis.app.news.domain.NewsInfo;
+import com.miaxis.app.news.mapper.NewsInfoMapper;
+import com.miaxis.app.news.service.INewsInfoService;
 import com.miaxis.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

hzgzpt-service-app/src/main/java/com/miaxis/app/user/domain/SchoolRegion.java → hzgzpt-service-app/src/main/java/com/miaxis/app/school/domain/SchoolRegion.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.user.domain;
+package com.miaxis.app.school.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+
 /**
  * 驾校训练场对象 school_region
  *

hzgzpt-service-app/src/main/java/com/miaxis/app/user/mapper/SchoolRegionMapper.java → hzgzpt-service-app/src/main/java/com/miaxis/app/school/mapper/SchoolRegionMapper.java

@@ -1,8 +1,8 @@
-package com.miaxis.app.user.mapper;
+package com.miaxis.app.school.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.app.user.domain.SchoolRegion;
+import com.miaxis.app.school.domain.SchoolRegion;
 
 import java.util.List;
 

hzgzpt-service-app/src/main/java/com/miaxis/app/user/service/ISchoolRegionService.java → hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/ISchoolRegionService.java

@@ -1,8 +1,8 @@
-package com.miaxis.app.user.service;
+package com.miaxis.app.school.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.app.user.domain.SchoolRegion;
+import com.miaxis.app.school.domain.SchoolRegion;
 
 import java.util.List;
 

hzgzpt-service-app/src/main/java/com/miaxis/app/user/service/impl/SchoolRegionServiceImpl.java → hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/impl/SchoolRegionServiceImpl.java

@@ -1,12 +1,11 @@
-package com.miaxis.app.user.service.impl;
+package com.miaxis.app.school.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.app.user.domain.SchoolRegion;
-import com.miaxis.app.user.mapper.SchoolRegionMapper;
-import com.miaxis.app.user.service.ISchoolRegionService;
+import com.miaxis.app.school.domain.SchoolRegion;
+import com.miaxis.app.school.mapper.SchoolRegionMapper;
+import com.miaxis.app.school.service.ISchoolRegionService;
 import com.miaxis.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

hzgzpt-service-app/src/main/java/com/miaxis/app/user/service/ISmsService.java → hzgzpt-service-app/src/main/java/com/miaxis/app/sms/ISmsService.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.user.service;
+package com.miaxis.app.sms;
 
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.SysUser;

hzgzpt-service-app/src/main/java/com/miaxis/app/user/service/impl/SmsServiceImpl.java → hzgzpt-service-app/src/main/java/com/miaxis/app/sms/impl/SmsServiceImpl.java

@@ -1,6 +1,6 @@
-package com.miaxis.app.user.service.impl;
+package com.miaxis.app.sms.impl;
 
-import com.miaxis.app.user.service.ISmsService;
+import com.miaxis.app.sms.ISmsService;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.ResponseEnum;

hzgzpt-service-app/src/main/resources/mapper/news/NewsInfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.miaxis.app.user.mapper.NewsInfoMapper">
+<mapper namespace="com.miaxis.app.news.mapper.NewsInfoMapper">
     
     <resultMap type="NewsInfo" id="NewsInfoResult">
         <result property="id"    column="id"    />

hzgzpt-service-app/src/main/resources/mapper/school/SchoolRegionMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.miaxis.app.user.mapper.SchoolRegionMapper">
+<mapper namespace="com.miaxis.app.school.mapper.SchoolRegionMapper">
     
     <resultMap type="SchoolRegion" id="SchoolRegionResult">
         <result property="id"    column="id"    />