迁移登陆日志完成

开始迁移参数配置
2021-01-19 00:45:26 +08:00
parent c95f540201
commit 35a01cbf29
38 changed files with 389 additions and 571 deletions
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/config/SysConfigController.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/config/SysConfigController.java
@@ -0,0 +1,27 @@
+package cn.iocoder.dashboard.modules.system.controller.config;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "参数配置")
+@RestController
+@RequestMapping("/system/config")
+public class SysConfigController {
+
+//    private SpringValueRegistry
+//
+//    @Value("demo.test")
+//    private String demo;
+//
+//    @GetMapping("/demo")
+//    public String demo() {
+//        return demo;
+//    }
+//
+//    @PostMapping("/demo")
+//    public void setDemo() {
+//
+//    }
+
+}
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/config/vo/SysConfigBaseVO.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/config/vo/SysConfigBaseVO.java
@@ -0,0 +1,42 @@
+package cn.iocoder.dashboard.modules.system.controller.config.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Size;
+
+/**
+ * 参数配置 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
+@Data
+public class SysConfigBaseVO {
+
+    @ApiModelProperty(value = "参数分组", required = true, example = "biz")
+    @NotEmpty(message = "参数分组不能为空")
+    @Size(max = 100, message = "参数名称不能超过50个字符")
+    private String group;
+
+    @ApiModelProperty(value = "参数名称", required = true, example = "数据库名")
+    @NotBlank(message = "参数名称不能为空")
+    @Size(max = 100, message = "参数名称不能超过100个字符")
+    private String name;
+
+    @ApiModelProperty(value = "参数键值", required = true, example = "1024")
+    @NotBlank(message = "参数键值不能为空")
+    @Size(max = 500, message = "参数键值长度不能超过500个字符")
+    private String value;
+
+    @ApiModelProperty(value = "参数类型", required = true, example = "1", notes = "参见 SysConfigTypeEnum 枚举")
+    private String type;
+
+    @ApiModelProperty(value = "是否敏感", required = true, example = "true")
+    @NotBlank(message = "是否敏感不能为空")
+    private Boolean sensitive;
+
+    @ApiModelProperty(value = "备注", example = "备注一下很帅气！")
+    private String remark;
+
+}
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/config/vo/SysConfigCreateReqVO.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/config/vo/SysConfigCreateReqVO.java
@@ -0,0 +1,22 @@
+package cn.iocoder.dashboard.modules.system.controller.config.vo;
+
+import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptBaseVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+@ApiModel("参数配置创建 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SysConfigCreateReqVO extends SysDeptBaseVO {
+
+    @ApiModelProperty(value = "参数键名", required = true, example = "yunai.db.username")
+    @NotBlank(message = "参数键名长度不能为空")
+    @Size(max = 100, message = "参数键名长度不能超过100个字符")
+    private String key;
+
+}
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/config/vo/SysConfigExcelVO.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/config/vo/SysConfigExcelVO.java
@@ -0,0 +1,41 @@
+package cn.iocoder.dashboard.modules.system.controller.config.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 参数配置 Excel 导出响应 VO
+ */
+@Data
+public class SysConfigExcelVO {
+
+    @ExcelProperty("参数配置序号")
+    private Long id;
+
+    @ExcelProperty("参数键名")
+    private String key;
+
+    @ExcelProperty("参数分组")
+    private String group;
+
+    @ExcelProperty("参数名称")
+    private String name;
+
+    @ExcelProperty("参数键值")
+    private String value;
+
+    @ExcelProperty("参数类型")
+    private String type;
+
+    @ExcelProperty("是否敏感")
+    private Boolean sensitive;
+
+    @ExcelProperty("备注")
+    private String remark;
+
+    @ExcelProperty("创建时间")
+    private Date createTime;
+
+}
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/config/vo/SysConfigRespVO.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/config/vo/SysConfigRespVO.java
@@ -0,0 +1,28 @@
+package cn.iocoder.dashboard.modules.system.controller.config.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.Date;
+
+@ApiModel("参数配置信息 Response VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SysConfigRespVO extends SysConfigBaseVO {
+
+    @ApiModelProperty(value = "参数配置序号", required = true, example = "1024")
+    private Long id;
+
+    @ApiModelProperty(value = "参数键名", required = true, example = "yunai.db.username")
+    @NotBlank(message = "参数键名长度不能为空")
+    @Size(max = 100, message = "参数键名长度不能超过100个字符")
+    private String key;
+
+    @ApiModelProperty(value = "创建时间", required = true, example = "时间戳格式")
+    private Date createTime;
+
+}
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/config/vo/SysConfigUpdateReqVO.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/config/vo/SysConfigUpdateReqVO.java
@@ -0,0 +1,20 @@
+package cn.iocoder.dashboard.modules.system.controller.config.vo;
+
+import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptBaseVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+
+@ApiModel("参数配置创建 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SysConfigUpdateReqVO extends SysDeptBaseVO {
+
+    @ApiModelProperty(value = "参数配置序号", required = true, example = "1024")
+    @NotNull(message = "参数配置编号不能为空")
+    private Long id;
+
+}
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostExcelVO.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostExcelVO.java
@@ -1,8 +1,12 @@
 package cn.iocoder.dashboard.modules.system.controller.dept.vo.post;

