'框架改版'

ruoyi-admin/pom.xml → hzgzpt-admin/pom.xml

@@ -3,13 +3,13 @@
          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>ruoyi</artifactId>
-        <groupId>com.ruoyi</groupId>
+        <groupId>com.miaxis</groupId>
+        <artifactId>hzgzpt</artifactId>
         <version>3.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
-    <artifactId>ruoyi-admin</artifactId>
+    <artifactId>hzgzpt-admin</artifactId>
 
     <description>
         web服务入口
@@ -30,54 +30,45 @@
             <artifactId>springfox-swagger2</artifactId>
         </dependency>
 
-        <!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>1.5.21</version>
-        </dependency>
 
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>1.5.21</version>
-        </dependency>
 
-        <!-- swagger2-UI-->
+         <!-- Mysql驱动包 -->
         <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
         </dependency>
 
+        <!-- 核心模块-->
         <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>swagger-bootstrap-ui</artifactId>
-            <version>1.9.4</version>
+            <groupId>com.miaxis</groupId>
+            <artifactId>hzgzpt-framework</artifactId>
         </dependency>
 
-         <!-- Mysql驱动包 -->
+        <!-- pc端-->
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.miaxis</groupId>
+            <artifactId>hzgzpt-service-pc</artifactId>
+            <version>3.2.1</version>
         </dependency>
 
-        <!-- 核心模块-->
+        <!-- app端-->
         <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-framework</artifactId>
+            <groupId>com.miaxis</groupId>
+            <artifactId>hzgzpt-service-app</artifactId>
+            <version>3.2.1</version>
         </dependency>
-
         <!-- 定时任务-->
         <!--<dependency>-->
-            <!--<groupId>com.ruoyi</groupId>-->
-            <!--<artifactId>ruoyi-quartz</artifactId>-->
+            <!--<groupId>com.miaxist</groupId>-->
+            <!--<artifactId>miaxis-quartz</artifactId>-->
         <!--</dependency>-->
 
         <!-- 代码生成-->
-        <!--<dependency>-->
-            <!--<groupId>com.ruoyi</groupId>-->
-            <!--<artifactId>ruoyi-generator</artifactId>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>com.miaxis</groupId>
+            <artifactId>hzgzpt-generator</artifactId>
+            <version>3.2.1</version>
+        </dependency>
 
     </dependencies>
 

hzgzpt-admin/src/main/java/com/miaxis/HzgzptApplication.java

