专业分类

zhongzheng-admin/pom.xml

@@ -77,11 +77,7 @@
             <artifactId>zhongzheng-generator</artifactId>
         </dependency>
 
-        <!--  demo模块  -->
-        <dependency>
-            <groupId>com.zhongzheng</groupId>
-            <artifactId>zhongzheng-demo</artifactId>
-        </dependency>
+
 
     </dependencies>
 
@@ -102,17 +98,17 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>   
-                <groupId>org.apache.maven.plugins</groupId>   
-                <artifactId>maven-war-plugin</artifactId>   
-                <version>3.1.0</version>   
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.1.0</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                     <warName>${project.artifactId}</warName>
-                </configuration>   
-           </plugin>   
+                </configuration>
+           </plugin>
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>
 
-</project>
+</project>

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/MajorCategoryController.java

@@ -0,0 +1,113 @@
+package com.zhongzheng.controller.course;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.course.bo.MajorCategoryAddBo;
+import com.zhongzheng.modules.course.bo.MajorCategoryEditBo;
+import com.zhongzheng.modules.course.bo.MajorCategoryQueryBo;
+import com.zhongzheng.modules.course.service.IMajorCategoryService;
+import com.zhongzheng.modules.course.vo.MajorCategoryVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 【专业分类】Controller
+ *
+ * @author hjl
+ * @date 2021-05-13
+ */
+@Api(value = "【专业分类】控制器", tags = {"专业分类"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/course/category")
+public class MajorCategoryController extends BaseController {
+
+    private final IMajorCategoryService iMajorCategoryService;
+
+    /**
+     * 查询【专业分类】列表
+     */
+    @ApiOperation("查询【专业分类】列表")
+    @PreAuthorize("@ss.hasPermi('course:category:list')")
+    @GetMapping("/list")
+    public TableDataInfo<MajorCategoryVo> list(MajorCategoryQueryBo bo) {
+        startPage();
+        List<MajorCategoryVo> list = iMajorCategoryService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【专业分类】列表
+     */
+    @ApiOperation("导出【专业分类】列表")
+    @PreAuthorize("@ss.hasPermi('course:category:export')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<MajorCategoryVo> export(MajorCategoryQueryBo bo) {
+        List<MajorCategoryVo> list = iMajorCategoryService.queryList(bo);
+        ExcelUtil<MajorCategoryVo> util = new ExcelUtil<MajorCategoryVo>(MajorCategoryVo.class);
+        return util.exportExcel(list, "【专业分类】");
+    }
+
+    /**
+     * 获取【专业分类】详细信息
+     */
+    @ApiOperation("获取【专业分类】详细信息")
+    @PreAuthorize("@ss.hasPermi('course:category:query')")
+    @GetMapping("/{categoryId}")
+    public AjaxResult<MajorCategoryVo> getInfo(@PathVariable("categoryId" ) Long categoryId) {
+        return AjaxResult.success(iMajorCategoryService.queryById(categoryId));
+    }
+
+    /**
+     * 新增【专业分类】
+     */
+    @ApiOperation("新增【专业分类】")
+    @PreAuthorize("@ss.hasPermi('course:category:add')")
+    @Log(title = "【专业分类】", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@Validated  @RequestBody MajorCategoryAddBo bo) {
+        return toAjax(iMajorCategoryService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改【专业分类】
+     */
+    @ApiOperation("修改【专业分类】")
+    @PreAuthorize("@ss.hasPermi('course:category:edit')")
+    @Log(title = "【专业分类】", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@Validated @RequestBody MajorCategoryEditBo bo) {
+        return toAjax(iMajorCategoryService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除【专业分类】
+     */
+    @ApiOperation("删除【专业分类】")
+    @PreAuthorize("@ss.hasPermi('course:category:remove')")
+    @Log(title = "【专业分类】" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{categoryIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] categoryIds) {
+        return toAjax(iMajorCategoryService.deleteWithValidByIds(Arrays.asList(categoryIds), true) ? 1 : 0);
+    }
+}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/monitor/SysLogininforController.java

@@ -14,8 +14,8 @@ import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.system.domain.SysLogininfor;
-import com.zhongzheng.system.service.ISysLogininforService;
+import com.zhongzheng.modules.system.domain.SysLogininfor;
+import com.zhongzheng.modules.system.service.ISysLogininforService;
 
 /**
  * 系统访问记录

zhongzheng-admin/src/main/java/com/zhongzheng/controller/monitor/SysOperlogController.java

@@ -14,8 +14,8 @@ import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.system.domain.SysOperLog;
-import com.zhongzheng.system.service.ISysOperLogService;
+import com.zhongzheng.modules.system.domain.SysOperLog;
+import com.zhongzheng.modules.system.service.ISysOperLogService;
 
 /**
  * 操作日志记录

zhongzheng-admin/src/main/java/com/zhongzheng/controller/monitor/SysUserOnlineController.java

@@ -10,8 +10,8 @@ import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.core.redis.RedisCache;
 import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.system.domain.SysUserOnline;
-import com.zhongzheng.system.service.ISysUserOnlineService;
+import com.zhongzheng.modules.system.domain.SysUserOnline;
+import com.zhongzheng.modules.system.service.ISysUserOnlineService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

zhongzheng-admin/src/main/java/com/zhongzheng/controller/system/SysConfigController.java

@@ -21,8 +21,8 @@ import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.system.domain.SysConfig;
-import com.zhongzheng.system.service.ISysConfigService;
+import com.zhongzheng.modules.system.domain.SysConfig;
+import com.zhongzheng.modules.system.service.ISysConfigService;
 
 /**
  * 参数配置 信息操作处理

zhongzheng-admin/src/main/java/com/zhongzheng/controller/system/SysDeptController.java

@@ -8,7 +8,7 @@ import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.domain.entity.SysDept;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.SecurityUtils;
-import com.zhongzheng.system.service.ISysDeptService;
+import com.zhongzheng.modules.system.service.ISysDeptService;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

zhongzheng-admin/src/main/java/com/zhongzheng/controller/system/SysDictDataController.java

@@ -9,8 +9,8 @@ import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.system.service.ISysDictDataService;
-import com.zhongzheng.system.service.ISysDictTypeService;
+import com.zhongzheng.modules.system.service.ISysDictDataService;
+import com.zhongzheng.modules.system.service.ISysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;

zhongzheng-admin/src/main/java/com/zhongzheng/controller/system/SysDictTypeController.java

@@ -21,7 +21,7 @@ import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.system.service.ISysDictTypeService;
+import com.zhongzheng.modules.system.service.ISysDictTypeService;
 
 /**
  * 数据字典信息

zhongzheng-admin/src/main/java/com/zhongzheng/controller/system/SysLoginController.java

@@ -10,7 +10,7 @@ import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.framework.web.service.SysLoginService;
 import com.zhongzheng.framework.web.service.SysPermissionService;
 import com.zhongzheng.framework.web.service.TokenService;
-import com.zhongzheng.system.service.ISysMenuService;
+import com.zhongzheng.modules.system.service.ISysMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;

zhongzheng-admin/src/main/java/com/zhongzheng/controller/system/SysMenuController.java

@@ -12,7 +12,7 @@ import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.framework.web.service.TokenService;
-import com.zhongzheng.system.service.ISysMenuService;
+import com.zhongzheng.modules.system.service.ISysMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;

zhongzheng-admin/src/main/java/com/zhongzheng/controller/system/SysNoticeController.java

@@ -18,8 +18,8 @@ import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.SecurityUtils;
-import com.zhongzheng.system.domain.SysNotice;
-import com.zhongzheng.system.service.ISysNoticeService;
+import com.zhongzheng.modules.system.domain.SysNotice;
+import com.zhongzheng.modules.system.service.ISysNoticeService;
 
 /**
  * 公告 信息操作处理

zhongzheng-admin/src/main/java/com/zhongzheng/controller/system/SysPostController.java

@@ -20,8 +20,8 @@ import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.system.domain.SysPost;
-import com.zhongzheng.system.service.ISysPostService;
+import com.zhongzheng.modules.system.domain.SysPost;
+import com.zhongzheng.modules.system.service.ISysPostService;
 
 /**
  * 岗位信息操作处理

zhongzheng-admin/src/main/java/com/zhongzheng/controller/system/SysProfileController.java

@@ -13,7 +13,7 @@ import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.file.FileUploadUtils;
 import com.zhongzheng.framework.web.service.TokenService;
-import com.zhongzheng.system.service.ISysUserService;
+import com.zhongzheng.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

zhongzheng-admin/src/main/java/com/zhongzheng/controller/system/SysRoleController.java

@@ -14,8 +14,8 @@ import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.framework.web.service.SysPermissionService;
 import com.zhongzheng.framework.web.service.TokenService;
-import com.zhongzheng.system.service.ISysRoleService;
-import com.zhongzheng.system.service.ISysUserService;
+import com.zhongzheng.modules.system.service.ISysRoleService;
+import com.zhongzheng.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;

zhongzheng-admin/src/main/java/com/zhongzheng/controller/system/SysUserController.java

@@ -14,9 +14,9 @@ import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.framework.web.service.TokenService;
-import com.zhongzheng.system.service.ISysPostService;
-import com.zhongzheng.system.service.ISysRoleService;
-import com.zhongzheng.system.service.ISysUserService;
+import com.zhongzheng.modules.system.service.ISysPostService;
+import com.zhongzheng.modules.system.service.ISysRoleService;
+import com.zhongzheng.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;

zhongzheng-admin/src/main/resources/application-dev.yml

@@ -58,7 +58,7 @@ spring:
     # redis 配置
     redis:
         # 地址
-        host: 127.0.0.1
+        host: 192.168.0.222
         # 端口，默认为6379
         port: 6379
         # 数据库索引

zhongzheng-admin/src/main/resources/application.yml

@@ -214,7 +214,7 @@ swagger:
   # 是否开启swagger
   enabled: true
   # 请求前缀
-  pathMapping: /dev-api
+  pathMapping:
 
 # 防止XSS攻击
 xss:

zhongzheng-api/src/main/resources/application.yml

@@ -214,7 +214,7 @@ swagger:
   # 是否开启swagger
   enabled: true
   # 请求前缀
-  pathMapping: /dev-api
+  pathMapping:
 
 # 防止XSS攻击
 xss:

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/DateUtils.java

@@ -8,7 +8,7 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 
 /**
  * 时间工具类
- * 
+ *
  * @author zhongzheng
  */
 public class DateUtils extends org.apache.commons.lang3.time.DateUtils
@@ -22,15 +22,15 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
 
     public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
-    
+
     private static String[] parsePatterns = {
-            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", 
+            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
             "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
             "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
 
     /**
      * 获取当前Date型日期
-     * 
+     *
      * @return Date() 当前日期
      */
     public static Date getNowDate()
@@ -40,7 +40,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
 
     /**
      * 获取当前日期, 默认格式为yyyy-MM-dd
-     * 
+     *
      * @return String
      */
     public static String getDate()
@@ -121,7 +121,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
             return null;
         }
     }
-    
+
     /**
      * 获取服务器启动时间
      */
@@ -152,4 +152,9 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         // long sec = diff % nd % nh % nm / ns;
         return day + "天" + hour + "小时" + min + "分钟";
     }
+
+    public static Long getNowTime()
+    {
+        return System.currentTimeMillis()/1000;
+    }
 }

zhongzheng-framework/src/main/java/com/zhongzheng/framework/aspectj/LogAspect.java

@@ -12,7 +12,7 @@ import com.zhongzheng.common.utils.spring.SpringUtils;
 import com.zhongzheng.framework.manager.AsyncManager;
 import com.zhongzheng.framework.manager.factory.AsyncFactory;
 import com.zhongzheng.framework.web.service.TokenService;
-import com.zhongzheng.system.domain.SysOperLog;
+import com.zhongzheng.modules.system.domain.SysOperLog;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.Signature;
 import org.aspectj.lang.annotation.AfterReturning;
@@ -36,7 +36,7 @@ import java.util.Map;
 
 /**
  * 操作日志记录处理
- * 
+ *
  * @author zhongzheng
  */
 @Aspect
@@ -64,7 +64,7 @@ public class LogAspect
 
     /**
      * 拦截异常操作
-     * 
+     *
      * @param joinPoint 切点
      * @param e 异常
      */
@@ -130,7 +130,7 @@ public class LogAspect
 
     /**
      * 获取注解中对方法的描述信息 用于Controller层注解
-     * 
+     *
      * @param log 日志
      * @param operLog 操作日志
      * @throws Exception
@@ -153,7 +153,7 @@ public class LogAspect
 
     /**
      * 获取请求的参数，放到log中
-     * 
+     *
      * @param operLog 操作日志
      * @throws Exception 异常
      */
@@ -210,7 +210,7 @@ public class LogAspect
 
     /**
      * 判断是否需要过滤的对象。
-     * 
+     *
      * @param o 对象信息。
      * @return 如果是需要过滤的对象，则返回true；否则返回false。
      */

zhongzheng-framework/src/main/java/com/zhongzheng/framework/manager/factory/AsyncFactory.java

@@ -7,10 +7,10 @@ import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.ip.AddressUtils;
 import com.zhongzheng.common.utils.ip.IpUtils;
 import com.zhongzheng.common.utils.spring.SpringUtils;
-import com.zhongzheng.system.domain.SysLogininfor;
-import com.zhongzheng.system.domain.SysOperLog;
-import com.zhongzheng.system.service.ISysLogininforService;
-import com.zhongzheng.system.service.ISysOperLogService;
+import com.zhongzheng.modules.system.domain.SysLogininfor;
+import com.zhongzheng.modules.system.domain.SysOperLog;
+import com.zhongzheng.modules.system.service.ISysLogininforService;
+import com.zhongzheng.modules.system.service.ISysOperLogService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -18,7 +18,7 @@ import java.util.TimerTask;
 
 /**
  * 异步工厂（产生任务用）
- * 
+ *
  * @author zhongzheng
  */
 public class AsyncFactory
@@ -27,7 +27,7 @@ public class AsyncFactory
 
     /**
      * 记录登录信息
-     * 
+     *
      * @param username 用户名
      * @param status 状态
      * @param message 消息
@@ -82,7 +82,7 @@ public class AsyncFactory
 
     /**
      * 操作日志记录
-     * 
+     *
      * @param operLog 操作日志信息
      * @return 任务task
      */

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/SysPermissionService.java

@@ -5,12 +5,12 @@ import java.util.Set;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import com.zhongzheng.common.core.domain.entity.SysUser;
-import com.zhongzheng.system.service.ISysMenuService;
-import com.zhongzheng.system.service.ISysRoleService;
+import com.zhongzheng.modules.system.service.ISysMenuService;
+import com.zhongzheng.modules.system.service.ISysRoleService;
 
 /**
  * 用户权限处理
- * 
+ *
  * @author zhongzheng
  */
 @Component
@@ -24,7 +24,7 @@ public class SysPermissionService
 
     /**
      * 获取角色数据权限
-     * 
+     *
      * @param user 用户信息
      * @return 角色权限信息
      */
@@ -45,7 +45,7 @@ public class SysPermissionService
 
     /**
      * 获取菜单数据权限
-     * 
+     *
      * @param user 用户信息
      * @return 菜单权限信息
      */

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserDetailsServiceImpl.java

@@ -5,7 +5,7 @@ import com.zhongzheng.common.core.domain.entity.SysUser;
 import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.enums.UserStatus;
 import com.zhongzheng.common.exception.BaseException;
-import com.zhongzheng.system.service.ISysUserService;
+import com.zhongzheng.modules.system.service.ISysUserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/MajorCategoryAddBo.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.course.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+
+
+/**
+ * 【专业分类】添加对象 major_category
+ *
+ * @author hjl
+ * @date 2021-05-13
+ */
+@Data
+@ApiModel("【专业分类】添加对象")
+public class MajorCategoryAddBo {
+
+    /** 父ID */
+    @ApiModelProperty("父ID")
+    private Long pId;
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Integer sort;
+    /** 1正常 0关闭 */
+    @ApiModelProperty("1正常 0关闭")
+    private Integer status;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    /** 分类名称 */
+    @ApiModelProperty("分类名称")
+    @NotBlank(message = "分类名称不能为空")
+    private String categoryName;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/MajorCategoryEditBo.java

@@ -0,0 +1,51 @@
+package com.zhongzheng.modules.course.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+
+/**
+ * 【专业分类】编辑对象 major_category
+ *
+ * @author hjl
+ * @date 2021-05-13
+ */
+@Data
+@ApiModel("【专业分类】编辑对象")
+public class MajorCategoryEditBo {
+
+
+    /** 类目ID */
+    @ApiModelProperty("类目ID")
+    private Long categoryId;
+
+    /** 父ID */
+    @ApiModelProperty("父ID")
+    private Long pId;
+
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Integer sort;
+
+    /** 1正常 0关闭 */
+    @ApiModelProperty("1正常 0关闭")
+    private Integer status;
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+    /** 分类名称 */
+    @ApiModelProperty("分类名称")
+    @NotBlank(message = "分类名称不能为空")
+    private String categoryName;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/MajorCategoryQueryBo.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.course.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 【专业分类】分页查询对象 major_category
+ *
+ * @author hjl
+ * @date 2021-05-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("【专业分类】分页查询对象")
+public class MajorCategoryQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 父ID */
+	@ApiModelProperty("父ID")
+	private Long pId;
+	/** 排序 */
+	@ApiModelProperty("排序")
+	private Integer sort;
+	/** 1正常 0关闭 */
+	@ApiModelProperty("1正常 0关闭")
+	private Integer status;
+	/** 分类名称 */
+	@ApiModelProperty("分类名称")
+	private String categoryName;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/MajorCategory.java

@@ -0,0 +1,56 @@
+package com.zhongzheng.modules.course.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 【专业分类】对象 major_category
+ *
+ * @author hjl
+ * @date 2021-05-13
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("major_category")
+public class MajorCategory implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** 类目ID */
+    @TableId(value = "category_id")
+    private Long categoryId;
+
+    /** 父ID */
+    private Long pId;
+
+    /** 排序 */
+    private Integer sort;
+
+    /** 1正常 0关闭 */
+    private Integer status;
+
+    /** 备注 */
+    private String remark;
+
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+
+    /** 分类名称 */
+    private String categoryName;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/MajorCategoryMapper.java

@@ -0,0 +1,16 @@
+package com.zhongzheng.modules.course.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.common.core.domain.entity.SysMenu;
+import com.zhongzheng.modules.course.domain.MajorCategory;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * @author hjl
+ */
+public interface MajorCategoryMapper extends BaseMapper<MajorCategory> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/IMajorCategoryService.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.course.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.course.bo.MajorCategoryAddBo;
+import com.zhongzheng.modules.course.bo.MajorCategoryEditBo;
+import com.zhongzheng.modules.course.bo.MajorCategoryQueryBo;
+import com.zhongzheng.modules.course.domain.MajorCategory;
+import com.zhongzheng.modules.course.vo.MajorCategoryVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 【专业分类】Service接口
+ *
+ * @author hjl
+ * @date 2021-05-13
+ */
+public interface IMajorCategoryService extends IService<MajorCategory> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	MajorCategoryVo queryById(Long categoryId);
+
+	/**
+	 * 查询列表
+	 */
+	List<MajorCategoryVo> queryList(MajorCategoryQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入【请填写功能名称】
+	 * @param bo 【请填写功能名称】新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(MajorCategoryAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改【请填写功能名称】
+	 * @param bo 【请填写功能名称】编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(MajorCategoryEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/MajorCategoryServiceImpl.java

@@ -0,0 +1,102 @@
+package com.zhongzheng.modules.course.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.course.bo.MajorCategoryAddBo;
+import com.zhongzheng.modules.course.bo.MajorCategoryEditBo;
+import com.zhongzheng.modules.course.bo.MajorCategoryQueryBo;
+import com.zhongzheng.modules.course.domain.MajorCategory;
+import com.zhongzheng.modules.course.mapper.MajorCategoryMapper;
+import com.zhongzheng.modules.course.service.IMajorCategoryService;
+import com.zhongzheng.modules.course.vo.MajorCategoryVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 【专业分类】Service业务层处理
+ *
+ * @author hjl
+ * @date 2021-05-13
+ */
+@Service
+public class MajorCategoryServiceImpl extends ServiceImpl<MajorCategoryMapper, MajorCategory> implements IMajorCategoryService {
+
+    @Override
+    public MajorCategoryVo queryById(Long categoryId){
+        MajorCategory db = this.baseMapper.selectById(categoryId);
+        return BeanUtil.toBean(db, MajorCategoryVo.class);
+    }
+
+    @Override
+    public List<MajorCategoryVo> queryList(MajorCategoryQueryBo bo) {
+        LambdaQueryWrapper<MajorCategory> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getPId() != null, MajorCategory::getPId, bo.getPId());
+        lqw.eq(bo.getSort() != null, MajorCategory::getSort, bo.getSort());
+        lqw.eq(bo.getStatus() != null, MajorCategory::getStatus, bo.getStatus());
+        lqw.like(StrUtil.isNotBlank(bo.getCategoryName()), MajorCategory::getCategoryName, bo.getCategoryName());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<MajorCategoryVo> entity2Vo(Collection<MajorCategory> collection) {
+        List<MajorCategoryVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, MajorCategoryVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<MajorCategory> page = (Page<MajorCategory>)collection;
+            Page<MajorCategoryVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(MajorCategoryAddBo bo) {
+        MajorCategory add = BeanUtil.toBean(bo, MajorCategory.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(MajorCategoryEditBo bo) {
+        MajorCategory update = BeanUtil.toBean(bo, MajorCategory.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(MajorCategory entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/MajorCategoryVo.java

@@ -0,0 +1,43 @@
+package com.zhongzheng.modules.course.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+
+@Data
+@ApiModel("【专业分类】视图对象")
+public class MajorCategoryVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 类目ID */
+	@ApiModelProperty("类目ID")
+	private Long categoryId;
+
+	/** 父ID */
+	@Excel(name = "父ID")
+	@ApiModelProperty("父ID")
+	private Long pId;
+	/** 排序 */
+	@Excel(name = "排序")
+	@ApiModelProperty("排序")
+	private Integer sort;
+	/** 1正常 0关闭 */
+	@Excel(name = "1正常 0关闭")
+	@ApiModelProperty("1正常 0关闭")
+	private Integer status;
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
+	/** 分类名称 */
+	@Excel(name = "分类名称")
+	@ApiModelProperty("分类名称")
+	private String categoryName;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/system/domain/SysConfig.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysConfig.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.domain;
+package com.zhongzheng.modules.system.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;

zhongzheng-system/src/main/java/com/zhongzheng/system/domain/SysLogininfor.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysLogininfor.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.domain;
+package com.zhongzheng.modules.system.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

zhongzheng-system/src/main/java/com/zhongzheng/system/domain/SysNotice.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysNotice.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.domain;
+package com.zhongzheng.modules.system.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;

zhongzheng-system/src/main/java/com/zhongzheng/system/domain/SysOperLog.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysOperLog.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.domain;
+package com.zhongzheng.modules.system.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

zhongzheng-system/src/main/java/com/zhongzheng/system/domain/SysPost.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysPost.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.domain;
+package com.zhongzheng.modules.system.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;

zhongzheng-system/src/main/java/com/zhongzheng/system/domain/SysRoleDept.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysRoleDept.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.domain;
+package com.zhongzheng.modules.system.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

zhongzheng-system/src/main/java/com/zhongzheng/system/domain/SysRoleMenu.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysRoleMenu.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.domain;
+package com.zhongzheng.modules.system.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

zhongzheng-system/src/main/java/com/zhongzheng/system/domain/SysUserOnline.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysUserOnline.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.domain;
+package com.zhongzheng.modules.system.domain;
 
 import lombok.*;
 import lombok.experimental.Accessors;

zhongzheng-system/src/main/java/com/zhongzheng/system/domain/SysUserPost.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysUserPost.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.domain;
+package com.zhongzheng.modules.system.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

zhongzheng-system/src/main/java/com/zhongzheng/system/domain/SysUserRole.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysUserRole.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.domain;
+package com.zhongzheng.modules.system.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

zhongzheng-system/src/main/java/com/zhongzheng/system/domain/vo/MetaVo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/vo/MetaVo.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.domain.vo;
+package com.zhongzheng.modules.system.domain.vo;
 
 import lombok.*;
 import lombok.experimental.Accessors;

zhongzheng-system/src/main/java/com/zhongzheng/system/domain/vo/RouterVo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/vo/RouterVo.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.domain.vo;
+package com.zhongzheng.modules.system.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.*;

zhongzheng-system/src/main/java/com/zhongzheng/system/mapper/SysConfigMapper.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/mapper/SysConfigMapper.java

@@ -1,7 +1,7 @@
-package com.zhongzheng.system.mapper;
+package com.zhongzheng.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.system.domain.SysConfig;
+import com.zhongzheng.modules.system.domain.SysConfig;
 
 /**
  * 参数配置 数据层

zhongzheng-system/src/main/java/com/zhongzheng/system/mapper/SysDeptMapper.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/mapper/SysDeptMapper.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.mapper;
+package com.zhongzheng.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.common.core.domain.entity.SysDept;

zhongzheng-system/src/main/java/com/zhongzheng/system/mapper/SysDictDataMapper.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/mapper/SysDictDataMapper.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.mapper;
+package com.zhongzheng.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.common.core.domain.entity.SysDictData;

zhongzheng-system/src/main/java/com/zhongzheng/system/mapper/SysDictTypeMapper.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/mapper/SysDictTypeMapper.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.mapper;
+package com.zhongzheng.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.common.core.domain.entity.SysDictType;

zhongzheng-system/src/main/java/com/zhongzheng/system/mapper/SysLogininforMapper.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/mapper/SysLogininforMapper.java

@@ -1,7 +1,7 @@
-package com.zhongzheng.system.mapper;
+package com.zhongzheng.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.system.domain.SysLogininfor;
+import com.zhongzheng.modules.system.domain.SysLogininfor;
 
 /**
  * 系统访问日志情况信息 数据层

zhongzheng-system/src/main/java/com/zhongzheng/system/mapper/SysMenuMapper.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/mapper/SysMenuMapper.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.mapper;
+package com.zhongzheng.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.common.core.domain.entity.SysMenu;

zhongzheng-system/src/main/java/com/zhongzheng/system/mapper/SysNoticeMapper.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/mapper/SysNoticeMapper.java

@@ -1,7 +1,7 @@
-package com.zhongzheng.system.mapper;
+package com.zhongzheng.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.system.domain.SysNotice;
+import com.zhongzheng.modules.system.domain.SysNotice;
 
 /**
  * 通知公告表 数据层

zhongzheng-system/src/main/java/com/zhongzheng/system/mapper/SysOperLogMapper.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/mapper/SysOperLogMapper.java

@@ -1,7 +1,7 @@
-package com.zhongzheng.system.mapper;
+package com.zhongzheng.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.system.domain.SysOperLog;
+import com.zhongzheng.modules.system.domain.SysOperLog;
 
 /**
  * 操作日志 数据层

zhongzheng-system/src/main/java/com/zhongzheng/system/mapper/SysPostMapper.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/mapper/SysPostMapper.java

@@ -1,7 +1,7 @@
-package com.zhongzheng.system.mapper;
+package com.zhongzheng.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.system.domain.SysPost;
+import com.zhongzheng.modules.system.domain.SysPost;
 
 import java.util.List;
 

zhongzheng-system/src/main/java/com/zhongzheng/system/mapper/SysRoleDeptMapper.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/mapper/SysRoleDeptMapper.java

@@ -1,7 +1,7 @@
-package com.zhongzheng.system.mapper;
+package com.zhongzheng.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.system.domain.SysRoleDept;
+import com.zhongzheng.modules.system.domain.SysRoleDept;
 
 /**
  * 角色与部门关联表 数据层

zhongzheng-system/src/main/java/com/zhongzheng/system/mapper/SysRoleMapper.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/mapper/SysRoleMapper.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.mapper;
+package com.zhongzheng.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.common.core.domain.entity.SysRole;

zhongzheng-system/src/main/java/com/zhongzheng/system/mapper/SysRoleMenuMapper.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/mapper/SysRoleMenuMapper.java

@@ -1,7 +1,7 @@
-package com.zhongzheng.system.mapper;
+package com.zhongzheng.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.system.domain.SysRoleMenu;
+import com.zhongzheng.modules.system.domain.SysRoleMenu;
 
 /**
  * 角色与菜单关联表 数据层

zhongzheng-system/src/main/java/com/zhongzheng/system/mapper/SysUserMapper.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/mapper/SysUserMapper.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.mapper;
+package com.zhongzheng.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.common.core.domain.entity.SysUser;

zhongzheng-system/src/main/java/com/zhongzheng/system/mapper/SysUserPostMapper.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/mapper/SysUserPostMapper.java

@@ -1,7 +1,7 @@
-package com.zhongzheng.system.mapper;
+package com.zhongzheng.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.system.domain.SysUserPost;
+import com.zhongzheng.modules.system.domain.SysUserPost;
 
 /**
  * 用户与岗位关联表 数据层

zhongzheng-system/src/main/java/com/zhongzheng/system/mapper/SysUserRoleMapper.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/mapper/SysUserRoleMapper.java

@@ -1,7 +1,7 @@
-package com.zhongzheng.system.mapper;
+package com.zhongzheng.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.system.domain.SysUserRole;
+import com.zhongzheng.modules.system.domain.SysUserRole;
 
 /**
  * 用户与角色关联表 数据层

zhongzheng-system/src/main/java/com/zhongzheng/system/service/ISysConfigService.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/ISysConfigService.java

@@ -1,7 +1,7 @@
-package com.zhongzheng.system.service;
+package com.zhongzheng.modules.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.system.domain.SysConfig;
+import com.zhongzheng.modules.system.domain.SysConfig;
 
 import java.util.List;
 

zhongzheng-system/src/main/java/com/zhongzheng/system/service/ISysDeptService.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/ISysDeptService.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.service;
+package com.zhongzheng.modules.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.common.core.domain.TreeSelect;

zhongzheng-system/src/main/java/com/zhongzheng/system/service/ISysDictDataService.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/ISysDictDataService.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.service;
+package com.zhongzheng.modules.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.common.core.domain.entity.SysDictData;

zhongzheng-system/src/main/java/com/zhongzheng/system/service/ISysDictTypeService.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/ISysDictTypeService.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.service;
+package com.zhongzheng.modules.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.common.core.domain.entity.SysDictData;

zhongzheng-system/src/main/java/com/zhongzheng/system/service/ISysLogininforService.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/ISysLogininforService.java

@@ -1,7 +1,7 @@
-package com.zhongzheng.system.service;
+package com.zhongzheng.modules.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.system.domain.SysLogininfor;
+import com.zhongzheng.modules.system.domain.SysLogininfor;
 
 import java.util.List;
 

zhongzheng-system/src/main/java/com/zhongzheng/system/service/ISysMenuService.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/ISysMenuService.java

@@ -1,9 +1,9 @@
-package com.zhongzheng.system.service;
+package com.zhongzheng.modules.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.common.core.domain.TreeSelect;
 import com.zhongzheng.common.core.domain.entity.SysMenu;
-import com.zhongzheng.system.domain.vo.RouterVo;
+import com.zhongzheng.modules.system.domain.vo.RouterVo;
 
 import java.util.List;
 import java.util.Set;

zhongzheng-system/src/main/java/com/zhongzheng/system/service/ISysNoticeService.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/ISysNoticeService.java

@@ -1,7 +1,7 @@
-package com.zhongzheng.system.service;
+package com.zhongzheng.modules.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.system.domain.SysNotice;
+import com.zhongzheng.modules.system.domain.SysNotice;
 
 import java.util.List;
 

zhongzheng-system/src/main/java/com/zhongzheng/system/service/ISysOperLogService.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/ISysOperLogService.java

@@ -1,7 +1,7 @@
-package com.zhongzheng.system.service;
+package com.zhongzheng.modules.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.system.domain.SysOperLog;
+import com.zhongzheng.modules.system.domain.SysOperLog;
 
 import java.util.List;
 

zhongzheng-system/src/main/java/com/zhongzheng/system/service/ISysPostService.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/ISysPostService.java

@@ -1,7 +1,7 @@
-package com.zhongzheng.system.service;
+package com.zhongzheng.modules.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.system.domain.SysPost;
+import com.zhongzheng.modules.system.domain.SysPost;
 
 import java.util.List;
 

zhongzheng-system/src/main/java/com/zhongzheng/system/service/ISysRoleService.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/ISysRoleService.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.service;
+package com.zhongzheng.modules.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.common.core.domain.entity.SysRole;

zhongzheng-system/src/main/java/com/zhongzheng/system/service/ISysUserOnlineService.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/ISysUserOnlineService.java

@@ -1,7 +1,7 @@
-package com.zhongzheng.system.service;
+package com.zhongzheng.modules.system.service;
 
 import com.zhongzheng.common.core.domain.model.LoginUser;
-import com.zhongzheng.system.domain.SysUserOnline;
+import com.zhongzheng.modules.system.domain.SysUserOnline;
 
 /**
  * 在线用户 服务层

zhongzheng-system/src/main/java/com/zhongzheng/system/service/ISysUserService.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/ISysUserService.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.service;
+package com.zhongzheng.modules.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.common.core.domain.entity.SysUser;

zhongzheng-system/src/main/java/com/zhongzheng/system/service/impl/SysConfigServiceImpl.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysConfigServiceImpl.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.service.impl;
+package com.zhongzheng.modules.system.service.impl;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Validator;
@@ -11,9 +11,9 @@ import com.zhongzheng.common.constant.UserConstants;
 import com.zhongzheng.common.core.redis.RedisCache;
 import com.zhongzheng.common.enums.DataSourceType;
 import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.system.domain.SysConfig;
-import com.zhongzheng.system.mapper.SysConfigMapper;
-import com.zhongzheng.system.service.ISysConfigService;
+import com.zhongzheng.modules.system.domain.SysConfig;
+import com.zhongzheng.modules.system.mapper.SysConfigMapper;
+import com.zhongzheng.modules.system.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

zhongzheng-system/src/main/java/com/zhongzheng/system/service/impl/SysDeptServiceImpl.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysDeptServiceImpl.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.service.impl;
+package com.zhongzheng.modules.system.service.impl;
 
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
@@ -12,10 +12,10 @@ import com.zhongzheng.common.core.domain.entity.SysDept;
 import com.zhongzheng.common.core.domain.entity.SysRole;
 import com.zhongzheng.common.core.domain.entity.SysUser;
 import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.system.mapper.SysDeptMapper;
-import com.zhongzheng.system.mapper.SysRoleMapper;
-import com.zhongzheng.system.mapper.SysUserMapper;
-import com.zhongzheng.system.service.ISysDeptService;
+import com.zhongzheng.modules.system.mapper.SysDeptMapper;
+import com.zhongzheng.modules.system.service.ISysDeptService;
+import com.zhongzheng.modules.system.mapper.SysRoleMapper;
+import com.zhongzheng.modules.system.mapper.SysUserMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

zhongzheng-system/src/main/java/com/zhongzheng/system/service/impl/SysDictDataServiceImpl.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysDictDataServiceImpl.java

@@ -1,12 +1,12 @@
-package com.zhongzheng.system.service.impl;
+package com.zhongzheng.modules.system.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhongzheng.common.core.domain.entity.SysDictData;
 import com.zhongzheng.common.utils.DictUtils;
-import com.zhongzheng.system.mapper.SysDictDataMapper;
-import com.zhongzheng.system.service.ISysDictDataService;
+import com.zhongzheng.modules.system.mapper.SysDictDataMapper;
+import com.zhongzheng.modules.system.service.ISysDictDataService;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;

zhongzheng-system/src/main/java/com/zhongzheng/system/service/impl/SysDictTypeServiceImpl.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysDictTypeServiceImpl.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.service.impl;
+package com.zhongzheng.modules.system.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Validator;
@@ -11,9 +11,9 @@ import com.zhongzheng.common.core.domain.entity.SysDictData;
 import com.zhongzheng.common.core.domain.entity.SysDictType;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DictUtils;
-import com.zhongzheng.system.mapper.SysDictDataMapper;
-import com.zhongzheng.system.mapper.SysDictTypeMapper;
-import com.zhongzheng.system.service.ISysDictTypeService;
+import com.zhongzheng.modules.system.mapper.SysDictDataMapper;
+import com.zhongzheng.modules.system.mapper.SysDictTypeMapper;
+import com.zhongzheng.modules.system.service.ISysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

zhongzheng-system/src/main/java/com/zhongzheng/system/service/impl/SysLogininforServiceImpl.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysLogininforServiceImpl.java

@@ -1,12 +1,12 @@
-package com.zhongzheng.system.service.impl;
+package com.zhongzheng.modules.system.service.impl;
 
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhongzheng.system.domain.SysLogininfor;
-import com.zhongzheng.system.mapper.SysLogininforMapper;
-import com.zhongzheng.system.service.ISysLogininforService;
+import com.zhongzheng.modules.system.domain.SysLogininfor;
+import com.zhongzheng.modules.system.service.ISysLogininforService;
+import com.zhongzheng.modules.system.mapper.SysLogininforMapper;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;

zhongzheng-system/src/main/java/com/zhongzheng/system/service/impl/SysMenuServiceImpl.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysMenuServiceImpl.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.service.impl;
+package com.zhongzheng.modules.system.service.impl;
 
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
@@ -10,13 +10,13 @@ import com.zhongzheng.common.core.domain.entity.SysMenu;
 import com.zhongzheng.common.core.domain.entity.SysRole;
 import com.zhongzheng.common.core.domain.entity.SysUser;
 import com.zhongzheng.common.utils.SecurityUtils;
-import com.zhongzheng.system.domain.SysRoleMenu;
-import com.zhongzheng.system.domain.vo.MetaVo;
-import com.zhongzheng.system.domain.vo.RouterVo;
-import com.zhongzheng.system.mapper.SysMenuMapper;
-import com.zhongzheng.system.mapper.SysRoleMapper;
-import com.zhongzheng.system.mapper.SysRoleMenuMapper;
-import com.zhongzheng.system.service.ISysMenuService;
+import com.zhongzheng.modules.system.domain.SysRoleMenu;
+import com.zhongzheng.modules.system.domain.vo.MetaVo;
+import com.zhongzheng.modules.system.domain.vo.RouterVo;
+import com.zhongzheng.modules.system.service.ISysMenuService;
+import com.zhongzheng.modules.system.mapper.SysMenuMapper;
+import com.zhongzheng.modules.system.mapper.SysRoleMapper;
+import com.zhongzheng.modules.system.mapper.SysRoleMenuMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
 
 /**
  * 菜单 业务层处理
- * 
+ *
  * @author zhongzheng
  */
 @Service

zhongzheng-system/src/main/java/com/zhongzheng/system/service/impl/SysNoticeServiceImpl.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysNoticeServiceImpl.java

@@ -1,11 +1,11 @@
-package com.zhongzheng.system.service.impl;
+package com.zhongzheng.modules.system.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhongzheng.system.domain.SysNotice;
-import com.zhongzheng.system.mapper.SysNoticeMapper;
-import com.zhongzheng.system.service.ISysNoticeService;
+import com.zhongzheng.modules.system.domain.SysNotice;
+import com.zhongzheng.modules.system.service.ISysNoticeService;
+import com.zhongzheng.modules.system.mapper.SysNoticeMapper;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;

zhongzheng-system/src/main/java/com/zhongzheng/system/service/impl/SysOperLogServiceImpl.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysOperLogServiceImpl.java

@@ -1,13 +1,13 @@
-package com.zhongzheng.system.service.impl;
+package com.zhongzheng.modules.system.service.impl;
 
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhongzheng.system.domain.SysOperLog;
-import com.zhongzheng.system.mapper.SysOperLogMapper;
-import com.zhongzheng.system.service.ISysOperLogService;
+import com.zhongzheng.modules.system.domain.SysOperLog;
+import com.zhongzheng.modules.system.service.ISysOperLogService;
+import com.zhongzheng.modules.system.mapper.SysOperLogMapper;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;

zhongzheng-system/src/main/java/com/zhongzheng/system/service/impl/SysPostServiceImpl.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysPostServiceImpl.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.service.impl;
+package com.zhongzheng.modules.system.service.impl;
 
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
@@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhongzheng.common.constant.UserConstants;
 import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.system.domain.SysPost;
-import com.zhongzheng.system.domain.SysUserPost;
-import com.zhongzheng.system.mapper.SysPostMapper;
-import com.zhongzheng.system.mapper.SysUserPostMapper;
-import com.zhongzheng.system.service.ISysPostService;
+import com.zhongzheng.modules.system.domain.SysPost;
+import com.zhongzheng.modules.system.domain.SysUserPost;
+import com.zhongzheng.modules.system.mapper.SysPostMapper;
+import com.zhongzheng.modules.system.service.ISysPostService;
+import com.zhongzheng.modules.system.mapper.SysUserPostMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

zhongzheng-system/src/main/java/com/zhongzheng/system/service/impl/SysRoleServiceImpl.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysRoleServiceImpl.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.service.impl;
+package com.zhongzheng.modules.system.service.impl;
 
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
@@ -9,14 +9,14 @@ import com.zhongzheng.common.constant.UserConstants;
 import com.zhongzheng.common.core.domain.entity.SysRole;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.spring.SpringUtils;
-import com.zhongzheng.system.domain.SysRoleDept;
-import com.zhongzheng.system.domain.SysRoleMenu;
-import com.zhongzheng.system.domain.SysUserRole;
-import com.zhongzheng.system.mapper.SysRoleDeptMapper;
-import com.zhongzheng.system.mapper.SysRoleMapper;
-import com.zhongzheng.system.mapper.SysRoleMenuMapper;
-import com.zhongzheng.system.mapper.SysUserRoleMapper;
-import com.zhongzheng.system.service.ISysRoleService;
+import com.zhongzheng.modules.system.domain.SysRoleDept;
+import com.zhongzheng.modules.system.domain.SysRoleMenu;
+import com.zhongzheng.modules.system.domain.SysUserRole;
+import com.zhongzheng.modules.system.mapper.SysRoleDeptMapper;
+import com.zhongzheng.modules.system.mapper.SysRoleMapper;
+import com.zhongzheng.modules.system.mapper.SysRoleMenuMapper;
+import com.zhongzheng.modules.system.service.ISysRoleService;
+import com.zhongzheng.modules.system.mapper.SysUserRoleMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

zhongzheng-system/src/main/java/com/zhongzheng/system/service/impl/SysUserOnlineServiceImpl.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysUserOnlineServiceImpl.java

@@ -1,10 +1,10 @@
-package com.zhongzheng.system.service.impl;
+package com.zhongzheng.modules.system.service.impl;
 
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.core.domain.model.LoginUser;
-import com.zhongzheng.system.domain.SysUserOnline;
-import com.zhongzheng.system.service.ISysUserOnlineService;
+import com.zhongzheng.modules.system.domain.SysUserOnline;
+import com.zhongzheng.modules.system.service.ISysUserOnlineService;
 import org.springframework.stereotype.Service;
 
 /**

zhongzheng-system/src/main/java/com/zhongzheng/system/service/impl/SysUserServiceImpl.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysUserServiceImpl.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.system.service.impl;
+package com.zhongzheng.modules.system.service.impl;
 
 import cn.hutool.core.lang.Validator;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -10,12 +10,13 @@ import com.zhongzheng.common.core.domain.entity.SysRole;
 import com.zhongzheng.common.core.domain.entity.SysUser;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.SecurityUtils;
-import com.zhongzheng.system.domain.SysPost;
-import com.zhongzheng.system.domain.SysUserPost;
-import com.zhongzheng.system.domain.SysUserRole;
-import com.zhongzheng.system.mapper.*;
-import com.zhongzheng.system.service.ISysConfigService;
-import com.zhongzheng.system.service.ISysUserService;
+import com.zhongzheng.modules.system.domain.SysPost;
+import com.zhongzheng.modules.system.domain.SysUserPost;
+import com.zhongzheng.modules.system.domain.SysUserRole;
+import com.zhongzheng.modules.system.mapper.*;
+import com.zhongzheng.modules.system.service.ISysConfigService;
+import com.zhongzheng.modules.system.service.ISysUserService;
+import com.zhongzheng.modules.system.mapper.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

zhongzheng-system/src/main/resources/mapper/modules/course/MajorCategoryMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.course.mapper.MajorCategoryMapper">
+
+    <resultMap type="com.zhongzheng.modules.course.domain.MajorCategory" id="MajorCategoryResult">
+        <result property="categoryId" column="category_id"/>
+        <result property="pId" column="p_id"/>
+        <result property="sort" column="sort"/>
+        <result property="status" column="status"/>
+        <result property="remark" column="remark"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="categoryName" column="category_name"/>
+    </resultMap>
+
+
+</mapper>

zhongzheng-system/src/main/resources/mapper/system/SysConfigMapper.xml → zhongzheng-system/src/main/resources/mapper/modules/system/SysConfigMapper.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.zhongzheng.system.mapper.SysConfigMapper">
+<mapper namespace="com.zhongzheng.modules.system.mapper.SysConfigMapper">
 
     <resultMap type="SysConfig" id="SysConfigResult">
         <id property="configId" column="config_id"/>
@@ -16,4 +16,4 @@
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
-</mapper>
+</mapper>

zhongzheng-system/src/main/resources/mapper/system/SysDeptMapper.xml → zhongzheng-system/src/main/resources/mapper/modules/system/SysDeptMapper.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.zhongzheng.system.mapper.SysDeptMapper">
+<mapper namespace="com.zhongzheng.modules.system.mapper.SysDeptMapper">
 
     <resultMap type="SysDept" id="SysDeptResult">
         <id property="deptId" column="dept_id"/>
@@ -34,4 +34,4 @@
         order by d.parent_id, d.order_num
     </select>
 
-</mapper> 
+</mapper>

zhongzheng-system/src/main/resources/mapper/system/SysDictDataMapper.xml → zhongzheng-system/src/main/resources/mapper/modules/system/SysDictDataMapper.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.zhongzheng.system.mapper.SysDictDataMapper">
+<mapper namespace="com.zhongzheng.modules.system.mapper.SysDictDataMapper">
 
     <resultMap type="SysDictData" id="SysDictDataResult">
         <id property="dictCode" column="dict_code"/>
@@ -20,4 +20,4 @@
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
-</mapper> 
+</mapper>

zhongzheng-system/src/main/resources/mapper/system/SysDictTypeMapper.xml → zhongzheng-system/src/main/resources/mapper/modules/system/SysDictTypeMapper.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.zhongzheng.system.mapper.SysDictTypeMapper">
+<mapper namespace="com.zhongzheng.modules.system.mapper.SysDictTypeMapper">
 
     <resultMap type="SysDictType" id="SysDictTypeResult">
         <id property="dictId" column="dict_id"/>
@@ -15,4 +15,4 @@
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
-</mapper> 
+</mapper>

zhongzheng-system/src/main/resources/mapper/system/SysLogininforMapper.xml → zhongzheng-system/src/main/resources/mapper/modules/system/SysLogininforMapper.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.zhongzheng.system.mapper.SysLogininforMapper">
+<mapper namespace="com.zhongzheng.modules.system.mapper.SysLogininforMapper">
 
     <resultMap type="SysLogininfor" id="SysLogininforResult">
         <id property="infoId" column="info_id"/>
@@ -16,4 +16,4 @@
         <result property="loginTime" column="login_time"/>
     </resultMap>
 
-</mapper> 
+</mapper>

zhongzheng-system/src/main/resources/mapper/system/SysMenuMapper.xml → zhongzheng-system/src/main/resources/mapper/modules/system/SysMenuMapper.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.zhongzheng.system.mapper.SysMenuMapper">
+<mapper namespace="com.zhongzheng.modules.system.mapper.SysMenuMapper">
 
     <resultMap type="SysMenu" id="SysMenuResult">
         <id property="menuId" column="menu_id"/>
@@ -143,4 +143,4 @@
           and ur.user_id = #{userId}
     </select>
 
-</mapper> 
+</mapper>

zhongzheng-system/src/main/resources/mapper/system/SysNoticeMapper.xml → zhongzheng-system/src/main/resources/mapper/modules/system/SysNoticeMapper.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.zhongzheng.system.mapper.SysNoticeMapper">
+<mapper namespace="com.zhongzheng.modules.system.mapper.SysNoticeMapper">
 
     <resultMap type="SysNotice" id="SysNoticeResult">
         <result property="noticeId" column="notice_id"/>
@@ -17,4 +17,4 @@
         <result property="remark" column="remark"/>
     </resultMap>
 
-</mapper>
+</mapper>

zhongzheng-system/src/main/resources/mapper/system/SysOperLogMapper.xml → zhongzheng-system/src/main/resources/mapper/modules/system/SysOperLogMapper.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.zhongzheng.system.mapper.SysOperLogMapper">
+<mapper namespace="com.zhongzheng.modules.system.mapper.SysOperLogMapper">
 
     <resultMap type="SysOperLog" id="SysOperLogResult">
         <id property="operId" column="oper_id"/>
@@ -23,4 +23,4 @@
         <result property="operTime" column="oper_time"/>
     </resultMap>
 
-</mapper> 
+</mapper>

zhongzheng-system/src/main/resources/mapper/system/SysPostMapper.xml → zhongzheng-system/src/main/resources/mapper/modules/system/SysPostMapper.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.zhongzheng.system.mapper.SysPostMapper">
+<mapper namespace="com.zhongzheng.modules.system.mapper.SysPostMapper">
 
     <resultMap type="SysPost" id="SysPostResult">
         <id property="postId" column="post_id"/>
@@ -45,4 +45,4 @@
         where u.user_name = #{userName}
     </select>
 
-</mapper> 
+</mapper>

zhongzheng-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml → zhongzheng-system/src/main/resources/mapper/modules/system/SysRoleDeptMapper.xml

@@ -2,11 +2,11 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.system.mapper.SysRoleDeptMapper">
+<mapper namespace="com.zhongzheng.modules.system.mapper.SysRoleDeptMapper">
 
     <resultMap type="SysRoleDept" id="SysRoleDeptResult">
         <result property="roleId" column="role_id"/>
         <result property="deptId" column="dept_id"/>
     </resultMap>
 
-</mapper> 
+</mapper>

zhongzheng-system/src/main/resources/mapper/system/SysRoleMapper.xml → zhongzheng-system/src/main/resources/mapper/modules/system/SysRoleMapper.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.zhongzheng.system.mapper.SysRoleMapper">
+<mapper namespace="com.zhongzheng.modules.system.mapper.SysRoleMapper">
 
     <resultMap type="SysRole" id="SysRoleResult">
         <id property="roleId" column="role_id"/>
@@ -57,4 +57,4 @@
         WHERE r.del_flag = '0' and u.user_name = #{userName}
     </select>
 
-</mapper> 
+</mapper>

zhongzheng-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml → zhongzheng-system/src/main/resources/mapper/modules/system/SysRoleMenuMapper.xml

@@ -2,11 +2,11 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.system.mapper.SysRoleMenuMapper">
+<mapper namespace="com.zhongzheng.modules.system.mapper.SysRoleMenuMapper">
 
     <resultMap type="SysRoleMenu" id="SysRoleMenuResult">
         <result property="roleId" column="role_id"/>
         <result property="menuId" column="menu_id"/>
     </resultMap>
 
-</mapper> 
+</mapper>

zhongzheng-system/src/main/resources/mapper/system/SysUserMapper.xml → zhongzheng-system/src/main/resources/mapper/modules/system/SysUserMapper.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.zhongzheng.system.mapper.SysUserMapper">
+<mapper namespace="com.zhongzheng.modules.system.mapper.SysUserMapper">
 
     <resultMap type="SysUser" id="SysUserResult">
         <id property="userId" column="user_id"/>
@@ -120,4 +120,4 @@
     </select>
 
 
-</mapper> 
+</mapper>

zhongzheng-system/src/main/resources/mapper/system/SysUserPostMapper.xml → zhongzheng-system/src/main/resources/mapper/modules/system/SysUserPostMapper.xml

@@ -2,11 +2,11 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.system.mapper.SysUserPostMapper">
+<mapper namespace="com.zhongzheng.modules.system.mapper.SysUserPostMapper">
 
     <resultMap type="SysUserPost" id="SysUserPostResult">
         <result property="userId" column="user_id"/>
         <result property="postId" column="post_id"/>
     </resultMap>
 
-</mapper> 
+</mapper>

zhongzheng-system/src/main/resources/mapper/system/SysUserRoleMapper.xml → zhongzheng-system/src/main/resources/mapper/modules/system/SysUserRoleMapper.xml

@@ -2,11 +2,11 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.system.mapper.SysUserRoleMapper">
+<mapper namespace="com.zhongzheng.modules.system.mapper.SysUserRoleMapper">
 
     <resultMap type="SysUserRole" id="SysUserRoleResult">
         <result property="userId" column="user_id"/>
         <result property="roleId" column="role_id"/>
     </resultMap>
 
-</mapper> 
+</mapper>