+import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;

+import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.SYS_COMMON_STATUS;
+
 /**
 * 岗位 Excel 导出响应 VO
 */
@@ -21,9 +25,8 @@ public class SysPostExcelVO {
    @ExcelProperty("岗位排序")
    private String sort;

-//    @ExcelProperty(value = "状态", converter = DictConvert.class)
-//    @DictFormat(SYS_COMMON_STATUS)
-    @ExcelProperty(value = "状态")
+    @ExcelProperty(value = "状态", converter = DictConvert.class)
+    @DictFormat(SYS_COMMON_STATUS)
    private String status;

 }
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataExcelVO.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataExcelVO.java
@@ -5,7 +5,7 @@ import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;

-import static cn.iocoder.dashboard.modules.system.enums.dict.DictTypeEnum.SYS_COMMON_STATUS;
+import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.SYS_COMMON_STATUS;

 /**
 * 字典数据 Excel 导出响应 VO
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExcelVO.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExcelVO.java
@@ -5,7 +5,7 @@ import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;

-import static cn.iocoder.dashboard.modules.system.enums.dict.DictTypeEnum.SYS_COMMON_STATUS;
+import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.SYS_COMMON_STATUS;

 /**
 * 字典类型 Excel 导出响应 VO
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysLoginLogController.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysLoginLogController.java
@@ -2,6 +2,9 @@ package cn.iocoder.dashboard.modules.system.controller.logger;

 import cn.iocoder.dashboard.common.pojo.CommonResult;
 import cn.iocoder.dashboard.common.pojo.PageResult;
+import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExcelVO;
+import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO;
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogPageReqVO;
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogRespVO;
 import cn.iocoder.dashboard.modules.system.convert.logger.SysLoginLogConvert;
@@ -15,6 +18,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;

@Api(tags = "登陆日志 API")
@RestController
@@ -32,13 +38,17 @@ public class SysLoginLogController {
        return CommonResult.success(SysLoginLogConvert.INSTANCE.convertPage(page));
    }

-//    @GetMapping("/export")
-////    @Log(title = "登录日志", businessType = BusinessType.EXPORT)
-////    @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
-//    public void exportLoginLog(SysLogininfor logininfor) {
-//        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
-//        ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);
-//        return util.exportExcel(list, "登录日志");
-//    }
+    @ApiOperation("导出登陆日志 Excel")
+    @GetMapping("/export")
+//    @Log(title = "登录日志", businessType = BusinessType.EXPORT)
+//    @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
+    public void exportLoginLog(HttpServletResponse response, @Validated SysLoginLogExportReqVO reqVO) throws IOException {
+        List<SysLoginLogDO> list = loginLogService.getLoginLogList(reqVO);
+        // 拼接数据
+        List<SysLoginLogExcelVO> excelDataList = SysLoginLogConvert.INSTANCE.convertList(list);
+        // 输出
+        ExcelUtils.write(response, "登陆日志.xls", "数据列表",
+                SysLoginLogExcelVO.class, excelDataList);
+    }

 }
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExcelVO.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExcelVO.java
@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog;

 import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;
 import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert;
-import cn.iocoder.dashboard.modules.system.enums.dict.DictTypeEnum;
+import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;

@@ -17,14 +17,11 @@ public class SysLoginLogExcelVO {
    @ExcelProperty("日志主键")
    private Long id;

-    @ExcelProperty("用户编号")
-    private Long userId;
-
    @ExcelProperty("用户账号")
    private String username;

    @ExcelProperty(value = "登陆结果", converter = DictConvert.class)
-    @DictFormat(DictTypeEnum.SYS_LOGIN_RESULT)
+    @DictFormat(SysDictTypeEnum.SYS_LOGIN_RESULT)
    private Integer result;

    @ExcelProperty("登陆 IP")
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExportReqVO.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExportReqVO.java
@@ -0,0 +1,33 @@
+package cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@ApiModel("登陆日志分页列表 Request VO")
+@Data
+public class SysLoginLogExportReqVO {
+
+    @ApiModelProperty(value = "用户 IP", example = "127.0.0.1", notes = "模拟匹配")
+    private String userIp;
+
+    @ApiModelProperty(value = "用户账号", example = "芋道", notes = "模拟匹配")
+    private String username;
+
+    @ApiModelProperty(value = "操作状态", example = "true")
+    private Boolean status;
+
+    @ApiModelProperty(value = "开始时间", example = "2020-10-24")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date beginTime;
+
+    @ApiModelProperty(value = "结束时间", example = "2020-10-24")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date endTime;
+
+}
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExcelVO.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExcelVO.java
@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog;

 import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;
 import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert;
-import cn.iocoder.dashboard.modules.system.enums.dict.DictTypeEnum;
+import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;

@@ -24,7 +24,7 @@ public class SysOperateLogExcelVO {
    private String name;

    @ExcelProperty(value = "操作类型", converter = DictConvert.class)
-    @DictFormat(DictTypeEnum.SYS_OPERATE_TYPE)
+    @DictFormat(SysDictTypeEnum.SYS_OPERATE_TYPE)
    private String type;

    @ExcelProperty("操作人")
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogPageReqVO.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogPageReqVO.java
@@ -4,7 +4,6 @@ import cn.iocoder.dashboard.common.pojo.PageParam;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;

 import java.util.Date;
@@ -13,7 +12,6 @@ import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOU

@ApiModel("操作日志分页列表 Request VO")
@Data
-@EqualsAndHashCode(callSuper = true)
 public class SysOperateLogPageReqVO extends PageParam {

    @ApiModelProperty(value = "操作模块", example = "订单", notes = "模拟匹配")
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExcelVO.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExcelVO.java
@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.permission.vo.role;

 import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;
 import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert;
-import cn.iocoder.dashboard.modules.system.enums.dict.DictTypeEnum;
+import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;

@@ -28,7 +28,7 @@ public class SysRoleExcelVO {
    private Integer dataScope;

    @ExcelProperty(value = "角色状态", converter = DictConvert.class)
-    @DictFormat(DictTypeEnum.SYS_COMMON_STATUS)
+    @DictFormat(SysDictTypeEnum.SYS_COMMON_STATUS)
    private String status;

 }
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExcelVO.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExcelVO.java
@@ -7,8 +7,8 @@ import lombok.Data;

 import java.util.Date;

-import static cn.iocoder.dashboard.modules.system.enums.dict.DictTypeEnum.SYS_COMMON_STATUS;
-import static cn.iocoder.dashboard.modules.system.enums.dict.DictTypeEnum.SYS_USER_SEX;
+import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.SYS_COMMON_STATUS;
+import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.SYS_USER_SEX;

 /**
 * 用户 Excel 导出 VO
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserImportExcelVO.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserImportExcelVO.java
@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.user.vo.user;

 import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;
 import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert;
-import cn.iocoder.dashboard.modules.system.enums.dict.DictTypeEnum;
+import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -34,11 +34,11 @@ public class SysUserImportExcelVO {
    private String mobile;

    @ExcelProperty(value = "用户性别", converter = DictConvert.class)
-    @DictFormat(DictTypeEnum.SYS_USER_SEX)
+    @DictFormat(SysDictTypeEnum.SYS_USER_SEX)
    private Integer sex;

    @ExcelProperty(value = "账号状态", converter = DictConvert.class)
-    @DictFormat(DictTypeEnum.SYS_COMMON_STATUS)
+    @DictFormat(SysDictTypeEnum.SYS_COMMON_STATUS)
    private Integer status;

 }