@@ -0,0 +1,30 @@
+package com.miaxis;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+
+/**
+ * 启动程序
+ * 
+ * @author miaxis
+ */
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+public class HzgzptApplication
+{
+    public static void main(String[] args)
+    {
+        // System.setProperty("spring.devtools.restart.enabled", "false");
+        SpringApplication.run(HzgzptApplication.class, args);
+        System.out.println("(♥◠‿◠)ﾉﾞ  若依启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
+                " .-------.       ____     __        \n" +
+                " |  _ _   \\      \\   \\   /  /    \n" +
+                " | ( ' )  |       \\  _. /  '       \n" +
+                " |(_ o _) /        _( )_ .'         \n" +
+                " | (_,_).' __  ___(_ o _)'          \n" +
+                " |  |\\ \\  |  ||   |(_,_)'         \n" +
+                " |  | \\ `'   /|   `-'  /           \n" +
+                " |  |  \\    /  \\      /           \n" +
+                " ''-'   `'-'    `-..-'              ");
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java → hzgzpt-admin/src/main/java/com/miaxis/HzgzptServletInitializer.java

@@ -1,4 +1,4 @@
-package com.ruoyi;
+package com.miaxis;
 
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@@ -6,13 +6,13 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
 /**
  * web容器中进行部署
  * 
- * @author ruoyi
+ * @author miaxis
  */
-public class RuoYiServletInitializer extends SpringBootServletInitializer
+public class HzgzptServletInitializer extends SpringBootServletInitializer
 {
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
     {
-        return application.sources(RuoYiApplication.class);
+        return application.sources(HzgzptApplication.class);
     }
 }

hzgzpt-admin/src/main/java/com/miaxis/app/controller/test/TestTableController.java

@@ -0,0 +1,107 @@
+package com.miaxis.app.controller.test;
+
+import com.miaxis.app.test.domain.TestTable;
+import com.miaxis.app.test.service.ITestTableService;
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 【测试表】Controller
+ *
+ * @author miaxis
+ * @date 2020-12-21
+ */
+@RestController
+@RequestMapping("/test/table")
+@Api(tags={"【测试表】Controller"})
+public class TestTableController extends BaseController{
+    @Autowired
+    private ITestTableService testTableService;
+
+    /**
+     * 查询测试表列表
+     */
+    @PreAuthorize("@ss.hasPermi('test:table:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询测试表列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<TestTable> list(@ModelAttribute TestTable testTable){
+        List<TestTable> list = testTableService.selectTestTableList(testTable);
+        return toResponsePageInfo(list);
+    }
+
+    /**
+     * 导出测试表列表
+     */
+    @PreAuthorize("@ss.hasPermi('test:table:export')")
+    @Log(title = "测试表", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出测试表列表Excel")
+    public Response<String> export(@ModelAttribute TestTable testTable){
+        List<TestTable> list = testTableService.selectTestTableList(testTable);
+        ExcelUtil<TestTable> util = new ExcelUtil<TestTable>(TestTable.class);
+        return util.exportExcel(list, "table");
+    }
+
+    /**
+     * 获取测试表详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('test:table:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取测试表详细信息")
+    public Response<TestTable> getInfo(
+            @ApiParam(name = "id", value = "测试表参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(testTableService.selectTestTableById(id));
+    }
+
+    /**
+     * 新增测试表
+     */
+    @PreAuthorize("@ss.hasPermi('test:table:add')")
+    @Log(title = "测试表", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增测试表")
+    public Response<Integer> add(@RequestBody TestTable testTable){
+        return toResponse(testTableService.insertTestTable(testTable));
+    }
+
+    /**
+     * 修改测试表
+     */
+    @PreAuthorize("@ss.hasPermi('test:table:edit')")
+    @Log(title = "测试表", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改测试表")
+    public Response<Integer> edit(@RequestBody TestTable testTable){
+        return toResponse(testTableService.updateTestTable(testTable));
+    }
+
+    /**
+     * 删除测试表
+     */
+    @PreAuthorize("@ss.hasPermi('test:table:remove')")
+    @Log(title = "测试表", businessType = BusinessTypeEnum.DELETE)
+	@DeleteMapping("/{ids}")
+    @ApiOperation("删除测试表")
+    public  Response<Integer> remove(
+            @ApiParam(name = "ids", value = "测试表ids参数", required = true)
+            @PathVariable Long[] ids
+    ){
+        return toResponse(testTableService.deleteTestTableByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java → hzgzpt-admin/src/main/java/com/miaxis/system/controller/common/CaptchaController.java

@@ -1,29 +1,34 @@
-package com.ruoyi.web.controller.common;
+package com.miaxis.system.controller.common;
 
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-import javax.annotation.Resource;
-import javax.imageio.ImageIO;
-import javax.servlet.http.HttpServletResponse;
+import com.google.code.kaptcha.Producer;
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.redis.RedisCache;
+import com.miaxis.common.utils.sign.Base64;
+import com.miaxis.common.utils.uuid.IdUtils;
+import com.miaxis.system.dto.system.CaptchaImageDTO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.FastByteArrayOutputStream;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.google.code.kaptcha.Producer;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.utils.sign.Base64;
-import com.ruoyi.common.utils.uuid.IdUtils;
+
+import javax.annotation.Resource;
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 验证码操作处理
- * 
- * @author ruoyi
+ *
+ * @author miaxis
  */
 @RestController
+@Api(tags={"【验证码操作处理】Controller"})
 public class CaptchaController
 {
     @Resource(name = "captchaProducer")
@@ -34,16 +39,17 @@ public class CaptchaController
 
     @Autowired
     private RedisCache redisCache;
-    
+
     // 验证码类型
-    @Value("${ruoyi.captchaType}")
+    @Value("${miaxis.captchaType}")
     private String captchaType;
 
     /**
      * 生成验证码
      */
     @GetMapping("/captchaImage")
-    public AjaxResult getCode(HttpServletResponse response) throws IOException
+    @ApiOperation("生成验证码")
+    public Response<CaptchaImageDTO> getCode(HttpServletResponse response) throws IOException
     {
         // 保存验证码信息
         String uuid = IdUtils.simpleUUID();
@@ -75,12 +81,11 @@ public class CaptchaController
         }
         catch (IOException e)
         {
-            return AjaxResult.error(e.getMessage());
+            return Response.error().setMsg(e.getMessage());
         }
-
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("uuid", uuid);
-        ajax.put("img", Base64.encode(os.toByteArray()));
-        return ajax;
+        CaptchaImageDTO captchaImageDTO = new CaptchaImageDTO();
+        captchaImageDTO.setUuid(uuid);
+        captchaImageDTO.setImg(Base64.encode(os.toByteArray()));
+        return Response.success(captchaImageDTO);
     }
 }

hzgzpt-admin/src/main/java/com/miaxis/system/controller/common/CommonController.java

@@ -0,0 +1,129 @@
+package com.miaxis.system.controller.common;
+
+import com.miaxis.common.config.MiaxisConfig;
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.utils.StringUtils;
+import com.miaxis.common.utils.file.FileUploadUtils;
+import com.miaxis.common.utils.file.FileUtils;
+import com.miaxis.framework.config.ServerConfig;
+import com.miaxis.system.dto.common.UploadFileDTO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 通用请求处理
+ *
+ * @author miaxis
+ */
+@RestController
+@Api(tags={"【通用请求处理】Controller"})
+public class CommonController
+{
+    private static final Logger log = LoggerFactory.getLogger(CommonController.class);
+
+    @Autowired
+    private ServerConfig serverConfig;
+
+    /**
+     * 通用下载请求
+     *
+     * @param fileName 文件名称
+     * @param delete 是否删除
+     */
+    @GetMapping("common/download")
+    @ApiOperation("通用下载请求")
+    public void fileDownload(
+            @ApiParam(name = "fileName", value = "文件名称")
+            @RequestParam(name = "fileName", required = true) String fileName,
+            @ApiParam(name = "delete", value = "是否删除")
+            @RequestParam(name = "delete", required = true) Boolean delete,
+            HttpServletResponse response,
+            HttpServletRequest request)
+    {
+        try
+        {
+            if (!FileUtils.isValidFilename(fileName))
+            {
+                throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName));
+            }
+            String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
+            String filePath = MiaxisConfig.getDownloadPath() + fileName;
+
+            response.setCharacterEncoding("utf-8");
+            response.setContentType("multipart/form-data");
+            response.setHeader("Content-Disposition",
+                    "attachment;fileName=" + FileUtils.setFileDownloadHeader(request, realFileName));
+            FileUtils.writeBytes(filePath, response.getOutputStream());
+            if (delete)
+            {
+                FileUtils.deleteFile(filePath);
+            }
+        }
+        catch (Exception e)
+        {
+            log.error("下载文件失败", e);
+        }
+    }
+
+    /**
+     * 通用上传请求
+     */
+    @PostMapping("/common/upload")
+    @ApiOperation("通用上传请求")
+    public Response<UploadFileDTO> uploadFile(MultipartFile file) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = MiaxisConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            UploadFileDTO uploadFileDTO = new UploadFileDTO();
+            uploadFileDTO.setFileName(fileName);
+            uploadFileDTO.setUrl(url);
+
+            return Response.success(uploadFileDTO);
+        }
+        catch (Exception e)
+        {
+            return Response.error().setMsg(e.getMessage());
+        }
+    }
+
+    /**
+     * 本地资源通用下载
+     */
+    @GetMapping("/common/download/resource")
+    public void resourceDownload(
+            @ApiParam(name = "name", value = "文件名称")
+            @RequestParam(name = "name", required = true) String name,
+            HttpServletRequest request,
+            HttpServletResponse response) throws Exception
+    {
+        // 本地资源路径
+        String localPath = MiaxisConfig.getProfile();
+        // 数据库资源地址
+        String downloadPath = localPath + StringUtils.substringAfter(name, Constants.RESOURCE_PREFIX);
+        // 下载名称
+        String downloadName = StringUtils.substringAfterLast(downloadPath, "/");
+        response.setCharacterEncoding("utf-8");
+        response.setContentType("multipart/form-data");
+        response.setHeader("Content-Disposition",
+                "attachment;fileName=" + FileUtils.setFileDownloadHeader(request, downloadName));
+        FileUtils.writeBytes(downloadPath, response.getOutputStream());
+    }
+}

hzgzpt-admin/src/main/java/com/miaxis/system/controller/monitor/ServerController.java

@@ -0,0 +1,32 @@
+package com.miaxis.system.controller.monitor;
+
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.framework.web.domain.Server;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 服务器监控
+ * 添加Response swagger识别
+ * @author JuniorRay
+ */
+@RestController
+@RequestMapping("/monitor/server")
+@Api(tags={"【服务器监控】Controller"})
+public class ServerController extends BaseController
+{
+    @PreAuthorize("@ss.hasPermi('monitor:server:list')")
+    @GetMapping()
+    @ApiOperation("获取服务器监控信息")
+    public Response<Server> getInfo() throws Exception
+    {
+        Server server = new Server();
+        server.copyTo();
+        return Response.success(server);
+    }
+}

hzgzpt-admin/src/main/java/com/miaxis/system/controller/monitor/SysLogininforController.java

@@ -0,0 +1,77 @@
+package com.miaxis.system.controller.monitor;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.system.domain.SysLogininfor;
+import com.miaxis.system.service.ISysLogininforService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 系统访问记录
+ * 添加Response swagger识别
+ * @author JuniorRay
+ */
+@RestController
+@RequestMapping("/monitor/logininfor")
+@Api(tags={"【系统访问记录】Controller"})
+public class SysLogininforController extends BaseController
+{
+    @Autowired
+    private ISysLogininforService logininforService;
+
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询登录日志信息列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<SysLogininfor> list(@ModelAttribute SysLogininfor logininfor)
+    {
+        startPage();
+        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
+        return toResponsePageInfo(list);
+    }
+
+    @Log(title = "登录日志", businessType = BusinessTypeEnum.EXPORT)
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
+    @GetMapping("/export")
+    @ApiOperation("导出登录日志Excel")
+    public Response<String> export(@ModelAttribute SysLogininfor logininfor)
+    {
+        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
+        ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);
+        return util.exportExcel(list, "登录日志");
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+    @Log(title = "登录日志", businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/{infoIds}")
+    @ApiOperation("删除登录日志")
+    public Response<Integer> remove(
+            @ApiParam(name = "infoIds", value = "登录日志ids{逗号分隔}", required = true)
+            @PathVariable Long[] infoIds
+    )
+    {
+        return toResponse(logininforService.deleteLogininforByIds(infoIds));
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+    @Log(title = "登录日志", businessType = BusinessTypeEnum.CLEAN)
+    @DeleteMapping("/clean")
+    @ApiOperation("清除登录日志")
+    public Response clean()
+    {
+        logininforService.cleanLogininfor();
+        return Response.success();
+    }
+}

hzgzpt-admin/src/main/java/com/miaxis/system/controller/monitor/SysOperlogController.java

@@ -0,0 +1,75 @@
+package com.miaxis.system.controller.monitor;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.system.domain.SysOperLog;
+import com.miaxis.system.service.ISysOperLogService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 操作日志记录
+ * 添加Response swagger识别
+ * @author JuniorRay
+ */
+@RestController
+@RequestMapping("/monitor/operlog")
+@Api(tags={"【操作日志记录】Controller"})
+public class SysOperlogController extends BaseController
+{
+    @Autowired
+    private ISysOperLogService operLogService;
+
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询操作日志记录列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<SysOperLog> list(@ModelAttribute SysOperLog operLog)
+    {
+        startPage();
+        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+        return toResponsePageInfo(list);
+    }
+
+    @Log(title = "操作日志", businessType = BusinessTypeEnum.EXPORT)
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
+    @GetMapping("/export")
+    @ApiOperation("导出操作日志Excel")
+    public Response<String> export(@ModelAttribute SysOperLog operLog)
+    {
+        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+        ExcelUtil<SysOperLog> util = new ExcelUtil<SysOperLog>(SysOperLog.class);
+        return util.exportExcel(list, "操作日志");
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+    @DeleteMapping("/{operIds}")
+    @ApiOperation("删除操作日志")
+    public Response<Integer> remove(
+            @ApiParam(name = "infoIds", value = "操作日志ids{逗号分隔}", required = true)
+            @PathVariable Long[] operIds
+    ) {
+        return toResponse(operLogService.deleteOperLogByIds(operIds));
+    }
+
+    @Log(title = "操作日志", businessType = BusinessTypeEnum.CLEAN)
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+    @DeleteMapping("/clean")
+    @ApiOperation("清除操作日志")
+    public Response clean()
+    {
+        operLogService.cleanOperLog();
+        return Response.success();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java → hzgzpt-admin/src/main/java/com/miaxis/system/controller/monitor/SysUserOnlineController.java

@@ -1,35 +1,34 @@
-package com.ruoyi.web.controller.monitor;
+package com.miaxis.system.controller.monitor;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.model.LoginUser;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.core.redis.RedisCache;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.StringUtils;
+import com.miaxis.system.domain.SysUserOnline;
+import com.miaxis.system.service.ISysUserOnlineService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.domain.SysUserOnline;
-import com.ruoyi.system.service.ISysUserOnlineService;
 
 /**
  * 在线用户监控
- * 
- * @author ruoyi
+ *
+ * @author miaxis
  */
 @RestController
 @RequestMapping("/monitor/online")
+@Api(tags={"【在线用户监控】Controller"})
 public class SysUserOnlineController extends BaseController
 {
     @Autowired
@@ -40,8 +39,18 @@ public class SysUserOnlineController extends BaseController
 
     @PreAuthorize("@ss.hasPermi('monitor:online:list')")
     @GetMapping("/list")
-    public TableDataInfo list(String ipaddr, String userName)
-    {
+    @ApiOperation("查询在线用户监控列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<SysUserOnline> list(
+            @ApiParam(name = "ipaddr", value = "ip地址")
+            @RequestParam(name = "ipaddr" ,required = false) String ipaddr,
+
+            @ApiParam(name = "userName", value = "用户名")
+            @RequestParam(name = "userName" ,required = false) String userName
+    ) {
         Collection<String> keys = redisCache.keys(Constants.LOGIN_TOKEN_KEY + "*");
         List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
         for (String key : keys)
@@ -75,18 +84,21 @@ public class SysUserOnlineController extends BaseController
         }
         Collections.reverse(userOnlineList);
         userOnlineList.removeAll(Collections.singleton(null));
-        return getDataTable(userOnlineList);
+        return toResponsePageInfo(userOnlineList);
     }
 
     /**
      * 强退用户
      */
     @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
-    @Log(title = "在线用户", businessType = BusinessType.FORCE)
+    @Log(title = "在线用户", businessType = BusinessTypeEnum.FORCE)
     @DeleteMapping("/{tokenId}")
-    public AjaxResult forceLogout(@PathVariable String tokenId)
-    {
+    @ApiOperation("强退用户")
+    public Response forceLogout(
+            @ApiParam(name = "tokenId", value = "令牌tokenId", required = true)
+            @PathVariable("tokenId") String tokenId
+    ) {
         redisCache.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId);
-        return AjaxResult.success();
+        return Response.success();
     }
 }

hzgzpt-admin/src/main/java/com/miaxis/system/controller/system/SysConfigController.java

@@ -0,0 +1,152 @@
+package com.miaxis.system.controller.system;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.annotation.RepeatSubmit;
+import com.miaxis.common.constant.UserConstants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.ResponseEnum;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.system.domain.SysConfig;
+import com.miaxis.system.service.ISysConfigService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 参数配置 信息操作处理
+ *
+ * @author miaxis
+ */
+@RestController
+@RequestMapping("/system/config")
+@Api(tags={"【参数配置 信息操作处理】Controller"})
+public class SysConfigController extends BaseController
+{
+    @Autowired
+    private ISysConfigService configService;
+
+    /**
+     * 获取参数配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询参数配置列表")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+//            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+//    })
+    public ResponsePageInfo<SysConfig> list(@ModelAttribute SysConfig config)
+    {
+        startPage();
+        List<SysConfig> list = configService.selectConfigList(config);
+        return toResponsePageInfo(list);
+    }
+
+    @Log(title = "参数管理", businessType = BusinessTypeEnum.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:config:export')")
+    @GetMapping("/export")
+    @ApiOperation("导出参数管理Excel")
+    public Response<String> export(@ModelAttribute SysConfig config)
+    {
+        List<SysConfig> list = configService.selectConfigList(config);
+        ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
+        return util.exportExcel(list, "参数数据");
+    }
+
+    /**
+     * 根据参数编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:query')")
+    @GetMapping(value = "/{configId}")
+    @ApiOperation("根据参数编号获取详细信息")
+    public Response<SysConfig> getInfo(
+            @ApiParam(name = "configId", value = "参数编号", required = true)
+            @PathVariable("configId") Long configId
+    ){
+        return Response.success(configService.selectConfigById(configId));
+    }
+
+    /**
+     * 根据参数键名查询参数值
+     */
+    @GetMapping(value = "/configKey/{configKey}")
+    @ApiOperation("根据参数键名查询参数值")
+    public Response<String> getConfigKey(
+            @ApiParam(name = "configKey", value = "参数键名", required = true)
+            @PathVariable("configKey") String configKey
+    ){
+        return Response.success(configService.selectConfigByKey(configKey));
+    }
+
+    /**
+     * 新增参数配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:add')")
+    @Log(title = "参数管理", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @RepeatSubmit
+    @ApiOperation("新增参数配置")
+    public Response<Integer> add(
+            @RequestBody @Validated SysConfig config
+    ){
+        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
+        {
+            return Response.error(ResponseEnum.CONFIG_ADD_ERROR_EXIST);
+        }
+        config.setCreateBy(SecurityUtils.getUsername());
+        return toResponse(configService.insertConfig(config));
+    }
+
+    /**
+     * 修改参数配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:edit')")
+    @Log(title = "参数管理", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改参数配置")
+    public Response<Integer> edit(
+            @Validated @RequestBody SysConfig config
+    ){
+        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
+        {
+            return Response.error(ResponseEnum.CONFIG_UPDATE_ERROR_EXIST);
+        }
+        config.setUpdateBy(SecurityUtils.getUsername());
+        return toResponse(configService.updateConfig(config));
+    }
+
+    /**
+     * 删除参数配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    @Log(title = "参数管理", businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/{configIds}")
+    @ApiOperation("删除参数配置")
+    public Response<Integer> remove(
+            @ApiParam(name = "configIds", value = "参数编号ids{逗号分隔}", required = true)
+            @PathVariable Long[] configIds
+    ){
+        return toResponse(configService.deleteConfigByIds(configIds));
+    }
+
+    /**
+     * 清空缓存
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    @Log(title = "参数管理", businessType = BusinessTypeEnum.CLEAN)
+    @DeleteMapping("/clearCache")
+    @ApiOperation("清空缓存")
+    public Response clearCache()
+    {
+        configService.clearCache();
+        return Response.success();
+    }
+}

hzgzpt-admin/src/main/java/com/miaxis/system/controller/system/SysDeptController.java

@@ -0,0 +1,180 @@
+package com.miaxis.system.controller.system;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.constant.UserConstants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.ResponseEnum;
+import com.miaxis.common.core.domain.TreeSelect;
+import com.miaxis.common.core.domain.entity.SysDept;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.StringUtils;
+import com.miaxis.system.dto.system.RoleDeptDTO;
+import com.miaxis.system.service.ISysDeptService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * 部门信息
+ *
+ * @author miaxis
+ */
+@RestController
+@RequestMapping("/system/dept")
+@Api(tags={"【部门信息】Controller"})
+public class SysDeptController extends BaseController
+{
+    @Autowired
+    private ISysDeptService deptService;
+
+    /**
+     * 获取部门列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询部门信息列表")
+    public Response<List<SysDept>> list(@ModelAttribute SysDept dept)
+    {
+        List<SysDept> depts = deptService.selectDeptList(dept);
+        return Response.success(depts);
+    }
+
+    /**
+     * 查询部门列表（排除节点）
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    @GetMapping("/list/exclude/{deptId}")
+    @ApiOperation("查询部门信息列表（排除节点）")
+    public Response<List<SysDept>> excludeChild(
+            @ApiParam(name = "deptId", value = "部门ID", required = true)
+            @PathVariable(value = "deptId", required = false) Long deptId
+    ){
+        List<SysDept> depts = deptService.selectDeptList(new SysDept());
+        Iterator<SysDept> it = depts.iterator();
+        while (it.hasNext())
+        {
+            SysDept d = (SysDept) it.next();
+            if (d.getDeptId().intValue() == deptId
+                    || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""))
+            {
+                it.remove();
+            }
+        }
+        return Response.success(depts);
+    }
+
+    /**
+     * 根据部门编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:query')")
+    @GetMapping(value = "/{deptId}")
+    @ApiOperation("根据部门编号获取详细信息")
+    public Response<SysDept> getInfo(
+            @ApiParam(name = "deptId", value = "部门ID", required = true)
+            @PathVariable("deptId") Long deptId
+    ){
+        return Response.success(deptService.selectDeptById(deptId));
+    }
+
+    /**
+     * 获取部门下拉树列表
+     */
+    @GetMapping("/treeselect")
+    @ApiOperation("获取部门下拉树列表")
+    public Response<List<TreeSelect>> treeselect(@ModelAttribute SysDept dept)
+    {
+        List<SysDept> depts = deptService.selectDeptList(dept);
+        return Response.success(deptService.buildDeptTreeSelect(depts));
+    }
+
+    /**
+     * 加载对应角色部门列表树
+     */
+    @GetMapping(value = "/roleDeptTreeselect/{roleId}")
+    @ApiOperation("加载对应角色部门列表树")
+    public Response<RoleDeptDTO> roleDeptTreeselect(
+            @ApiParam(name = "roleId", value = "角色ID", required = true)
+            @PathVariable("roleId") Long roleId
+    ){
+        List<SysDept> depts = deptService.selectDeptList(new SysDept());
+        RoleDeptDTO roleDeptDTO = new RoleDeptDTO();
+        roleDeptDTO.setCheckedKeys(deptService.selectDeptListByRoleId(roleId));
+        roleDeptDTO.setDepts(deptService.buildDeptTreeSelect(depts));
+        return Response.success(roleDeptDTO);
+    }
+
+    /**
+     * 新增部门
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:add')")
+    @Log(title = "部门管理", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增部门")
+    public Response<Integer> add(@Validated @RequestBody SysDept dept)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
+        {
+            return Response.error(ResponseEnum.DEPARTMENT_ADD_ERROR_EXIST);
+        }
+        dept.setCreateBy(SecurityUtils.getUsername());
+        return toResponse(deptService.insertDept(dept));
+    }
+
+    /**
+     * 修改部门
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:edit')")
+    @Log(title = "部门管理", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改部门")
+    public Response<Integer> edit(@Validated @RequestBody SysDept dept)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
+        {
+            return Response.error(ResponseEnum.DEPARTMENT_UPDATE_ERROR_EXIST);
+        }
+        else if (dept.getParentId().equals(dept.getDeptId()))
+        {
+            return Response.error(ResponseEnum.DEPARTMENT_UPDATE_ERROR_SELF);
+        }
+        else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
+                && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0)
+        {
+            return Response.error(ResponseEnum.DEPARTMENT_UPDATE_ERROR_SUB);
+        }
+        dept.setUpdateBy(SecurityUtils.getUsername());
+        return toResponse(deptService.updateDept(dept));
+    }
+
+    /**
+     * 删除部门
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:remove')")
+    @Log(title = "部门管理", businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/{deptId}")
+    @ApiOperation("删除部门")
+    public Response<Integer> remove(
+            @ApiParam(name = "deptId", value = "部门id", required = true)
+            @PathVariable("deptId") Long deptId
+    ){
+        if (deptService.hasChildByDeptId(deptId))
+        {
+            return Response.error(ResponseEnum.DEPARTMENT_DELETE_ERROR_SUB);
+        }
+        if (deptService.checkDeptExistUser(deptId))
+        {
+            return Response.error(ResponseEnum.DEPARTMENT_DELETE_ERROR_USER);
+        }
+        return toResponse(deptService.deleteDeptById(deptId));
+    }
+}

hzgzpt-admin/src/main/java/com/miaxis/system/controller/system/SysDictDataController.java

@@ -0,0 +1,126 @@
+package com.miaxis.system.controller.system;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.entity.SysDictData;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.system.service.ISysDictDataService;
+import com.miaxis.system.service.ISysDictTypeService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 数据字典信息
+ *
+ * @author miaxis
+ */
+@RestController
+@RequestMapping("/system/dict/data")
+@Api(tags={"【数据字典信息】Controller"})
+public class SysDictDataController extends BaseController
+{
+    @Autowired
+    private ISysDictDataService dictDataService;
+
+    @Autowired
+    private ISysDictTypeService dictTypeService;
+
+    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询数据字典信息列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<SysDictData> list(@ModelAttribute SysDictData dictData)
+    {
+        startPage();
+        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+        return toResponsePageInfo(list);
+    }
+
+    @Log(title = "字典数据", businessType = BusinessTypeEnum.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:dict:export')")
+    @GetMapping("/export")
+    @ApiOperation("导出数据字典信息列表Excel")
+    public Response<String> export(@ModelAttribute SysDictData dictData)
+    {
+        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+        ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
+        return util.exportExcel(list, "字典数据");
+    }
+
+    /**
+     * 查询字典数据详细
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    @GetMapping(value = "/{dictCode}")
+    @ApiOperation("查询字典数据详细")
+    public Response<SysDictData> getInfo(
+            @ApiParam(name = "dictCode", value = "字典编号", required = true)
+            @PathVariable("dictCode") Long dictCode
+    ){
+        return Response.success(dictDataService.selectDictDataById(dictCode));
+    }
+
+    /**
+     * 根据字典类型查询字典数据信息
+     */
+    @GetMapping(value = "/type/{dictType}")
+    @ApiOperation("根据字典类型查询字典数据信息")
+    public Response<List<SysDictData>> dictType(
+            @ApiParam(name = "dictType", value = "根据字典类型查询字典数据信息", required = true)
+            @PathVariable("dictType") String dictType
+    ){
+        return Response.success(dictTypeService.selectDictDataByType(dictType));
+    }
+
+    /**
+     * 新增字典数据
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+    @Log(title = "字典数据", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增字典数据")
+    public Response<Integer> add(@Validated @RequestBody SysDictData dict)
+    {
+        dict.setCreateBy(SecurityUtils.getUsername());
+        return toResponse(dictDataService.insertDictData(dict));
+    }
+
+    /**
+     * 修改保存字典数据
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+    @Log(title = "字典数据", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改保存字典数据")
+    public Response<Integer> edit(@Validated @RequestBody SysDictData dict)
+    {
+        dict.setUpdateBy(SecurityUtils.getUsername());
+        return toResponse(dictDataService.updateDictData(dict));
+    }
+
+    /**
+     * 删除字典数据
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @Log(title = "字典数据", businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/{dictCodes}")
+    @ApiOperation("删除字典数据")
+    public Response<Integer> remove(
+            @ApiParam(name = "dictCodes", value = "字典编号codes{逗号分隔}", required = true)
+            @PathVariable Long[] dictCodes
+    ){
+        return toResponse(dictDataService.deleteDictDataByIds(dictCodes));
+    }
+}

hzgzpt-admin/src/main/java/com/miaxis/system/controller/system/SysDictTypeController.java

@@ -0,0 +1,144 @@
+package com.miaxis.system.controller.system;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.constant.UserConstants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.ResponseEnum;
+import com.miaxis.common.core.domain.entity.SysDictType;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.system.service.ISysDictTypeService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 数据字典类型信息
+ *
+ * @author miaxis
+ */
+@RestController
+@RequestMapping("/system/dict/type")
+@Api(tags={"【数据字典类型信息】Controller"})
+public class SysDictTypeController extends BaseController
+{
+    @Autowired
+    private ISysDictTypeService dictTypeService;
+
+    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询数据字典类型信息列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<SysDictType> list(@ModelAttribute SysDictType dictType)
+    {
+        startPage();
+        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
+        return toResponsePageInfo(list);
+    }
+
+    @Log(title = "字典类型", businessType = BusinessTypeEnum.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:dict:export')")
+    @GetMapping("/export")
+    @ApiOperation("导出数据字典类型信息列表Excel")
+    public Response<String> export(@ModelAttribute SysDictType dictType)
+    {
+        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
+        ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
+        return util.exportExcel(list, "字典类型");
+    }
+
+    /**
+     * 查询字典类型详细
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    @GetMapping(value = "/{dictId}")
+    @ApiOperation("查询字典类型详细")
+    public Response<SysDictType> getInfo(
+            @ApiParam(name = "dictId", value = "字典ID", required = true)
+            @PathVariable("dictId") Long dictId
+    ){
+        return Response.success(dictTypeService.selectDictTypeById(dictId));
+    }
+
+    /**
+     * 新增字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+    @Log(title = "字典类型", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增字典类型")
+    public Response<Integer> add(@Validated @RequestBody SysDictType dict)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
+        {
+            return Response.error(ResponseEnum.DICTIONARY_ADD_ERROR_EXIST);
+        }
+        dict.setCreateBy(SecurityUtils.getUsername());
+        return toResponse(dictTypeService.insertDictType(dict));
+    }
+
+    /**
+     * 修改字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+    @Log(title = "字典类型", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改字典类型")
+    public Response<Integer> edit(@Validated @RequestBody SysDictType dict)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
+        {
+            return Response.error(ResponseEnum.DICTIONARY_UPDATE_ERROR_EXIST);
+        }
+        dict.setUpdateBy(SecurityUtils.getUsername());
+        return toResponse(dictTypeService.updateDictType(dict));
+    }
+
+    /**
+     * 删除字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @Log(title = "字典类型", businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/{dictIds}")
+    @ApiOperation("删除字典类型")
+    public Response<Integer> remove(
+            @ApiParam(name = "dictIds", value = "字典Ids{逗号分隔}", required = true)
+            @PathVariable Long[] dictIds
+    ){
+        return toResponse(dictTypeService.deleteDictTypeByIds(dictIds));
+    }
+
+    /**
+     * 清空缓存
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @Log(title = "字典类型", businessType = BusinessTypeEnum.CLEAN)
+    @DeleteMapping("/clearCache")
+    @ApiOperation("清空缓存")
+    public Response clearCache()
+    {
+        dictTypeService.clearCache();
+        return Response.success();
+    }
+
+    /**
+     * 获取字典选择框列表
+     */
+    @GetMapping("/optionselect")
+    @ApiOperation("获取字典选择框列表")
+    public Response<List<SysDictType>> optionselect()
+    {
+        List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
+        return Response.success(dictTypes);
+    }
+}

hzgzpt-admin/src/main/java/com/miaxis/system/controller/system/SysLoginController.java

@@ -0,0 +1,118 @@
+package com.miaxis.system.controller.system;
+
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.entity.SysMenu;
+import com.miaxis.common.core.domain.entity.SysUser;
+import com.miaxis.common.core.domain.model.LoginBody;
+import com.miaxis.common.core.domain.model.LoginBodyNoCode;
+import com.miaxis.common.core.domain.model.LoginUser;
+import com.miaxis.common.utils.ServletUtils;
+import com.miaxis.framework.web.service.SysLoginService;
+import com.miaxis.framework.web.service.SysPermissionService;
+import com.miaxis.framework.web.service.TokenService;
+import com.miaxis.system.dto.common.RouterDTO;
+import com.miaxis.system.dto.system.TokenDTO;
+import com.miaxis.system.dto.system.UserInfoDTO;
+import com.miaxis.system.service.ISysMenuService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 登录验证
+ *
+ * @author miaxis
+ */
+@RestController
+@Api(tags={"【登录验证】Controller"})
+public class SysLoginController
+{
+    @Autowired
+    private SysLoginService loginService;
+
+    @Autowired
+    private ISysMenuService menuService;
+
+    @Autowired
+    private SysPermissionService permissionService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    /**
+     * 登录方法 （含验证码）
+     *
+     * @param loginBody 登录信息
+     * @return 结果
+     */
+    @PostMapping("/login")
+    @ApiOperation("登录方法")
+    public Response<TokenDTO> login(@RequestBody LoginBody loginBody)
+    {   TokenDTO tokenDTO = new TokenDTO();
+        // 生成令牌
+        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+                loginBody.getUuid());
+        tokenDTO.setToken(token);
+        return Response.success(tokenDTO);
+    }
+    /**
+     * 登录方法 （不含验证码）
+     *
+     * @param loginBodyNoCode 登录信息
+     * @return 结果
+     */
+    @PostMapping("/login/noCode")
+    @ApiOperation("登录方法（不含验证码）")
+    public Response<TokenDTO> loginNoCode(@RequestBody LoginBodyNoCode loginBodyNoCode)
+    {   TokenDTO tokenDTO = new TokenDTO();
+        // 生成令牌
+        String token = loginService.login(loginBodyNoCode.getUsername(), loginBodyNoCode.getPassword());
+        tokenDTO.setToken(token);
+        return Response.success(tokenDTO);
+    }
+
+    /**
+     * 获取用户信息
+     *
+     * @return 用户信息
+     */
+    @GetMapping("getInfo")
+    @ApiOperation("获取用户信息")
+    public Response<UserInfoDTO> getInfo()
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        SysUser user = loginUser.getUser();
+        // 角色集合
+        Set<String> roles = permissionService.getRolePermission(user);
+        // 权限集合
+        Set<String> permissions = permissionService.getMenuPermission(user);
+        UserInfoDTO userInfoDTO = new UserInfoDTO();
+        userInfoDTO.setUser(user);
+        userInfoDTO.setRoles(roles);
+        userInfoDTO.setPermissions(permissions);
+        return Response.success(userInfoDTO);
+    }
+
+    /**
+     * 获取路由信息
+     *
+     * @return 路由信息
+     */
+    @GetMapping("getRouters")
+    @ApiOperation("获取路由信息")
+    public Response<List<RouterDTO>> getRouters()
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        // 用户信息
+        SysUser user = loginUser.getUser();
+        List<SysMenu> menus = menuService.selectMenuTreeByUserId(user.getUserId());
+        return Response.success(menuService.buildMenus(menus));
+    }
+}

hzgzpt-admin/src/main/java/com/miaxis/system/controller/system/SysMenuController.java

@@ -0,0 +1,171 @@
+package com.miaxis.system.controller.system;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.constant.UserConstants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.ResponseEnum;
+import com.miaxis.common.core.domain.TreeSelect;
+import com.miaxis.common.core.domain.entity.SysMenu;
+import com.miaxis.common.core.domain.model.LoginUser;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.ServletUtils;
+import com.miaxis.common.utils.StringUtils;
+import com.miaxis.framework.web.service.TokenService;
+import com.miaxis.system.dto.system.MenuDTO;
+import com.miaxis.system.service.ISysMenuService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 菜单信息
+ *
+ * @author miaxis
+ */
+@RestController
+@RequestMapping("/system/menu")
+@Api(tags={"【菜单信息】Controller"})
+public class SysMenuController extends BaseController
+{
+    @Autowired
+    private ISysMenuService menuService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    /**
+     * 获取菜单列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:list')")
+    @GetMapping("/list")
+    @ApiOperation("获取菜单列表")
+    public Response<List<SysMenu>> list(@ModelAttribute SysMenu menu)
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        Long userId = loginUser.getUser().getUserId();
+        List<SysMenu> menus = menuService.selectMenuList(menu, userId);
+        return Response.success(menus);
+    }
+
+    /**
+     * 根据菜单编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:query')")
+    @GetMapping(value = "/{menuId}")
+    @ApiOperation("根据菜单编号获取详细信息")
+    public Response<SysMenu> getInfo(
+            @ApiParam(name = "menuId", value = "菜单编号", required = true)
+            @PathVariable("menuId") Long menuId
+    ){
+        return Response.success(menuService.selectMenuById(menuId));
+    }
+
+    /**
+     * 获取菜单下拉树列表
+     */
+    @GetMapping("/treeselect")
+    @ApiOperation("获取菜单下拉树列表")
+    public Response<List<TreeSelect>> treeselect(@ModelAttribute SysMenu menu)
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        Long userId = loginUser.getUser().getUserId();
+        List<SysMenu> menus = menuService.selectMenuList(menu, userId);
+        return Response.success(menuService.buildMenuTreeSelect(menus));
+    }
+
+    /**
+     * 加载对应角色菜单列表树
+     */
+    @GetMapping(value = "/roleMenuTreeselect/{roleId}")
+    @ApiOperation("加载对应角色菜单列表树")
+    public Response<MenuDTO> roleMenuTreeselect(
+            @ApiParam(name = "roleId", value = "角色ID", required = true)
+            @PathVariable("roleId") Long roleId
+    ){
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        List<SysMenu> menus = menuService.selectMenuList(loginUser.getUser().getUserId());
+        MenuDTO menuDTO= new MenuDTO();
+        menuDTO.setCheckedKeys(menuService.selectMenuListByRoleId(roleId));
+        menuDTO.setMenus(menuService.buildMenuTreeSelect(menus));
+        return Response.success(menuDTO);
+    }
+
+    /**
+     * 新增菜单
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:add')")
+    @Log(title = "菜单管理", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增菜单")
+    public Response<Integer> add(@Validated @RequestBody SysMenu menu)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
+        {
+            return Response.error(ResponseEnum.MENU_ADD_ERROR_EXIST);
+        }
+        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
+                && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
+        {
+            return Response.error(ResponseEnum.MENU_ADD_ERROR_HTTP);
+        }
+        menu.setCreateBy(SecurityUtils.getUsername());
+        return toResponse(menuService.insertMenu(menu));
+    }
+
+    /**
+     * 修改菜单
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:edit')")
+    @Log(title = "菜单管理", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改菜单")
+    public Response<Integer> edit(@Validated @RequestBody SysMenu menu)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
+        {
+            return Response.error(ResponseEnum.MENU_UPDATE_ERROR_EXIST);
+        }
+        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
+                && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
+        {
+            return Response.error(ResponseEnum.MENU_UPDATE_ERROR_HTTP);
+        }
+        else if (menu.getMenuId().equals(menu.getParentId()))
+        {
+            return Response.error(ResponseEnum.MENU_UPDATE_ERROR_SELF);
+        }
+        menu.setUpdateBy(SecurityUtils.getUsername());
+        return toResponse(menuService.updateMenu(menu));
+    }
+
+    /**
+     * 删除菜单
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:remove')")
+    @Log(title = "菜单管理", businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/{menuId}")
+    @ApiOperation("删除菜单")
+    public Response<Integer> remove(
+            @ApiParam(name = "menuId", value = "菜单ID", required = true)
+            @PathVariable("menuId") Long menuId
+    ){
+        if (menuService.hasChildByMenuId(menuId))
+        {
+            return Response.error(ResponseEnum.MENU_DELETE_ERROR_SUB);
+        }
+        if (menuService.checkMenuExistRole(menuId))
+        {
+            return Response.error(ResponseEnum.MENU_DELETE_ERROR_ROLE);
+        }
+        return toResponse(menuService.deleteMenuById(menuId));
+    }
+}

hzgzpt-admin/src/main/java/com/miaxis/system/controller/system/SysNoticeController.java

@@ -0,0 +1,101 @@
+package com.miaxis.system.controller.system;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.system.domain.SysNotice;
+import com.miaxis.system.service.ISysNoticeService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 公告 信息操作处理
+ *
+ * @author miaxis
+ */
+@RestController
+@RequestMapping("/system/notice")
+@Api(tags={"【公告信息操作处理】Controller"})
+public class SysNoticeController extends BaseController
+{
+    @Autowired
+    private ISysNoticeService noticeService;
+
+    /**
+     * 获取通知公告列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:list')")
+    @GetMapping("/list")
+    @ApiOperation("获取通知公告列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<SysNotice> list(@ModelAttribute SysNotice notice)
+    {
+        startPage();
+        List<SysNotice> list = noticeService.selectNoticeList(notice);
+        return toResponsePageInfo(list);
+    }
+
+    /**
+     * 根据通知公告编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:query')")
+    @GetMapping(value = "/{noticeId}")
+    @ApiOperation("根据通知公告编号获取详细信息")
+    public Response<SysNotice> getInfo(
+            @ApiParam(name = "noticeId", value = "通知公告编号", required = true)
+            @PathVariable("noticeId") Long noticeId
+    ){
+        return Response.success(noticeService.selectNoticeById(noticeId));
+    }
+
+    /**
+     * 新增通知公告
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:add')")
+    @Log(title = "通知公告", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增通知公告")
+    public Response<Integer> add(@Validated @RequestBody SysNotice notice)
+    {
+        notice.setCreateBy(SecurityUtils.getUsername());
+        return toResponse(noticeService.insertNotice(notice));
+    }
+
+    /**
+     * 修改通知公告
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:edit')")
+    @Log(title = "通知公告", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改通知公告")
+    public Response<Integer> edit(@Validated @RequestBody SysNotice notice)
+    {
+        notice.setUpdateBy(SecurityUtils.getUsername());
+        return toResponse(noticeService.updateNotice(notice));
+    }
+
+    /**
+     * 删除通知公告
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:remove')")
+    @Log(title = "通知公告", businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/{noticeIds}")
+    @ApiOperation("删除通知公告")
+    public Response<Integer> remove(
+            @ApiParam(name = "noticeIds", value = "通知ids{逗号分隔}", required = true)
+            @PathVariable Long[] noticeIds
+    ){
+        return toResponse(noticeService.deleteNoticeByIds(noticeIds));
+    }
+}

hzgzpt-admin/src/main/java/com/miaxis/system/controller/system/SysPostController.java

@@ -0,0 +1,142 @@
+package com.miaxis.system.controller.system;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.constant.UserConstants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.ResponseEnum;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.system.domain.SysPost;
+import com.miaxis.system.service.ISysPostService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 岗位信息操作处理
+ *
+ * @author miaxis
+ */
+@RestController
+@RequestMapping("/system/post")
+@Api(tags={"【岗位信息操作处理】Controller"})
+public class SysPostController extends BaseController
+{
+    @Autowired
+    private ISysPostService postService;
+
+    /**
+     * 获取岗位列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:list')")
+    @GetMapping("/list")
+    @ApiOperation("获取岗位列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<SysPost> list(@ModelAttribute SysPost post)
+    {
+        startPage();
+        List<SysPost> list = postService.selectPostList(post);
+        return toResponsePageInfo(list);
+    }
+
+    @Log(title = "岗位管理", businessType = BusinessTypeEnum.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:post:export')")
+    @GetMapping("/export")
+    @ApiOperation("导出岗位列表Excel")
+    public Response<String> export(@ModelAttribute SysPost post)
+    {
+        List<SysPost> list = postService.selectPostList(post);
+        ExcelUtil<SysPost> util = new ExcelUtil<SysPost>(SysPost.class);
+        return util.exportExcel(list, "岗位数据");
+    }
+
+    /**
+     * 根据岗位编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:query')")
+    @GetMapping(value = "/{postId}")
+    @ApiOperation("根据岗位编号获取详细信息")
+    public Response<SysPost> getInfo(
+            @ApiParam(name = "postId", value = "岗位编号", required = true)
+            @PathVariable("postId") Long postId
+    ){
+        return Response.success(postService.selectPostById(postId));
+    }
+
+    /**
+     * 新增岗位
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:add')")
+    @Log(title = "岗位管理", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增岗位")
+    public Response<Integer> add(@Validated @RequestBody SysPost post)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
+        {
+            return Response.error(ResponseEnum.POST_ADD_ERROR_EXIST_NAME);
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
+        {
+            return Response.error(ResponseEnum.POST_ADD_ERROR_EXIST_CODE);
+        }
+        post.setCreateBy(SecurityUtils.getUsername());
+        return toResponse(postService.insertPost(post));
+    }
+
+    /**
+     * 修改岗位
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:edit')")
+    @Log(title = "岗位管理", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改岗位")
+    public Response<Integer> edit(@Validated @RequestBody SysPost post)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
+        {
+            return Response.error(ResponseEnum.POST_UPDATE_ERROR_EXIST_NAME);
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
+        {
+            return Response.error(ResponseEnum.POST_UPDATE_ERROR_EXIST_CODE);
+        }
+        post.setUpdateBy(SecurityUtils.getUsername());
+        return toResponse(postService.updatePost(post));
+    }
+
+    /**
+     * 删除岗位
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:remove')")
+    @Log(title = "岗位管理", businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/{postIds}")
+    @ApiOperation("删除岗位")
+    public Response<Integer> remove(
+            @ApiParam(name = "postIds", value = "岗位编号ids{逗号分隔}", required = true)
+            @PathVariable Long[] postIds
+    ){
+        return toResponse(postService.deletePostByIds(postIds));
+    }
+
+    /**
+     * 获取岗位选择框列表
+     */
+    @GetMapping("/optionselect")
+    @ApiOperation("获取岗位选择框列表")
+    public Response<List<SysPost>> optionselect()
+    {
+        List<SysPost> posts = postService.selectPostAll();
+        return Response.success(posts);
+    }
+}

hzgzpt-admin/src/main/java/com/miaxis/system/controller/system/SysProfileController.java

@@ -0,0 +1,132 @@
+package com.miaxis.system.controller.system;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.config.MiaxisConfig;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.ResponseEnum;
+import com.miaxis.common.core.domain.entity.SysUser;
+import com.miaxis.common.core.domain.model.LoginUser;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.ServletUtils;
+import com.miaxis.common.utils.file.FileUploadUtils;
+import com.miaxis.framework.web.service.TokenService;
+import com.miaxis.system.dto.system.PersonInfoDTO;
+import com.miaxis.system.dto.system.UpdatePwdDTO;
+import com.miaxis.system.service.ISysUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+/**
+ * 个人信息 业务处理
+ * 修改识别 swagger
+ * @author JuniorRay
+ */
+@RestController
+@RequestMapping("/system/user/profile")
+@Api(tags={"【个人信息业务处理】Controller"})
+public class SysProfileController extends BaseController
+{
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    /**
+     * 个人信息
+     */
+    @GetMapping
+    @ApiOperation("个人信息")
+    public Response<PersonInfoDTO> profile()
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        SysUser user = loginUser.getUser();
+        PersonInfoDTO personInfoDTO = new  PersonInfoDTO();
+        personInfoDTO.setUser(user);
+        personInfoDTO.setPostGroup(userService.selectUserPostGroup(loginUser.getUsername()));
+        personInfoDTO.setRoleGroup(userService.selectUserRoleGroup(loginUser.getUsername()));
+        return  Response.success(personInfoDTO);
+    }
+
+
+    /**
+     * 修改用户
+     */
+    @Log(title = "个人信息", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改用户")
+    public Response updateProfile(@RequestBody SysUser user)
+    {
+        if (userService.updateUserProfile(user) > 0)
+        {
+            LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+            // 更新缓存用户信息
+            loginUser.getUser().setNickName(user.getNickName());
+            loginUser.getUser().setPhonenumber(user.getPhonenumber());
+            loginUser.getUser().setEmail(user.getEmail());
+            loginUser.getUser().setSex(user.getSex());
+            tokenService.setLoginUser(loginUser);
+            return Response.success();
+        }
+        return Response.error(ResponseEnum.USER_UPDATE_ERROR);
+    }
+
+    /**
+     * 重置密码
+     */
+    @Log(title = "个人信息", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping("/updatePwd")
+    @ApiOperation("重置密码")
+    public Response updatePwd(@RequestBody UpdatePwdDTO updatePwdDTO) {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        String userName = loginUser.getUsername();
+        String password = loginUser.getPassword();
+        if (!SecurityUtils.matchesPassword(updatePwdDTO.getOldPassword(), password))
+        {
+            return Response.error(ResponseEnum.UPDATE_PASSWORD_ERROR_OLD_ERROR);
+        }
+        if (SecurityUtils.matchesPassword(updatePwdDTO.getNewPassword(), password))
+        {
+            return Response.error(ResponseEnum.UPDATE_PASSWORD_ERROR_OLD_REPEAT);
+        }
+        if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(updatePwdDTO.getNewPassword())) > 0)
+        {
+            // 更新缓存用户密码
+            loginUser.getUser().setPassword(SecurityUtils.encryptPassword(updatePwdDTO.getNewPassword()));
+            tokenService.setLoginUser(loginUser);
+            return Response.success();
+        }
+        return Response.error(ResponseEnum.UPDATE_PASSWORD_ERROR);
+    }
+
+    /**
+     * 头像上传
+     */
+    @Log(title = "用户头像", businessType = BusinessTypeEnum.UPDATE)
+    @PostMapping("/avatar")
+    @ApiOperation("头像上传")
+    public Response<String> avatar(@RequestParam("avatarfile") MultipartFile file) throws IOException
+    {
+        if (!file.isEmpty())
+        {
+            LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+            String avatar = FileUploadUtils.upload(MiaxisConfig.getAvatarPath(), file);
+            if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
+            {
+                Response response = Response.success(avatar);
+                // 更新缓存用户头像
+                loginUser.getUser().setAvatar(avatar);
+                tokenService.setLoginUser(loginUser);
+                return response;
+            }
+        }
+        return Response.error(ResponseEnum.ABNORMAL_PICTURE_UPLOAD);
+    }
+}

hzgzpt-admin/src/main/java/com/miaxis/system/controller/system/SysRoleController.java

@@ -0,0 +1,196 @@
+package com.miaxis.system.controller.system;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.constant.UserConstants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.ResponseEnum;
+import com.miaxis.common.core.domain.entity.SysRole;
+import com.miaxis.common.core.domain.model.LoginUser;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.ServletUtils;
+import com.miaxis.common.utils.StringUtils;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.framework.web.service.SysPermissionService;
+import com.miaxis.framework.web.service.TokenService;
+import com.miaxis.system.service.ISysRoleService;
+import com.miaxis.system.service.ISysUserService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 角色信息
+ *
+ * @author miaxis
+ */
+@RestController
+@RequestMapping("/system/role")
+@Api(tags={"【角色信息】Controller"})
+public class SysRoleController extends BaseController
+{
+    @Autowired
+    private ISysRoleService roleService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    @Autowired
+    private SysPermissionService permissionService;
+
+    @Autowired
+    private ISysUserService userService;
+
+    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询角色信息列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" ,dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<SysRole> list(@ModelAttribute SysRole role)
+    {
+        startPage();
+        List<SysRole> list = roleService.selectRoleList(role);
+        return toResponsePageInfo(list);
+    }
+
+    @Log(title = "角色管理", businessType = BusinessTypeEnum.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:role:export')")
+    @GetMapping("/export")
+    @ApiOperation("导出角色信息列表Excel")
+    public Response<String> export(@ModelAttribute SysRole role)
+    {
+        List<SysRole> list = roleService.selectRoleList(role);
+        ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
+        return util.exportExcel(list, "角色数据");
+    }
+
+    /**
+     * 根据角色编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    @GetMapping(value = "/{roleId}")
+    @ApiOperation("根据角色编号获取详细信息")
+    public Response<SysRole> getInfo(
+            @ApiParam(name = "roleId", value = "角色编号", required = true)
+            @PathVariable("roleId") Long roleId
+    ){
+        return Response.success(roleService.selectRoleById(roleId));
+    }
+
+    /**
+     * 新增角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:add')")
+    @Log(title = "角色管理", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增角色")
+    public Response<Integer> add(@Validated @RequestBody SysRole role)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
+        {
+            return Response.error(ResponseEnum.ROLE_ADD_ERROR_EXIST_NAME);
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
+        {
+            return Response.error(ResponseEnum.ROLE_ADD_ERROR_EXIST_AUTHORITY);
+        }
+        role.setCreateBy(SecurityUtils.getUsername());
+        return toResponse(roleService.insertRole(role));
+
+    }
+
+    /**
+     * 修改保存角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改保存角色")
+    public Response edit(@Validated @RequestBody SysRole role)
+    {
+        roleService.checkRoleAllowed(role);
+        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
+        {
+            return Response.error(ResponseEnum.ROLE_UPDATE_ERROR_EXIST_NAME);
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
+        {
+            return Response.error(ResponseEnum.ROLE_UPDATE_ERROR_EXIST_AUTHORITY);
+        }
+        role.setUpdateBy(SecurityUtils.getUsername());
+
+        if (roleService.updateRole(role) > 0)
+        {
+            // 更新缓存用户权限
+            LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+            if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
+            {
+                loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
+                loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
+                tokenService.setLoginUser(loginUser);
+            }
+            return Response.success();
+        }
+        return Response.error(ResponseEnum.ROLE_UPDATE_ERROR);
+    }
+
+    /**
+     * 修改保存数据权限
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping("/dataScope")
+    @ApiOperation("修改保存数据权限")
+    public Response<Integer> dataScope(@RequestBody SysRole role)
+    {
+        roleService.checkRoleAllowed(role);
+        return toResponse(roleService.authDataScope(role));
+    }
+
+    /**
+     * 状态修改
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping("/changeStatus")
+    @ApiOperation("状态修改")
+    public Response<Integer> changeStatus(@RequestBody SysRole role)
+    {
+        roleService.checkRoleAllowed(role);
+        role.setUpdateBy(SecurityUtils.getUsername());
+        return toResponse(roleService.updateRoleStatus(role));
+    }
+
+    /**
+     * 删除角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:remove')")
+    @Log(title = "角色管理", businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/{roleIds}")
+    @ApiOperation("删除角色")
+    public Response<Integer> remove(
+            @ApiParam(name = "roleIds", value = "角色编号ids{逗号分隔}", required = true)
+            @PathVariable Long[] roleIds
+    ){
+        return toResponse(roleService.deleteRoleByIds(roleIds));
+    }
+
+    /**
+     * 获取角色选择框列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    @GetMapping("/optionselect")
+    @ApiOperation("获取角色选择框列表")
+    public Response<List<SysRole>> optionselect()
+    {
+        return Response.success(roleService.selectRoleAll());
+    }
+}

hzgzpt-admin/src/main/java/com/miaxis/system/controller/system/SysUserController.java

@@ -0,0 +1,222 @@
+package com.miaxis.system.controller.system;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.constant.UserConstants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.ResponseEnum;
+import com.miaxis.common.core.domain.entity.SysRole;
+import com.miaxis.common.core.domain.entity.SysUser;
+import com.miaxis.common.core.domain.model.LoginUser;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.ServletUtils;
+import com.miaxis.common.utils.StringUtils;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.framework.web.service.TokenService;
+import com.miaxis.system.dto.system.UserInfoDetailDTO;
+import com.miaxis.system.service.ISysPostService;
+import com.miaxis.system.service.ISysRoleService;
+import com.miaxis.system.service.ISysUserService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 用户信息
+ *
+ * @author miaxis
+ */
+@RestController
+@RequestMapping("/system/user")
+@Api(tags={"【用户信息】Controller"})
+public class SysUserController extends BaseController
+{
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private ISysRoleService roleService;
+
+    @Autowired
+    private ISysPostService postService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    /**
+     * 获取用户列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @GetMapping("/list")
+    @ApiOperation("获取用户列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<SysUser> list(@ModelAttribute SysUser user)
+    {
+        startPage();
+        List<SysUser> list = userService.selectUserList(user);
+        return toResponsePageInfo(list);
+    }
+
+    @Log(title = "用户管理", businessType = BusinessTypeEnum.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:user:export')")
+    @GetMapping("/export")
+    @ApiOperation("导出用户列表Excel")
+    public Response<String> export(@ModelAttribute SysUser user)
+    {
+        List<SysUser> list = userService.selectUserList(user);
+        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        return util.exportExcel(list, "用户数据");
+    }
+
+    @Log(title = "用户管理", businessType = BusinessTypeEnum.IMPORT)
+    @PreAuthorize("@ss.hasPermi('system:user:import')")
+    @PostMapping("/importData")
+    @ApiOperation("导入用户列表Excel")
+    public Response<String> importData(
+            @ApiParam(name = "file", value = "二进制文件",required = true)
+            @RequestBody MultipartFile file,
+            @ApiParam(name = "updateSupport", value = "是否更新支持，如果已存在，则进行更新数据",required = true)
+            @RequestBody boolean updateSupport
+    ) throws Exception {
+        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        List<SysUser> userList = util.importExcel(file.getInputStream());
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        String operName = loginUser.getUsername();
+        String message = userService.importUser(userList, updateSupport, operName);
+        return Response.success(message);
+    }
+
+    @GetMapping("/importTemplate")
+    @ApiOperation("导入用户模板")
+    public Response<String> importTemplate()
+    {
+        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        return util.importTemplateExcel("用户数据");
+    }
+
+    /**
+     * 根据用户编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @GetMapping(value = { "/", "/{userId}" })
+    @ApiOperation("根据用户编号获取详细信息")
+    public Response<UserInfoDetailDTO> getInfo(
+            @ApiParam(name = "userId", value = "用户编号", required = true)
+            @PathVariable(value = "userId", required = false) Long userId
+    ){
+        UserInfoDetailDTO userInfoDetailDTO = new UserInfoDetailDTO();
+        List<SysRole> roles = roleService.selectRoleAll();
+        List<SysRole> rolesRet = SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList());
+        userInfoDetailDTO.setRoles(rolesRet);
+        userInfoDetailDTO.setPosts(postService.selectPostAll());
+        if (StringUtils.isNotNull(userId))
+        {
+            userInfoDetailDTO.setUser(userService.selectUserById(userId));
+            userInfoDetailDTO.setPostIds(postService.selectPostListByUserId(userId));
+            userInfoDetailDTO.setRoleIds(roleService.selectRoleListByUserId(userId));
+        }
+        return Response.success(userInfoDetailDTO);
+    }
+
+    /**
+     * 新增用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:add')")
+    @Log(title = "用户管理", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增用户")
+    public Response<Integer> add(@Validated @RequestBody SysUser user)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName())))
+        {
+            return Response.error(ResponseEnum.USER_ADD_ERROR_USERNAME);
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+        {
+            return Response.error(ResponseEnum.USER_ADD_ERROR_PHONE);
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+        {
+            return Response.error(ResponseEnum.USER_ADD_ERROR_MAIL);
+        }
+        user.setCreateBy(SecurityUtils.getUsername());
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        return toResponse(userService.insertUser(user));
+    }
+
+    /**
+     * 修改用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "用户管理", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改用户")
+    public Response<Integer> edit(@Validated @RequestBody SysUser user)
+    {
+        userService.checkUserAllowed(user);
+        if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+        {
+            return Response.error(ResponseEnum.USER_UPDATE_ERROR_PHONE);
+        }
+        else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+        {
+            return Response.error(ResponseEnum.USER_UPDATE_ERROR_MAIL);
+        }
+        user.setUpdateBy(SecurityUtils.getUsername());
+        return toResponse(userService.updateUser(user));
+    }
+
+    /**
+     * 删除用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:remove')")
+    @Log(title = "用户管理", businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/{userIds}")
+    @ApiOperation("删除用户")
+    public Response<Integer> remove(
+            @ApiParam(name = "userIds", value = "用户编号ids{逗号分隔}", required = true)
+            @PathVariable Long[] userIds
+    ){
+        return toResponse(userService.deleteUserByIds(userIds));
+    }
+
+    /**
+     * 重置密码
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
+    @Log(title = "用户管理", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping("/resetPwd")
+    @ApiOperation("重置密码")
+    public Response<Integer> resetPwd(@RequestBody SysUser user)
+    {
+        userService.checkUserAllowed(user);
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        user.setUpdateBy(SecurityUtils.getUsername());
+        return toResponse(userService.resetPwd(user));
+    }
+
+    /**
+     * 状态修改
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "用户管理", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping("/changeStatus")
+    @ApiOperation("状态修改")
+    public Response<Integer> changeStatus(@RequestBody SysUser user)
+    {
+        userService.checkUserAllowed(user);
+        user.setUpdateBy(SecurityUtils.getUsername());
+        return toResponse(userService.updateUserStatus(user));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java → hzgzpt-admin/src/main/java/com/miaxis/system/controller/tool/SwaggerController.java

@@ -1,15 +1,15 @@
-package com.ruoyi.web.controller.tool;
+package com.miaxis.system.controller.tool;
 
+import com.miaxis.common.core.controller.BaseController;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import com.ruoyi.common.core.controller.BaseController;
 
 /**
  * swagger 接口
- * 
- * @author ruoyi
+ *
+ * @author miaxis
  */
 @Controller
 @RequestMapping("/tool/swagger")
@@ -19,6 +19,6 @@ public class SwaggerController extends BaseController
     @GetMapping()
     public String index()
     {
-        return redirect("/swagger-ui.html");
+        return redirect("/doc.html");
     }
 }

ruoyi-admin/src/main/resources/application-dev.yml → hzgzpt-admin/src/main/resources/application-dev.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://192.168.8.213:3306/ruoyi_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                url: jdbc:mysql://192.168.8.213:3306/hzgzpt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
                 username: root
                 password: 123456
             # 从库数据源
@@ -58,7 +58,7 @@ spring:
     # redis 配置
     redis:
         # 地址
-        host: 127.0.0.1
+        host: 192.168.8.213
         # 端口，默认为6379
         port: 6379
         # 密码

ruoyi-admin/src/main/resources/application-prod.yml → hzgzpt-admin/src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://192.168.8.213:3306/ruoyi_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                url: jdbc:mysql://192.168.8.213:3306/hzgzpt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
                 username: root
                 password: 123456
             # 从库数据源

ruoyi-admin/src/main/resources/application.yml → hzgzpt-admin/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 # 项目相关配置
-ruoyi:
+miaxis:
   # 名称
-  name: RuoYi
+  name: Miaxis
   # 版本
   version: 3.2.1
   # 版权年份
@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径,使用jvm系统变量,兼容windows和linux;
-  profile: ${user.dir}/ruoyi/uploadPath
+  profile: ${user.dir}/miaxis/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
@@ -45,7 +45,7 @@ server:
 # 日志配置
 logging:
   level:
-    com.ruoyi: @logging.level@
+    com.hzgzpt: @logging.level@
     org.springframework: warn
 
 # Spring配置
@@ -84,7 +84,7 @@ mybatis-plus:
   # 对应的 XML 文件位置
   mapper-locations: classpath*:mapper/**/*Mapper.xml
   # 实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.ruoyi.**.domain
+  typeAliasesPackage: com.miaxis.**.domain
   # 针对 typeAliasesPackage，如果配置了该属性，则仅仅会扫描路径下以该类作为父类的域对象
   #typeAliasesSuperType: Class<?>
   # 如果配置了该属性，SqlSessionFactoryBean 会把该包下面的类注册为对应的 TypeHandler

ruoyi-admin/src/main/resources/logback.xml → hzgzpt-admin/src/main/resources/logback.xml

@@ -73,7 +73,7 @@
     </appender>
 	
 	<!-- 系统模块日志级别控制  -->
-	<logger name="com.ruoyi" level="info" />
+	<logger name="com.miaxis" level="info" />
 	<!-- Spring日志级别控制  -->
 	<logger name="org.springframework" level="warn" />
 

ruoyi-common/pom.xml → hzgzpt-common/pom.xml

@@ -3,13 +3,13 @@
          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>ruoyi</artifactId>
-        <groupId>com.ruoyi</groupId>
+        <groupId>com.miaxis</groupId>
+        <artifactId>hzgzpt</artifactId>
         <version>3.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>ruoyi-common</artifactId>
+    <artifactId>hzgzpt-common</artifactId>
 
     <description>
         common通用工具
@@ -136,6 +136,43 @@
             <artifactId>lombok</artifactId>
         </dependency>
 
+        <!-- swagger2-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>${swagger.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.swagger</groupId>
+                    <artifactId>swagger-annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.swagger</groupId>
+                    <artifactId>swagger-models</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!--防止进入swagger页面报类型转换错误(java.lang.NumberFormatException: For input string: "")，
+        排除2.9.2中的引用，手动增加1.5.21版本-->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.21</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.5.21</version>
+        </dependency>
+        <!-- swagger-bootstrap-UI-->
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>swagger-bootstrap-ui</artifactId>
+            <version>1.9.4</version>
+        </dependency>
+
     </dependencies>
 
 </project>

ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java → hzgzpt-common/src/main/java/com/miaxis/common/annotation/DataScope.java

@@ -1,15 +1,11 @@
-package com.ruoyi.common.annotation;
+package com.miaxis.common.annotation;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * 数据权限过滤注解
  * 
- * @author ruoyi
+ * @author miaxis
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)

hzgzpt-common/src/main/java/com/miaxis/common/annotation/DataSource.java

@@ -0,0 +1,24 @@
+package com.miaxis.common.annotation;
+
+import com.miaxis.common.enums.DataSourceTypeEnum;
+
+import java.lang.annotation.*;
+
+/**
+ * 自定义多数据源切换注解
+ *
+ * 优先级：先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准
+ *
+ * @author miaxis
+ */
+@Target({ ElementType.METHOD, ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+public @interface DataSource
+{
+    /**
+     * 切换数据源名称
+     */
+    public DataSourceTypeEnum value() default DataSourceTypeEnum.MASTER;
+}

ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java → hzgzpt-common/src/main/java/com/miaxis/common/annotation/Excel.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.annotation;
+package com.miaxis.common.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 /**
  * 自定义导出Excel数据注解
  * 
- * @author ruoyi
+ * @author miaxis
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
@@ -105,27 +105,6 @@ public @interface Excel
      */
     public boolean isStatistics() default false;
 
-    /**
-     * 导出字段对齐方式（0：默认；1：靠左；2：居中；3：靠右）
-     */
-    Align align() default Align.AUTO;
-
-    public enum Align
-    {
-        AUTO(0), LEFT(1), CENTER(2), RIGHT(3);
-        private final int value;
-
-        Align(int value)
-        {
-            this.value = value;
-        }
-
-        public int value()
-        {
-            return this.value;
-        }
-    }
-
     /**
      * 字段类型（0：导出导入；1：仅导出；2：仅导入）
      */

ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java → hzgzpt-common/src/main/java/com/miaxis/common/annotation/Excels.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.annotation;
+package com.miaxis.common.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 /**
  * Excel注解集
  * 
- * @author ruoyi
+ * @author miaxis
  */
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)

hzgzpt-common/src/main/java/com/miaxis/common/annotation/Log.java

@@ -0,0 +1,38 @@
+package com.miaxis.common.annotation;
+
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.enums.OperatorTypeEnum;
+
+import java.lang.annotation.*;
+
+/**
+ * 自定义操作日志记录注解
+ *
+ * @author miaxis
+ *
+ */
+@Target({ ElementType.PARAMETER, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Log
+{
+    /**
+     * 模块
+     */
+    public String title() default "";
+
+    /**
+     * 功能
+     */
+    public BusinessTypeEnum businessType() default BusinessTypeEnum.OTHER;
+
+    /**
+     * 操作人类别
+     */
+    public OperatorTypeEnum operatorType() default OperatorTypeEnum.MANAGE;
+
+    /**
+     * 是否保存请求的参数
+     */
+    public boolean isSaveRequestData() default true;
+}

hzgzpt-common/src/main/java/com/miaxis/common/annotation/RepeatSubmit.java

@@ -0,0 +1,18 @@
+package com.miaxis.common.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 自定义注解防止表单重复提交
+ * 
+ * @author miaxis
+ *
+ */
+@Inherited
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface RepeatSubmit
+{
+
+}

ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java → hzgzpt-common/src/main/java/com/miaxis/common/config/MiaxisConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.config;
+package com.miaxis.common.config;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
@@ -6,11 +6,11 @@ import org.springframework.stereotype.Component;
 /**
  * 读取项目相关配置
  * 
- * @author ruoyi
+ * @author miaxis
  */
 @Component
-@ConfigurationProperties(prefix = "ruoyi")
-public class RuoYiConfig
+@ConfigurationProperties(prefix = "miaxis")
+public class MiaxisConfig
 {
     /** 项目名称 */
     private String name;
@@ -77,7 +77,7 @@ public class RuoYiConfig
 
     public void setProfile(String profile)
     {
-        RuoYiConfig.profile = profile;
+        MiaxisConfig.profile = profile;
     }
 
     public static boolean isAddressEnabled()
@@ -87,7 +87,7 @@ public class RuoYiConfig
 
     public void setAddressEnabled(boolean addressEnabled)
     {
-        RuoYiConfig.addressEnabled = addressEnabled;
+        MiaxisConfig.addressEnabled = addressEnabled;
     }
 
     /**

ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java → hzgzpt-common/src/main/java/com/miaxis/common/constant/Constants.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.constant;
+package com.miaxis.common.constant;
 
 /**
  * 通用常量信息
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class Constants
 {
@@ -61,7 +61,7 @@ public class Constants
      * 登录用户 redis key
      */
     public static final String LOGIN_TOKEN_KEY = "login_tokens:";
-
+    
     /**
      * 防重提交 redis key
      */

ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java → hzgzpt-common/src/main/java/com/miaxis/common/constant/GenConstants.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.constant;
+package com.miaxis.common.constant;
 
 /**
  * 代码生成通用常量
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class GenConstants
 {

ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java → hzgzpt-common/src/main/java/com/miaxis/common/constant/ScheduleConstants.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.constant;
+package com.miaxis.common.constant;
 
 /**
  * 任务调度通用常量
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class ScheduleConstants
 {

ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java → hzgzpt-common/src/main/java/com/miaxis/common/constant/UserConstants.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.constant;
+package com.miaxis.common.constant;
 
 /**
  * 用户常量信息
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class UserConstants
 {
@@ -54,9 +54,6 @@ public class UserConstants
     /** Layout组件标识 */
     public final static String LAYOUT = "Layout";
 
-    /** ParentView组件标识 */
-    public final static String PARENT_VIEW = "ParentView";
-
     /** 校验返回结果码 */
     public final static String UNIQUE = "0";
     public final static String NOT_UNIQUE = "1";

hzgzpt-common/src/main/java/com/miaxis/common/core/controller/BaseController.java

@@ -0,0 +1,97 @@
+package com.miaxis.common.core.controller;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.ResponseEnum;
+import com.miaxis.common.core.page.PageBean;
+import com.miaxis.common.core.page.PageBuilder;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.utils.DateUtils;
+import com.miaxis.common.utils.StringUtils;
+import com.miaxis.common.utils.sql.SqlUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.InitBinder;
+
+import java.beans.PropertyEditorSupport;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * web层通用数据处理
+ *
+ * @author miaxis
+ */
+public class BaseController
+{
+    protected final Logger logger = LoggerFactory.getLogger(BaseController.class);
+
+    /**
+     * 将前台传递过来的日期格式的字符串，自动转化为Date类型
+     */
+    @InitBinder
+    public void initBinder(WebDataBinder binder)
+    {
+        // Date 类型转换
+        binder.registerCustomEditor(Date.class, new PropertyEditorSupport()
+        {
+            @Override
+            public void setAsText(String text)
+            {
+                setValue(DateUtils.parseDate(text));
+            }
+        });
+    }
+
+    /**
+     * 设置请求分页数据 PageHelper劫持sql查询实现分页
+     */
+    protected void startPage()
+    {
+        PageBean pageBean = PageBuilder.buildPageRequest();
+        Integer pageNum = pageBean.getPageNum();
+        Integer pageSize = pageBean.getPageSize();
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize))
+        {
+            String orderBy = SqlUtil.escapeOrderBySql(pageBean.getOrderBy());
+            PageHelper.startPage(pageNum, pageSize, orderBy);
+        }
+    }
+
+    /**
+     * 响应请求分页数据 可以swagger识别
+     * @param list 加入泛型任何list
+     * @author JuniorRay
+     */
+    protected <T>ResponsePageInfo<T> toResponsePageInfo(List<T> list)
+    {
+        ResponsePageInfo<T> responsePageInfo = new ResponsePageInfo<T>();
+        responsePageInfo.setCode(ResponseEnum.SUCCESS.getCode());
+        responsePageInfo.setMsg("查询成功");
+        responsePageInfo.setRows(list);
+        responsePageInfo.setTotal(new PageInfo(list).getTotal());
+        return responsePageInfo;
+    }
+    /**
+     * 响应返回结果  可以swagger识别
+     *
+     * @param rows 影响行数
+     * @author JuniorRay
+     * @return 操作结果
+     */
+    protected Response<Integer> toResponse(int rows)
+    {
+        return rows > 0 ? Response.success(rows) : Response.error();
+    }
+
+
+    /**
+     * 页面跳转
+     */
+    public String redirect(String url)
+    {
+        return StringUtils.format("redirect:{}", url);
+    }
+}

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java → hzgzpt-common/src/main/java/com/miaxis/common/core/domain/BaseEntity.java

@@ -1,41 +1,65 @@
-package com.ruoyi.common.core.domain;
+package com.miaxis.common.core.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * Entity基类
- * 
- * @author ruoyi
+ *
+ * @author miaxis
  */
+@ApiModel(value = "BaseEntity", description = "Entity基类")
+@Data
 public class BaseEntity implements Serializable
 {
     private static final long serialVersionUID = 1L;
 
     /** 搜索值 */
+    @ApiModelProperty(value = "搜索值" ,hidden = true)
     private String searchValue;
 
     /** 创建者 */
+    @ApiModelProperty(value = "创建者"  ,hidden = true)
     private String createBy;
 
     /** 创建时间 */
+    @ApiModelProperty(value = "创建时间"  ,hidden = true)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /** 更新者 */
+    @ApiModelProperty(value = "更新者"  ,hidden = true)
     private String updateBy;
 
     /** 更新时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" )
+    @ApiModelProperty(value = "更新时间" ,hidden = true)
     private Date updateTime;
 
     /** 备注 */
+    @ApiModelProperty(value = "备注" ,hidden = true)
     private String remark;
 
+    /** 开始时间 */
+    @JsonIgnore
+    @ApiModelProperty(value = "开始时间")
+    private String beginTime;
+
+    /** 结束时间 */
+    @JsonIgnore
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+
     /** 请求参数 */
+    @ApiModelProperty(value = "请求参数",hidden = true)
     private Map<String, Object> params;
 
     public String getSearchValue()
@@ -98,6 +122,26 @@ public class BaseEntity implements Serializable
         this.remark = remark;
     }
 
+    public String getBeginTime()
+    {
+        return beginTime;
+    }
+
+    public void setBeginTime(String beginTime)
+    {
+        this.beginTime = beginTime;
+    }
+
+    public String getEndTime()
+    {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime)
+    {
+        this.endTime = endTime;
+    }
+
     public Map<String, Object> getParams()
     {
         if (params == null)

hzgzpt-common/src/main/java/com/miaxis/common/core/domain/Response.java

@@ -0,0 +1,110 @@
+package com.miaxis.common.core.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 【Response返回实体类】
+ *
+ * @author JuniorRay
+ * @date 2020-11-12
+ */
+@ApiModel(description = "结果返回类")
+public class Response<T> {
+    @ApiModelProperty(value = "状态码")
+    private Integer code;
+
+    @ApiModelProperty(value = "返回内容")
+    private String msg;
+
+    @ApiModelProperty(value = "数据对象")
+    private T data;
+
+    /**
+     * 构造方法私有化，不允许外部new Response
+     * @param data
+     */
+    private Response(T data){
+        this.code = ResponseEnum.SUCCESS.getCode();
+        this.msg = ResponseEnum.SUCCESS.getMessage();
+        this.data = data;
+    }
+
+    /**
+     * 构造方法私有化，不允许外部new Response
+     * @param responseEnum
+     */
+    private Response(ResponseEnum responseEnum){
+        if (null == responseEnum) {
+            return;
+        }
+        this.code = responseEnum.getCode();
+        this.msg = responseEnum.getMessage();
+    }
+
+    /**
+     * 成功时调用
+     * @param
+     * @param <T>
+     * @return
+     */
+    public static <T> Response<T> success(){
+        return success(null);
+    }
+    /**
+     * 成功时调用
+     * @param data
+     * @param <T>
+     * @return
+     */
+    public static <T> Response<T> success(T data){
+        return new Response<T>(data);
+    }
+    /**
+     * 失败时调用
+     * @param
+     * @param <T>
+     * @return
+     */
+    public static <T> Response error(){
+        return error(ResponseEnum.ERROR);
+    }
+    /**
+     * 失败时调用
+     * @param responseEnum
+     * @param <T>
+     * @return
+     */
+    public static <T> Response error(ResponseEnum responseEnum){
+        return new Response<T>(responseEnum);
+    }
+
+
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public Response<T> setCode(Integer code) {
+        this.code = code;
+        return this;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public Response<T> setMsg(String msg) {
+        this.msg = msg;
+        return this;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public Response<T> setData(T data) {
+        this.data = data;
+        return this;
+    }
+}

hzgzpt-common/src/main/java/com/miaxis/common/core/domain/ResponseEnum.java

@@ -0,0 +1,149 @@
+package com.miaxis.common.core.domain;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 【Response返回状态的枚举类】
+ *
+ * @author JuniorRay
+ * @date 2020-11-12
+ */
+public enum ResponseEnum {
+    /**********************通用日志信息***************************/
+
+    /**操作成功**/
+    SUCCESS(200,"操作成功"),
+    /**操作失败**/
+    FAIL(000,"操作失败"),
+    /**服务端异常**/
+    ERROR(500,"系统内部错误"),
+    /**对象创建成功**/
+    CREATED ( 201,"对象创建成功"),
+    /**请求已经被接受**/
+    ACCEPTED(202,"请求已经被接受"),
+    /**操作已经执行成功，但是没有返回数据**/
+    NO_CONTENT(204,"操作已经执行成功，但是没有返回数据"),
+    /**资源已被移除**/
+    MOVED_PERM(301,"资源已被移除"),
+    /**重定向*/
+    SEE_OTHER(303,"重定向"),
+    /**资源没有被修改**/
+    NOT_MODIFIED(304,"资源没有被修改"),
+    /**参数列表错误（缺少，格式不匹配**/
+    BAD_REQUEST(400,"参数列表错误（缺少，格式不匹配）"),
+    /**未授权**/
+    UNAUTHORIZED(401,"未授权"),
+    /**访问受限，授权过期**/
+    FORBIDDEN(403,"访问受限，授权过期"),
+    /**资源，服务未找到**/
+    NOT_FOUND(404,"资源，服务未找到"),
+    /**不允许的http方法**/
+    BAD_METHOD(405,"不允许的http方法"),
+    /**资源冲突，或者资源被锁**/
+    CONFLICT(409,"资源冲突，或者资源被锁"),
+    /**不支持的数据，媒体类型**/
+    UNSUPPORTED_TYPE(415,"不支持的数据，媒体类型"),
+    /**接口未实现**/
+    NOT_IMPLEMENTED(501,"接口未实现"),
+
+    /**********************基本增删改查信息***************************/
+    /**重复提交**/
+    REPEAT_SUBMIT(9999,"不允许重复提交，请稍后再试"),
+    ADD_FAIL(9901,"新增失败"),
+    ADD_SUCCESS(9902,"新增成功"),
+    DELETE_FAIL(9903,"删除失败"),
+    DELETE_SUCCESS(9904,"删除成功"),
+    UPDATE_FAIL(9905,"修改失败"),
+    UPDATE_SUCCESS(9906,"修改成功"),
+    QUERY_FAIL(9907,"查询失败"),
+    QUERY_SUCCESS(9908,"查询成功"),
+
+    /**********************其他日志信息***************************/
+    /**菜单模块**/
+    MENU_ADD_ERROR_EXIST(9001,"新增菜单失败，菜单名称已存在"),
+    MENU_ADD_ERROR_HTTP(9002,"新增菜单失败，地址必须以http(s)://开头"),
+    MENU_ADD_ERROR_SELF(9003,"新增菜单失败，上级菜单不能选择自己"),
+    MENU_DELETE_ERROR_SUB(9004,"删除菜单失败，存在子菜单,不允许删除"),
+    MENU_DELETE_ERROR_ROLE(9005,"删除菜单失败，菜单已分配角色,不允许删除"),
+    MENU_UPDATE_ERROR_EXIST(9006,"修改菜单失败，菜单名称已存在"),
+    MENU_UPDATE_ERROR_HTTP(9007,"修改菜单失败，地址必须以http(s)://开头"),
+    MENU_UPDATE_ERROR_SELF(9008,"修改菜单失败，上级菜单不能选择自己"),
+    /**参数模块**/
+    CONFIG_ADD_ERROR_EXIST(9010,"新增参数失败,参数键名已存在"),
+    CONFIG_UPDATE_ERROR_EXIST(9011,"修改参数失败,参数键名已存在"),
+    /**部门模块**/
+    DEPARTMENT_ADD_ERROR_EXIST(9021,"新增部门失败,部门名称已存在"),
+    DEPARTMENT_UPDATE_ERROR_EXIST(9022,"修改部门失败,部门名称已存在"),
+    DEPARTMENT_UPDATE_ERROR_SELF(9023,"修改部门失败,上级部门不能是自己"),
+    DEPARTMENT_UPDATE_ERROR_SUB(9024,"修改部门失败,该部门包含未停用的子部门！"),
+    DEPARTMENT_DELETE_ERROR_SUB(9025,"删除部门失败,存在下级部门,不允许删除！"),
+    DEPARTMENT_DELETE_ERROR_USER(9026,"删除部门失败,部门存在用户,不允许删除！"),
+    /**字典模块**/
+    DICTIONARY_ADD_ERROR_EXIST(9030,"新增字典失败,字典类型已存在"),
+    DICTIONARY_UPDATE_ERROR_EXIST(9031,"修改字典失败,字典类型已存在"),
+    /**岗位模块**/
+    POST_ADD_ERROR_EXIST_NAME(9040,"新增岗位失败,岗位名称已存在"),
+    POST_ADD_ERROR_EXIST_CODE(9041,"新增岗位失败,岗位编码已存在"),
+    POST_UPDATE_ERROR_EXIST_NAME(9042,"修改岗位失败,岗位名称已存在"),
+    POST_UPDATE_ERROR_EXIST_CODE(9043,"修改岗位失败,岗位编码已存在"),
+    /**角色模块**/
+    ROLE_ADD_ERROR_EXIST_NAME(9040,"新增角色失败,角色名称已存在"),
+    ROLE_ADD_ERROR_EXIST_AUTHORITY(9041,"新增角色失败,角色权限已存在"),
+    ROLE_UPDATE_ERROR_EXIST_NAME(9042,"修改角色失败,角色名称已存在"),
+    ROLE_UPDATE_ERROR_EXIST_AUTHORITY(9043,"修改角色失败,角色权限已存在"),
+    ROLE_UPDATE_ERROR(9044,"修改角色失败"),
+    /**用户模块**/
+    USER_ADD_ERROR_USERNAME(9050,"新增用户失败,登录账号已存在"),
+    USER_ADD_ERROR_PHONE(9051,"新增用户失败,手机号码已存在"),
+    USER_ADD_ERROR_MAIL(9052,"新增用户失败,邮箱账号已存在"),
+    USER_UPDATE_ERROR_PHONE(9053,"修改用户失败,手机号码已存在"),
+    USER_UPDATE_ERROR_MAIL(9054,"修改用户失败,邮箱账号已存在"),
+    USER_UPDATE_ERROR(9055,"修改个人信息异常，请联系管理员"),
+    UPDATE_PASSWORD_ERROR_OLD_ERROR(9056,"修改密码失败，旧密码错误"),
+    UPDATE_PASSWORD_ERROR_OLD_REPEAT(9057,"新密码和旧密码重复，请重新修改密码"),
+    UPDATE_PASSWORD_ERROR(9058,"修改密码异常，请联系管理员"),
+    /**登录模块**/
+    LOGIN_SUCCESS(9100,"登录成功"),
+    LOGIN_FAIL(9101,"登录失败"),
+    LOGOUT_SUCCESS(9102,"退出成功"),
+    LOGOUT_FAIL(9103,"退出失败"),
+    /**其他**/
+    DEMO_MODE(9114,"演示模式，不允许操作"),
+    CRON_ERROR(9115,"cron表达式不正确"),
+    ABNORMAL_PICTURE_UPLOAD(9116,"上传图片异常，请联系管理员");
+
+
+    // 成员变量
+    private Integer code;
+    private String message;
+
+    // 构造方法
+    ResponseEnum(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    private static final Map<Integer, ResponseEnum> ENUM_MAP = new HashMap<Integer, ResponseEnum>();
+
+    static {
+        for (ResponseEnum item : values()) {
+            ENUM_MAP.put(item.getCode(), item);
+        }
+    }
+
+    public Integer getCode() {
+        return  this.code ;
+    }
+    public String getMessage() {
+        return  this.message ;
+    }
+
+    public static ResponseEnum getModelByKey(Integer code) {
+        if (code != null) {
+            return ENUM_MAP.get(code);
+        }
+        return null;
+    }
+
+}

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java → hzgzpt-common/src/main/java/com/miaxis/common/core/domain/TreeEntity.java

@@ -1,30 +1,41 @@
-package com.ruoyi.common.core.domain;
+package com.miaxis.common.core.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * Tree基类
- * 
- * @author ruoyi
+ *
+ * @author miaxis
  */
+@ApiModel(value = "TreeEntity", description = "Tree基类")
+@Data
 public class TreeEntity extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 父菜单名称 */
+    @ApiModelProperty(value = "父菜单名称")
     private String parentName;
 
     /** 父菜单ID */
+    @ApiModelProperty(value = "父菜单ID")
     private Long parentId;
 
     /** 显示顺序 */
+    @ApiModelProperty(value = "显示顺序")
     private Integer orderNum;
 
     /** 祖级列表 */
+    @ApiModelProperty(value = "祖级列表")
     private String ancestors;
 
     /** 子部门 */
+    @ApiModelProperty(value = "子部门")
     private List<?> children = new ArrayList<>();
 
     public String getParentName()

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java → hzgzpt-common/src/main/java/com/miaxis/common/core/domain/TreeSelect.java

@@ -1,29 +1,38 @@
-package com.ruoyi.common.core.domain;
+package com.miaxis.common.core.domain;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.miaxis.common.core.domain.entity.SysDept;
+import com.miaxis.common.core.domain.entity.SysMenu;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
 import java.util.stream.Collectors;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.core.domain.entity.SysMenu;
 
 /**
  * Treeselect树结构实体类
- * 
- * @author ruoyi
+ *
+ * @author miaxis
  */
+@ApiModel(value = "TreeSelect", description = "Treeselect树结构实体类")
+@Data
 public class TreeSelect implements Serializable
 {
     private static final long serialVersionUID = 1L;
 
     /** 节点ID */
+    @ApiModelProperty(value = "节点ID")
     private Long id;
 
     /** 节点名称 */
+    @ApiModelProperty(value = "节点名称")
     private String label;
 
     /** 子节点 */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @ApiModelProperty(value = "子节点")
     private List<TreeSelect> children;
 
     public TreeSelect()

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java → hzgzpt-common/src/main/java/com/miaxis/common/core/domain/entity/SysDept.java

@@ -1,57 +1,75 @@
-package com.ruoyi.common.core.domain.entity;
+package com.miaxis.common.core.domain.entity;
+
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
-import java.util.ArrayList;
-import java.util.List;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.domain.BaseEntity;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 部门表 sys_dept
- * 
- * @author ruoyi
+ *
+ * @author miaxis
  */
+@ApiModel(value = "SysDept", description = "部门表")
+@Data
 public class SysDept extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 部门ID */
+    @ApiModelProperty(value = "部门ID")
     private Long deptId;
 
     /** 父部门ID */
+    @ApiModelProperty(value = "父部门ID")
     private Long parentId;
 
     /** 祖级列表 */
+    @ApiModelProperty(value = "祖级列表")
     private String ancestors;
 
     /** 部门名称 */
+    @ApiModelProperty(value = "部门名称")
     private String deptName;
 
     /** 显示顺序 */
+    @ApiModelProperty(value = "显示顺序")
     private String orderNum;
 
     /** 负责人 */
+    @ApiModelProperty(value = "负责人")
     private String leader;
 
     /** 联系电话 */
+    @ApiModelProperty(value = "联系电话")
     private String phone;
 
     /** 邮箱 */
+    @ApiModelProperty(value = "邮箱")
     private String email;
 
     /** 部门状态:0正常,1停用 */
+    @ApiModelProperty(value = "部门状态:0正常,1停用")
     private String status;
 
     /** 删除标志（0代表存在 2代表删除） */
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
     /** 父部门名称 */
+    @ApiModelProperty(value = "父部门名称")
     private String parentName;
-    
+
     /** 子部门 */
+    @ApiModelProperty(value = "子部门")
     private List<SysDept> children = new ArrayList<SysDept>();
 
     public Long getDeptId()

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java → hzgzpt-common/src/main/java/com/miaxis/common/core/domain/entity/SysDictData.java

@@ -1,55 +1,70 @@
-package com.ruoyi.common.core.domain.entity;
+package com.miaxis.common.core.domain.entity;
+
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.annotation.Excel.ColumnType;
+import com.miaxis.common.constant.UserConstants;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 字典数据表 sys_dict_data
- * 
- * @author ruoyi
+ *
+ * @author miaxis
  */
+@ApiModel(value = "SysDictData", description = "字典数据表")
+@Data
 public class SysDictData extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 字典编码 */
     @Excel(name = "字典编码", cellType = ColumnType.NUMERIC)
+    @ApiModelProperty(value = "字典编码")
     private Long dictCode;
 
     /** 字典排序 */
     @Excel(name = "字典排序", cellType = ColumnType.NUMERIC)
+    @ApiModelProperty(value = "字典排序")
     private Long dictSort;
 
     /** 字典标签 */
     @Excel(name = "字典标签")
+    @ApiModelProperty(value = "字典标签")
     private String dictLabel;
 
     /** 字典键值 */
     @Excel(name = "字典键值")
+    @ApiModelProperty(value = "字典键值")
     private String dictValue;
 
     /** 字典类型 */
     @Excel(name = "字典类型")
+    @ApiModelProperty(value = "字典类型")
     private String dictType;
 
     /** 样式属性（其他样式扩展） */
+    @ApiModelProperty(value = "样式属性（其他样式扩展）")
     private String cssClass;
 
     /** 表格字典样式 */
+    @ApiModelProperty(value = "表格字典样式")
     private String listClass;
 
     /** 是否默认（Y是 N否） */
     @Excel(name = "是否默认", readConverterExp = "Y=是,N=否")
+    @ApiModelProperty(value = "是否默认（Y是 N否）")
     private String isDefault;
 
     /** 状态（0正常 1停用） */
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+    @ApiModelProperty(value = "状态（0正常 1停用）")
     private String status;
 
     public Long getDictCode()
@@ -153,7 +168,7 @@ public class SysDictData extends BaseEntity
     {
         this.status = status;
     }
-    
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java → hzgzpt-common/src/main/java/com/miaxis/common/core/domain/entity/SysDictType.java

@@ -1,36 +1,46 @@
-package com.ruoyi.common.core.domain.entity;
+package com.miaxis.common.core.domain.entity;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.annotation.Excel.ColumnType;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.domain.BaseEntity;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 
 /**
  * 字典类型表 sys_dict_type
- * 
- * @author ruoyi
+ *
+ * @author miaxis
  */
+@ApiModel(value = "SysDictType", description = "字典类型表")
+@Data
 public class SysDictType extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 字典主键 */
     @Excel(name = "字典主键", cellType = ColumnType.NUMERIC)
+    @ApiModelProperty(value = "字典主键")
     private Long dictId;
 
     /** 字典名称 */
+    @ApiModelProperty(value = "字典名称")
     @Excel(name = "字典名称")
     private String dictName;
 
     /** 字典类型 */
     @Excel(name = "字典类型")
+    @ApiModelProperty(value = "字典类型")
     private String dictType;
 
     /** 状态（0正常 1停用） */
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+    @ApiModelProperty(value = "状态（0正常 1停用）")
     private String status;
 
     public Long getDictId()
@@ -76,7 +86,7 @@ public class SysDictType extends BaseEntity
     {
         this.status = status;
     }
-    
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java → hzgzpt-common/src/main/java/com/miaxis/common/core/domain/entity/SysMenu.java

@@ -1,65 +1,86 @@
-package com.ruoyi.common.core.domain.entity;
+package com.miaxis.common.core.domain.entity;
 
-import java.util.ArrayList;
-import java.util.List;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.domain.BaseEntity;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 菜单权限表 sys_menu
- * 
- * @author ruoyi
+ *
+ * @author miaxis
  */
+@ApiModel(value = "SysMenu", description = "菜单权限表")
+@Data
 public class SysMenu extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 菜单ID */
+    @ApiModelProperty(value = "菜单ID")
     private Long menuId;
 
     /** 菜单名称 */
+    @ApiModelProperty(value = "菜单名称")
     private String menuName;
 
     /** 父菜单名称 */
+    @ApiModelProperty(value = "父菜单名称")
     private String parentName;
 
     /** 父菜单ID */
+    @ApiModelProperty(value = "父菜单ID")
     private Long parentId;
 
     /** 显示顺序 */
+    @ApiModelProperty(value = "显示顺序")
     private String orderNum;
 
     /** 路由地址 */
+    @ApiModelProperty(value = "路由地址")
     private String path;
 
     /** 组件路径 */
+    @ApiModelProperty(value = "组件路径")
     private String component;
 
     /** 是否为外链（0是 1否） */
+    @ApiModelProperty(value = "是否为外链（0是 1否）")
     private String isFrame;
 
     /** 是否缓存（0缓存 1不缓存） */
+    @ApiModelProperty(value = "是否缓存（0缓存 1不缓存）")
     private String isCache;
 
     /** 类型（M目录 C菜单 F按钮） */
+    @ApiModelProperty(value = "类型（M目录 C菜单 F按钮）")
     private String menuType;
 
     /** 显示状态（0显示 1隐藏） */
+    @ApiModelProperty(value = "显示状态（0显示 1隐藏）")
     private String visible;
-    
+
     /** 菜单状态（0显示 1隐藏） */
+    @ApiModelProperty(value = "菜单状态（0显示 1隐藏）")
     private String status;
 
     /** 权限字符串 */
+    @ApiModelProperty(value = "权限字符串")
     private String perms;
 
     /** 菜单图标 */
+    @ApiModelProperty(value = "菜单图标")
     private String icon;
 
     /** 子菜单 */
+    @ApiModelProperty(value = "子菜单")
     private List<SysMenu> children = new ArrayList<SysMenu>();
 
     public Long getMenuId()
@@ -218,7 +239,7 @@ public class SysMenu extends BaseEntity
     {
         this.children = children;
     }
-    
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java → hzgzpt-common/src/main/java/com/miaxis/common/core/domain/entity/SysRole.java

@@ -1,62 +1,80 @@
-package com.ruoyi.common.core.domain.entity;
+package com.miaxis.common.core.domain.entity;
+
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.annotation.Excel.ColumnType;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 角色表 sys_role
- * 
- * @author ruoyi
+ *
+ * @author miaxis
  */
+@ApiModel(value = "SysRole", description = "角色表")
+@Data
 public class SysRole extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 角色ID */
     @Excel(name = "角色序号", cellType = ColumnType.NUMERIC)
+    @ApiModelProperty(value = "角色ID")
     private Long roleId;
 
     /** 角色名称 */
     @Excel(name = "角色名称")
+    @ApiModelProperty(value = "角色名称")
     private String roleName;
 
     /** 角色权限 */
     @Excel(name = "角色权限")
+    @ApiModelProperty(value = "角色权限")
     private String roleKey;
 
     /** 角色排序 */
     @Excel(name = "角色排序")
+    @ApiModelProperty(value = "角色排序")
     private String roleSort;
 
     /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限） */
     @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限")
+    @ApiModelProperty(value = "数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限）")
     private String dataScope;
 
     /** 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */
+    @ApiModelProperty(value = "菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）")
     private boolean menuCheckStrictly;
 
     /** 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ） */
+    @ApiModelProperty(value = "部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）")
     private boolean deptCheckStrictly;
 
     /** 角色状态（0正常 1停用） */
     @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用")
+    @ApiModelProperty(value = "角色状态（0正常 1停用）")
     private String status;
 
     /** 删除标志（0代表存在 2代表删除） */
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
     /** 用户是否存在此角色标识 默认不存在 */
+    @ApiModelProperty(value = "用户是否存在此角色标识 默认不存在")
     private boolean flag = false;
 
     /** 菜单组 */
+    @ApiModelProperty(value = "菜单组")
     private Long[] menuIds;
 
     /** 部门组（数据权限） */
+    @ApiModelProperty(value = "部门组（数据权限）")
     private Long[] deptIds;
 
     public SysRole()
@@ -203,7 +221,7 @@ public class SysRole extends BaseEntity
     {
         this.deptIds = deptIds;
     }
-    
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java → hzgzpt-common/src/main/java/com/miaxis/common/core/domain/entity/SysUser.java

@@ -1,79 +1,99 @@
-package com.ruoyi.common.core.domain.entity;
+package com.miaxis.common.core.domain.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.annotation.Excel.ColumnType;
+import com.miaxis.common.annotation.Excel.Type;
+import com.miaxis.common.annotation.Excels;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
-import java.util.Date;
-import java.util.List;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-import com.ruoyi.common.annotation.Excel.Type;
-import com.ruoyi.common.annotation.Excels;
-import com.ruoyi.common.core.domain.BaseEntity;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 用户对象 sys_user
- * 
- * @author ruoyi
+ *
+ * @author miaxis
  */
+@ApiModel(value = "SysUser", description = "用户对象")
+@Data
 public class SysUser extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 用户ID */
     @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
+    @ApiModelProperty(value = "用户序号")
     private Long userId;
 
     /** 部门ID */
     @Excel(name = "部门编号", type = Type.IMPORT)
+    @ApiModelProperty(value = "部门编号")
     private Long deptId;
 
     /** 用户账号 */
     @Excel(name = "登录名称")
+    @ApiModelProperty(value = "登录名称")
     private String userName;
 
     /** 用户昵称 */
     @Excel(name = "用户名称")
+    @ApiModelProperty(value = "用户名称")
     private String nickName;
 
     /** 用户邮箱 */
     @Excel(name = "用户邮箱")
+    @ApiModelProperty(value = "用户邮箱")
     private String email;
 
     /** 手机号码 */
     @Excel(name = "手机号码")
+    @ApiModelProperty(value = "手机号码")
     private String phonenumber;
 
     /** 用户性别 */
     @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
+    @ApiModelProperty(value = "用户性别")
     private String sex;
 
     /** 用户头像 */
+    @ApiModelProperty(value = "用户头像")
     private String avatar;
 
     /** 密码 */
+    @ApiModelProperty(value = "密码")
     private String password;
 
     /** 盐加密 */
+    @ApiModelProperty(value = "盐加密")
     private String salt;
 
     /** 帐号状态（0正常 1停用） */
     @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
+    @ApiModelProperty(value = "帐号状态（0正常 1停用） ")
     private String status;
 
     /** 删除标志（0代表存在 2代表删除） */
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
     /** 最后登录IP */
     @Excel(name = "最后登录IP", type = Type.EXPORT)
+    @ApiModelProperty(value = "最后登录IP")
     private String loginIp;
 
     /** 最后登录时间 */
     @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
+    @ApiModelProperty(value = "最后登录时间")
     private Date loginDate;
 
     /** 部门对象 */
@@ -81,15 +101,19 @@ public class SysUser extends BaseEntity
         @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
         @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
     })
+    @ApiModelProperty(value = "部门对象")
     private SysDept dept;
 
     /** 角色对象 */
+    @ApiModelProperty(value = "角色对象")
     private List<SysRole> roles;
 
     /** 角色组 */
+    @ApiModelProperty(value = "角色组")
     private Long[] roleIds;
 
     /** 岗位组 */
+    @ApiModelProperty(value = "岗位组")
     private Long[] postIds;
 
     public SysUser()

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java → hzgzpt-common/src/main/java/com/miaxis/common/core/domain/model/LoginBody.java

@@ -1,30 +1,40 @@
-package com.ruoyi.common.core.domain.model;
+package com.miaxis.common.core.domain.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * 用户登录对象
- * 
- * @author ruoyi
+ *
+ * @author miaxis
  */
+@ApiModel(value = "LoginBody", description = "用户登录对象")
+@Data
 public class LoginBody
 {
     /**
      * 用户名
      */
+    @ApiModelProperty(value = "用户名")
     private String username;
 
     /**
      * 用户密码
      */
+    @ApiModelProperty(value = "用户密码")
     private String password;
 
     /**
      * 验证码
      */
+    @ApiModelProperty(value = "验证码")
     private String code;
 
     /**
      * 唯一标识
      */
+    @ApiModelProperty(value = "唯一标识")
     private String uuid = "";
 
     public String getUsername()

hzgzpt-common/src/main/java/com/miaxis/common/core/domain/model/LoginBodyNoCode.java

@@ -0,0 +1,29 @@
+package com.miaxis.common.core.domain.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 用户登录对象（免验证码）
+ *
+ * @author miaxis
+ */
+@ApiModel(value = "LoginBodyNoCode", description = "用户登录对象（免验证码）")
+@Data
+public class LoginBodyNoCode
+{
+    /**
+     * 用户名
+     */
+    @ApiModelProperty(value = "用户名")
+    private String username;
+
+    /**
+     * 用户密码
+     */
+    @ApiModelProperty(value = "用户密码")
+    private String password;
+
+
+}

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java → hzgzpt-common/src/main/java/com/miaxis/common/core/domain/model/LoginUser.java

@@ -1,17 +1,23 @@
-package com.ruoyi.common.core.domain.model;
+package com.miaxis.common.core.domain.model;
 
-import java.util.Collection;
-import java.util.Set;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.miaxis.common.core.domain.entity.SysUser;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.ruoyi.common.core.domain.entity.SysUser;
+
+import java.util.Collection;
+import java.util.Set;
 
 /**
  * 登录用户身份权限
- * 
- * @author ruoyi
+ *
+ * @author miaxis
  */
+@ApiModel(value = "LoginUser", description = "登录用户身份权限")
+@Data
 public class LoginUser implements UserDetails
 {
     private static final long serialVersionUID = 1L;
@@ -19,46 +25,55 @@ public class LoginUser implements UserDetails
     /**
      * 用户唯一标识
      */
+    @ApiModelProperty(value = "用户唯一标识")
     private String token;
 
     /**
      * 登录时间
      */
+    @ApiModelProperty(value = "登录时间")
     private Long loginTime;
 
     /**
      * 过期时间
      */
+    @ApiModelProperty(value = "过期时间")
     private Long expireTime;
 
     /**
      * 登录IP地址
      */
+    @ApiModelProperty(value = "登录IP地址")
     private String ipaddr;
 
     /**
      * 登录地点
      */
+    @ApiModelProperty(value = "登录地点")
     private String loginLocation;
 
     /**
      * 浏览器类型
      */
+    @ApiModelProperty(value = "浏览器类型")
     private String browser;
 
     /**
      * 操作系统
      */
+    @ApiModelProperty(value = "操作系统")
     private String os;
 
     /**
      * 权限列表
      */
+    @ApiModelProperty(value = "权限列表")
     private Set<String> permissions;
 
     /**
      * 用户信息
      */
+    @ApiModelProperty(value = "用户信息")
     private SysUser user;
 
     public String getToken()
@@ -106,7 +121,7 @@ public class LoginUser implements UserDetails
 
     /**
      * 指定用户是否解锁,锁定的用户无法进行身份验证
-     * 
+     *
      * @return
      */
     @JsonIgnore
@@ -118,7 +133,7 @@ public class LoginUser implements UserDetails
 
     /**
      * 指示是否已过期的用户的凭据(密码),过期的凭据防止认证
-     * 
+     *
      * @return
      */
     @JsonIgnore
@@ -130,7 +145,7 @@ public class LoginUser implements UserDetails
 
     /**
      * 是否可用 ,禁用的用户不能身份验证
-     * 
+     *
      * @return
      */
     @JsonIgnore

ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java → hzgzpt-common/src/main/java/com/miaxis/common/core/page/PageBean.java

@@ -1,24 +1,34 @@
-package com.ruoyi.common.core.page;
+package com.miaxis.common.core.page;
 
-import com.ruoyi.common.utils.StringUtils;
+import com.miaxis.common.utils.StringUtils;
+import com.miaxis.common.utils.StringUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
- * 分页数据
- * 
- * @author ruoyi
+ * 分页对象实体
+ *
+ * @author miaxis
  */
-public class PageDomain
+@ApiModel(value = "SysUser", description = "用户对象")
+@Data
+public class PageBean
 {
     /** 当前记录起始索引 */
+    @ApiModelProperty(value = "当前记录起始索引")
     private Integer pageNum;
 
     /** 每页显示记录数 */
+    @ApiModelProperty(value = "每页显示记录数")
     private Integer pageSize;
 
     /** 排序列 */
+    @ApiModelProperty(value = "排序列")
     private String orderByColumn;
 
     /** 排序的方向desc或者asc */
+    @ApiModelProperty(value = "排序的方向desc或者asc")
     private String isAsc = "asc";
 
     public String getOrderBy()

hzgzpt-common/src/main/java/com/miaxis/common/core/page/PageBuilder.java

@@ -0,0 +1,59 @@
+package com.miaxis.common.core.page;
+
+import com.miaxis.common.utils.ServletUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 表格数据处理 通过request请求 拦截获取PAGE_NUM，PAGE_SIZE，ORDER_BY_COLUMN，IS_ASC
+ *
+ * PageBuilder 表明是建造者模式
+ * @author JuniorRay
+ */
+@ApiModel(value = "PageBuilder", description = "表格数据处理")
+@Data
+public class PageBuilder
+{
+    /**
+     * 当前记录起始索引
+     */
+    @ApiModelProperty(value = "当前记录起始索引")
+    public static final String PAGE_NUM = "pageNum";
+
+    /**
+     * 每页显示记录数
+     */
+    @ApiModelProperty(value = "每页显示记录数")
+    public static final String PAGE_SIZE = "pageSize";
+
+    /**
+     * 排序列
+     */
+    @ApiModelProperty(value = "排序列")
+    public static final String ORDER_BY_COLUMN = "orderByColumn";
+
+    /**
+     * 排序的方向 "desc" 或者 "asc".
+     */
+    @ApiModelProperty(value = "排序的方向 \"desc\" 或者 \"asc\" ")
+    public static final String IS_ASC = "isAsc";
+
+    /**
+     * 封装分页对象  抓取请求行中PAGE_NUM ，PAGE_SIZE，ORDER_BY_COLUMN，IS_ASC
+     */
+    private static PageBean getPageDomain()
+    {
+        PageBean pageBean = new PageBean();
+        pageBean.setPageNum(ServletUtils.getParameterToInt(PAGE_NUM));
+        pageBean.setPageSize(ServletUtils.getParameterToInt(PAGE_SIZE));
+        pageBean.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN));
+        pageBean.setIsAsc(ServletUtils.getParameter(IS_ASC));
+        return pageBean;
+    }
+
+    public static PageBean buildPageRequest()
+    {
+        return getPageDomain();
+    }
+}

ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java → hzgzpt-common/src/main/java/com/miaxis/common/core/page/ResponsePageInfo.java

@@ -1,43 +1,52 @@
-package com.ruoyi.common.core.page;
+package com.miaxis.common.core.page;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.List;
 
 /**
- * 表格分页数据对象
- * 
- * @author ruoyi
+ * 表格分页数据对象  加入泛型
+ *
+ * @author JuniorRay
+ * @date 2020-11-12
  */
-public class TableDataInfo implements Serializable
+@ApiModel(description = "表格分页数据对象ResponsePageInfo")
+public class ResponsePageInfo<T> implements Serializable
 {
     private static final long serialVersionUID = 1L;
 
     /** 总记录数 */
+    @ApiModelProperty(value = "总记录数")
     private long total;
 
     /** 列表数据 */
-    private List<?> rows;
+    @ApiModelProperty(value = "列表数据")
+    private List<T> rows;
 
     /** 消息状态码 */
+    @ApiModelProperty(value = "消息状态码")
     private int code;
 
     /** 消息内容 */
+    @ApiModelProperty(value = "消息内容")
     private String msg;
 
     /**
      * 表格数据对象
      */
-    public TableDataInfo()
+    public ResponsePageInfo()
     {
     }
 
     /**
      * 分页
-     * 
+     *
      * @param list 列表数据
      * @param total 总记录数
      */
-    public TableDataInfo(List<?> list, int total)
+    public ResponsePageInfo(List<T> list, int total)
     {
         this.rows = list;
         this.total = total;
@@ -53,12 +62,12 @@ public class TableDataInfo implements Serializable
         this.total = total;
     }
 
-    public List<?> getRows()
+    public List<T> getRows()
     {
         return rows;
     }
 
-    public void setRows(List<?> rows)
+    public void setRows(List<T> rows)
     {
         this.rows = rows;
     }

ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java → hzgzpt-common/src/main/java/com/miaxis/common/core/redis/RedisCache.java

@@ -1,20 +1,21 @@
-package com.ruoyi.common.core.redis;
+package com.miaxis.common.core.redis;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Component;
 
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
 /**
  * spring redis 工具类
  *
- * @author ruoyi
+ * @author miaxis
  **/
 @SuppressWarnings(value = { "unchecked", "rawtypes" })
 @Component

ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java → hzgzpt-common/src/main/java/com/miaxis/common/core/text/CharsetKit.java

@@ -1,13 +1,14 @@
-package com.ruoyi.common.core.text;
+package com.miaxis.common.core.text;
+
+import com.miaxis.common.utils.StringUtils;
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import com.ruoyi.common.utils.StringUtils;
 
 /**
  * 字符集工具类
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class CharsetKit
 {
@@ -66,7 +67,7 @@ public class CharsetKit
 
         if (null == destCharset)
         {
-            destCharset = StandardCharsets.UTF_8;
+            srcCharset = StandardCharsets.UTF_8;
         }
 
         if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset))

ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java → hzgzpt-common/src/main/java/com/miaxis/common/core/text/Convert.java

@@ -1,4 +1,6 @@
-package com.ruoyi.common.core.text;
+package com.miaxis.common.core.text;
+
+import com.miaxis.common.utils.StringUtils;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -6,12 +8,11 @@ import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.text.NumberFormat;
 import java.util.Set;
-import com.ruoyi.common.utils.StringUtils;
 
 /**
  * 类型转换器
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class Convert
 {

ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java → hzgzpt-common/src/main/java/com/miaxis/common/core/text/StrFormatter.java

@@ -1,11 +1,11 @@
-package com.ruoyi.common.core.text;
+package com.miaxis.common.core.text;
 
-import com.ruoyi.common.utils.StringUtils;
+import com.miaxis.common.utils.StringUtils;
 
 /**
  * 字符串格式化
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class StrFormatter
 {

ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java → hzgzpt-common/src/main/java/com/miaxis/common/enums/BusinessStatusEnum.java

@@ -1,12 +1,12 @@
-package com.ruoyi.common.enums;
+package com.miaxis.common.enums;
 
 /**
  * 操作状态
- * 
- * @author ruoyi
+ *
+ * @author miaxis
  *
  */
-public enum BusinessStatus
+public enum BusinessStatusEnum
 {
     /**
      * 成功

ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java → hzgzpt-common/src/main/java/com/miaxis/common/enums/BusinessTypeEnum.java

@@ -1,11 +1,11 @@
-package com.ruoyi.common.enums;
+package com.miaxis.common.enums;
 
 /**
  * 业务操作类型
- * 
- * @author ruoyi
+ *
+ * @author miaxis
  */
-public enum BusinessType
+public enum BusinessTypeEnum
 {
     /**
      * 其它
@@ -51,7 +51,7 @@ public enum BusinessType
      * 生成代码
      */
     GENCODE,
-    
+
     /**
      * 清空数据
      */

ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java → hzgzpt-common/src/main/java/com/miaxis/common/enums/DataSourceTypeEnum.java

@@ -1,11 +1,11 @@
-package com.ruoyi.common.enums;
+package com.miaxis.common.enums;
 
 /**
  * 数据源
- * 
- * @author ruoyi
+ *
+ * @author miaxis
  */
-public enum DataSourceType
+public enum DataSourceTypeEnum
 {
     /**
      * 主库

ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java → hzgzpt-common/src/main/java/com/miaxis/common/enums/HttpMethodEnum.java

@@ -1,30 +1,31 @@
-package com.ruoyi.common.enums;
+package com.miaxis.common.enums;
+
+import org.springframework.lang.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;
-import org.springframework.lang.Nullable;
 
 /**
  * 请求方式
  *
- * @author ruoyi
+ * @author miaxis
  */
-public enum HttpMethod
+public enum HttpMethodEnum
 {
     GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS, TRACE;
 
-    private static final Map<String, HttpMethod> mappings = new HashMap<>(16);
+    private static final Map<String, HttpMethodEnum> mappings = new HashMap<>(16);
 
     static
     {
-        for (HttpMethod httpMethod : values())
+        for (HttpMethodEnum httpMethodEnum : values())
         {
-            mappings.put(httpMethod.name(), httpMethod);
+            mappings.put(httpMethodEnum.name(), httpMethodEnum);
         }
     }
 
     @Nullable
-    public static HttpMethod resolve(@Nullable String method)
+    public static HttpMethodEnum resolve(@Nullable String method)
     {
         return (method != null ? mappings.get(method) : null);
     }

ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java → hzgzpt-common/src/main/java/com/miaxis/common/enums/OperatorTypeEnum.java

@@ -1,11 +1,11 @@
-package com.ruoyi.common.enums;
+package com.miaxis.common.enums;
 
 /**
  * 操作人类别
- * 
- * @author ruoyi
+ *
+ * @author miaxis
  */
-public enum OperatorType
+public enum OperatorTypeEnum
 {
     /**
      * 其它

ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java → hzgzpt-common/src/main/java/com/miaxis/common/enums/UserStatusEnum.java

@@ -1,18 +1,18 @@
-package com.ruoyi.common.enums;
+package com.miaxis.common.enums;
 
 /**
  * 用户状态
- * 
- * @author ruoyi
+ *
+ * @author miaxis
  */
-public enum UserStatus
+public enum UserStatusEnum
 {
     OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除");
 
     private final String code;
     private final String info;
 
-    UserStatus(String code, String info)
+    UserStatusEnum(String code, String info)
     {
         this.code = code;
         this.info = info;

ruoyi-common/src/main/java/com/ruoyi/common/exception/BaseException.java → hzgzpt-common/src/main/java/com/miaxis/common/exception/BaseException.java

@@ -1,12 +1,12 @@
-package com.ruoyi.common.exception;
+package com.miaxis.common.exception;
 
-import com.ruoyi.common.utils.MessageUtils;
-import com.ruoyi.common.utils.StringUtils;
+import com.miaxis.common.utils.MessageUtils;
+import com.miaxis.common.utils.StringUtils;
 
 /**
  * 基础异常
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class BaseException extends RuntimeException
 {

ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java → hzgzpt-common/src/main/java/com/miaxis/common/exception/CustomException.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.exception;
+package com.miaxis.common.exception;
 
 /**
  * 自定义异常
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class CustomException extends RuntimeException
 {

ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java → hzgzpt-common/src/main/java/com/miaxis/common/exception/DemoModeException.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.exception;
+package com.miaxis.common.exception;
 
 /**
  * 演示模式异常
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class DemoModeException extends RuntimeException
 {

ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java → hzgzpt-common/src/main/java/com/miaxis/common/exception/UtilException.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.exception;
+package com.miaxis.common.exception;
 
 /**
  * 工具类异常
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class UtilException extends RuntimeException
 {

ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java → hzgzpt-common/src/main/java/com/miaxis/common/exception/file/FileException.java

@@ -1,11 +1,11 @@
-package com.ruoyi.common.exception.file;
+package com.miaxis.common.exception.file;
 
-import com.ruoyi.common.exception.BaseException;
+import com.miaxis.common.exception.BaseException;
 
 /**
  * 文件信息异常类
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class FileException extends BaseException
 {

ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java → hzgzpt-common/src/main/java/com/miaxis/common/exception/file/FileNameLengthLimitExceededException.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.exception.file;
+package com.miaxis.common.exception.file;
 
 /**
  * 文件名称超长限制异常类
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class FileNameLengthLimitExceededException extends FileException
 {

ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java → hzgzpt-common/src/main/java/com/miaxis/common/exception/file/FileSizeLimitExceededException.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.exception.file;
+package com.miaxis.common.exception.file;
 
 /**
  * 文件名大小限制异常类
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class FileSizeLimitExceededException extends FileException
 {

ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java → hzgzpt-common/src/main/java/com/miaxis/common/exception/file/InvalidExtensionException.java

@@ -1,12 +1,13 @@
-package com.ruoyi.common.exception.file;
+package com.miaxis.common.exception.file;
 
-import java.util.Arrays;
 import org.apache.commons.fileupload.FileUploadException;
 
+import java.util.Arrays;
+
 /**
  * 文件上传 误异常类
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class InvalidExtensionException extends FileUploadException
 {

ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java → hzgzpt-common/src/main/java/com/miaxis/common/exception/job/TaskException.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.exception.job;
+package com.miaxis.common.exception.job;
 
 /**
  * 计划策略异常
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class TaskException extends Exception
 {

ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java → hzgzpt-common/src/main/java/com/miaxis/common/exception/user/CaptchaException.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.exception.user;
+package com.miaxis.common.exception.user;
 
 /**
  * 验证码错误异常类
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class CaptchaException extends UserException
 {

ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java → hzgzpt-common/src/main/java/com/miaxis/common/exception/user/CaptchaExpireException.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.exception.user;
+package com.miaxis.common.exception.user;
 
 /**
  * 验证码失效异常类
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class CaptchaExpireException extends UserException
 {

ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java → hzgzpt-common/src/main/java/com/miaxis/common/exception/user/UserException.java

@@ -1,11 +1,11 @@
-package com.ruoyi.common.exception.user;
+package com.miaxis.common.exception.user;
 
-import com.ruoyi.common.exception.BaseException;
+import com.miaxis.common.exception.BaseException;
 
 /**
  * 用户信息异常类
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class UserException extends BaseException
 {

ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java → hzgzpt-common/src/main/java/com/miaxis/common/exception/user/UserPasswordNotMatchException.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.exception.user;
+package com.miaxis.common.exception.user;
 
 /**
  * 用户密码不正确或不符合规范异常类
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class UserPasswordNotMatchException extends UserException
 {

ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java → hzgzpt-common/src/main/java/com/miaxis/common/filter/RepeatableFilter.java

@@ -1,20 +1,16 @@
-package com.ruoyi.common.filter;
+package com.miaxis.common.filter;
 
-import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import com.miaxis.common.utils.StringUtils;
 import org.springframework.http.MediaType;
-import com.ruoyi.common.utils.StringUtils;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 
 /**
  * Repeatable 过滤器
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class RepeatableFilter implements Filter
 {

ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java → hzgzpt-common/src/main/java/com/miaxis/common/filter/RepeatedlyRequestWrapper.java

@@ -1,20 +1,21 @@
-package com.ruoyi.common.filter;
+package com.miaxis.common.filter;
+
+import com.miaxis.common.utils.http.HttpHelper;
 
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
 import javax.servlet.ReadListener;
 import javax.servlet.ServletInputStream;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
-import com.ruoyi.common.utils.http.HttpHelper;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
 
 /**
  * 构建可重复读取inputStream的request
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper
 {

ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java → hzgzpt-common/src/main/java/com/miaxis/common/filter/XssFilter.java

@@ -1,24 +1,20 @@
-package com.ruoyi.common.filter;
+package com.miaxis.common.filter;
 
+import com.miaxis.common.utils.StringUtils;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import com.ruoyi.common.utils.StringUtils;
 
 /**
  * 防止XSS攻击的过滤器
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class XssFilter implements Filter
 {

ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java → hzgzpt-common/src/main/java/com/miaxis/common/filter/XssHttpServletRequestWrapper.java

@@ -1,21 +1,22 @@
-package com.ruoyi.common.filter;
+package com.miaxis.common.filter;
+
+import com.miaxis.common.utils.StringUtils;
+import com.miaxis.common.utils.html.EscapeUtil;
+import org.apache.commons.io.IOUtils;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import javax.servlet.ReadListener;
 import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
-import org.apache.commons.io.IOUtils;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.html.EscapeUtil;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
 
 /**
  * XSS过滤处理
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
 {

ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java → hzgzpt-common/src/main/java/com/miaxis/common/utils/Arith.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils;
+package com.miaxis.common.utils;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -6,7 +6,7 @@ import java.math.RoundingMode;
 /**
  * 精确的浮点数运算
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class Arith
 {

ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java → hzgzpt-common/src/main/java/com/miaxis/common/utils/DateUtils.java

@@ -1,15 +1,16 @@
-package com.ruoyi.common.utils;
+package com.miaxis.common.utils;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
 
 import java.lang.management.ManagementFactory;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import org.apache.commons.lang3.time.DateFormatUtils;
 
 /**
  * 时间工具类
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class DateUtils extends org.apache.commons.lang3.time.DateUtils
 {

ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java → hzgzpt-common/src/main/java/com/miaxis/common/utils/DictUtils.java

@@ -1,16 +1,17 @@
-package com.ruoyi.common.utils;
+package com.miaxis.common.utils;
+
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.core.domain.entity.SysDictData;
+import com.miaxis.common.core.redis.RedisCache;
+import com.miaxis.common.utils.spring.SpringUtils;
 
 import java.util.Collection;
 import java.util.List;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.entity.SysDictData;
-import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.utils.spring.SpringUtils;
 
 /**
  * 字典工具类
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class DictUtils
 {

ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java → hzgzpt-common/src/main/java/com/miaxis/common/utils/ExceptionUtil.java

@@ -1,13 +1,14 @@
-package com.ruoyi.common.utils;
+package com.miaxis.common.utils;
+
+import org.apache.commons.lang3.exception.ExceptionUtils;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import org.apache.commons.lang3.exception.ExceptionUtils;
 
 /**
  * 错误信息处理类。
  *
- * @author ruoyi
+ * @author miaxis
  */
 public class ExceptionUtil
 {

ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java → hzgzpt-common/src/main/java/com/miaxis/common/utils/LogUtils.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.utils;
+package com.miaxis.common.utils;
 
 /**
  * 处理并记录日志文件
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class LogUtils
 {

ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java → hzgzpt-common/src/main/java/com/miaxis/common/utils/MessageUtils.java

@@ -1,13 +1,13 @@
-package com.ruoyi.common.utils;
+package com.miaxis.common.utils;
 
+import com.miaxis.common.utils.spring.SpringUtils;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
-import com.ruoyi.common.utils.spring.SpringUtils;
 
 /**
  * 获取i18n资源文件
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class MessageUtils
 {

ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java → hzgzpt-common/src/main/java/com/miaxis/common/utils/SecurityUtils.java

@@ -1,16 +1,16 @@
-package com.ruoyi.common.utils;
+package com.miaxis.common.utils;
 
+import com.miaxis.common.core.domain.ResponseEnum;
+import com.miaxis.common.core.domain.model.LoginUser;
+import com.miaxis.common.exception.CustomException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.exception.CustomException;
 
 /**
  * 安全服务工具类
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class SecurityUtils
 {
@@ -25,7 +25,7 @@ public class SecurityUtils
         }
         catch (Exception e)
         {
-            throw new CustomException("获取用户账户异常", HttpStatus.UNAUTHORIZED);
+            throw new CustomException("获取用户账户异常", ResponseEnum.UNAUTHORIZED.getCode());
         }
     }
 
@@ -40,7 +40,7 @@ public class SecurityUtils
         }
         catch (Exception e)
         {
-            throw new CustomException("获取用户信息异常", HttpStatus.UNAUTHORIZED);
+            throw new CustomException("获取用户信息异常", ResponseEnum.UNAUTHORIZED.getCode());
         }
     }
 

ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java → hzgzpt-common/src/main/java/com/miaxis/common/utils/ServletUtils.java

@@ -1,18 +1,19 @@
-package com.ruoyi.common.utils;
+package com.miaxis.common.utils;
 
-import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import com.miaxis.common.core.text.Convert;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import com.ruoyi.common.core.text.Convert;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
 
 /**
  * 客户端工具类
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class ServletUtils
 {

ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java → hzgzpt-common/src/main/java/com/miaxis/common/utils/StringUtils.java

@@ -1,17 +1,13 @@
-package com.ruoyi.common.utils;
+package com.miaxis.common.utils;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import com.ruoyi.common.core.text.StrFormatter;
+import com.miaxis.common.core.text.StrFormatter;
+
+import java.util.*;
 
 /**
  * 字符串工具类
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class StringUtils extends org.apache.commons.lang3.StringUtils
 {

ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java → hzgzpt-common/src/main/java/com/miaxis/common/utils/Threads.java

@@ -1,17 +1,14 @@
-package com.ruoyi.common.utils;
+package com.miaxis.common.utils;
 
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.concurrent.*;
+
 /**
  * 线程相关工具类.
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class Threads
 {

ruoyi-common/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java → hzgzpt-common/src/main/java/com/miaxis/common/utils/VerifyCodeUtils.java

@@ -1,10 +1,7 @@
-package com.ruoyi.common.utils;
+package com.miaxis.common.utils;
 
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
+import javax.imageio.ImageIO;
+import java.awt.*;
 import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
@@ -12,12 +9,11 @@ import java.io.OutputStream;
 import java.security.SecureRandom;
 import java.util.Arrays;
 import java.util.Random;
-import javax.imageio.ImageIO;
 
 /**
  * 验证码工具类
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class VerifyCodeUtils
 {

ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java → hzgzpt-common/src/main/java/com/miaxis/common/utils/bean/BeanUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils.bean;
+package com.miaxis.common.utils.bean;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -9,7 +9,7 @@ import java.util.regex.Pattern;
 /**
  * Bean 工具类
  * 
- * @author ruoyi
+ * @author miaxis
  */
 public class BeanUtils extends org.springframework.beans.BeanUtils
 {