gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

调整POJO结构并删除多余实体

pull/3/head
chenjinlong 2021-02-03 17:27:44 +08:00
parent cbb2a969c4
commit 905c641248
18 changed files with 18 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/LoginLogServiceApi.java
View File

@ -1,6 +1,6 @@
package cn.stylefeng.roses.kernel.system;
import cn.stylefeng.roses.kernel.system.pojo.loginlog.request.SysLoginLogRequest;
import cn.stylefeng.roses.kernel.system.pojo.SysLoginLogRequest;
/**
* 登录日志api接口

2
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/app/request/SysAppRequest.java → kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/SysAppRequest.java
View File

@ -1,4 +1,4 @@
package cn.stylefeng.roses.kernel.system.pojo.app.request;
package cn.stylefeng.roses.kernel.system.pojo;
import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
import cn.stylefeng.roses.kernel.validator.validators.status.StatusValue;

2
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/loginlog/request/SysLoginLogRequest.java → kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/SysLoginLogRequest.java
View File

@ -1,4 +1,4 @@
package cn.stylefeng.roses.kernel.system.pojo.loginlog.request;
package cn.stylefeng.roses.kernel.system.pojo;
import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
import lombok.Data;

6
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/notice/SysNoticeRequest.java → kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/SysNoticeRequest.java
View File

@ -1,4 +1,4 @@
package cn.stylefeng.roses.kernel.system.pojo.notice;
package cn.stylefeng.roses.kernel.system.pojo;
import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -47,7 +47,7 @@ public class SysNoticeRequest extends BaseRequest {
* 通知开始时间
*/
@NotNull(message = "通知开始时间不能为空", groups = {add.class, edit.class})
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date noticeBeginTime;
@ -55,7 +55,7 @@ public class SysNoticeRequest extends BaseRequest {
* 通知结束时间
*/
@NotNull(message = "通知开始时间不能为空", groups = {add.class, edit.class})
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date noticeEndTime;
/**

2
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/userOrg/UserOrgResponse.java → kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/UserOrgResponse.java
View File

@ -1,4 +1,4 @@
package cn.stylefeng.roses.kernel.system.pojo.userOrg;
package cn.stylefeng.roses.kernel.system.pojo;
import lombok.Data;

67
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/app/response/SysAppResponse.java
View File

@ -1,67 +0,0 @@
package cn.stylefeng.roses.kernel.system.pojo.app.response;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 系统应用表
*
* @author fengshuonan
* @date 2020/11/24 21:05
*/
@Data
public class SysAppResponse implements Serializable {
/**
* 主键id
*/
private Long appId;
/**
* 应用名称
*/
private String appName;
/**
* 编码
*/
private String appCode;
/**
* 是否默认激活（Y-是，N-否）
*/
private String activeFlag;
/**
* 状态（字典 1启用 2禁用）
*/
private Integer statusFlag;
/**
* 是否删除（Y-已删除，N-未删除）
*/
private String delFlag;
/**
* 创建时间
*/
private Date createTime;
/**
* 创建人
*/
private Long createUser;
/**
* 修改时间
*/
private Date updateTime;
/**
* 修改人
*/
private Long updateUser;
}

46
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/loginlog/response/SysLoginLogResponse.java
View File

@ -1,46 +0,0 @@
package cn.stylefeng.roses.kernel.system.pojo.loginlog.response;
import lombok.Data;
import java.io.Serializable;
/**
* 登录日志表
*
* @author chenjinlong
* @date 2021/1/13 11:06
*/
@Data
public class SysLoginLogResponse implements Serializable {
/**
* 主键id
*/
private Long llgId;
/**
* 日志名称
*/
private String llgName;
/**
* 是否执行成功
*/
private String llgSucceed;
/**
* 具体消息
*/
private String llgMessage;
/**
* 登录ip
*/
private String llgIpAddress;
/**
* 用户id
*/
private Long userId;
}

2
kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/app/modular/controller/SysAppController.java
View File

@ -6,7 +6,7 @@ import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource;
import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
import cn.stylefeng.roses.kernel.system.pojo.app.request.SysAppRequest;
import cn.stylefeng.roses.kernel.system.pojo.SysAppRequest;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

2
kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/app/modular/service/SysAppService.java
View File

@ -26,7 +26,7 @@ package cn.stylefeng.roses.kernel.app.modular.service;
import cn.stylefeng.roses.kernel.app.modular.entity.SysApp;
import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
import cn.stylefeng.roses.kernel.system.pojo.app.request.SysAppRequest;
import cn.stylefeng.roses.kernel.system.pojo.SysAppRequest;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;

2
kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/app/modular/service/impl/SysAppServiceImpl.java
View File

@ -16,7 +16,7 @@ import cn.stylefeng.roses.kernel.system.AppServiceApi;
import cn.stylefeng.roses.kernel.system.MenuServiceApi;
import cn.stylefeng.roses.kernel.system.exception.SystemModularException;
import cn.stylefeng.roses.kernel.system.exception.enums.AppExceptionEnum;
import cn.stylefeng.roses.kernel.system.pojo.app.request.SysAppRequest;
import cn.stylefeng.roses.kernel.system.pojo.SysAppRequest;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

2
kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/loginlog/modular/controller/SysLoginLogController.java
View File

@ -5,7 +5,7 @@ import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
import cn.stylefeng.roses.kernel.system.pojo.loginlog.request.SysLoginLogRequest;
import cn.stylefeng.roses.kernel.system.pojo.SysLoginLogRequest;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RestController;

2
kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/loginlog/modular/service/SysLoginLogService.java
View File

@ -27,7 +27,7 @@ package cn.stylefeng.roses.kernel.loginlog.modular.service;
import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
import cn.stylefeng.roses.kernel.loginlog.modular.entity.SysLoginLog;
import cn.stylefeng.roses.kernel.system.LoginLogServiceApi;
import cn.stylefeng.roses.kernel.system.pojo.loginlog.request.SysLoginLogRequest;
import cn.stylefeng.roses.kernel.system.pojo.SysLoginLogRequest;
import com.baomidou.mybatisplus.extension.service.IService;
/**

2
kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/loginlog/modular/service/impl/SysLoginLogServiceImpl.java
View File

@ -13,7 +13,7 @@ import cn.stylefeng.roses.kernel.loginlog.modular.service.SysLoginLogService;
import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil;
import cn.stylefeng.roses.kernel.system.exception.enums.AppExceptionEnum;
import cn.stylefeng.roses.kernel.system.pojo.loginlog.request.SysLoginLogRequest;
import cn.stylefeng.roses.kernel.system.pojo.SysLoginLogRequest;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

2
kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/controller/NoticeController.java
View File

@ -6,7 +6,7 @@ import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource;
import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
import cn.stylefeng.roses.kernel.system.pojo.notice.SysNoticeRequest;
import cn.stylefeng.roses.kernel.system.pojo.SysNoticeRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;

2
kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/service/SysNoticeService.java
View File

@ -3,7 +3,7 @@ package cn.stylefeng.roses.kernel.notice.modular.service;
import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
import cn.stylefeng.roses.kernel.notice.modular.entity.SysNotice;
import cn.stylefeng.roses.kernel.system.NoticeServiceApi;
import cn.stylefeng.roses.kernel.system.pojo.notice.SysNoticeRequest;
import cn.stylefeng.roses.kernel.system.pojo.SysNoticeRequest;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;

2
kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/service/impl/SysNoticeServiceImpl.java
View File

@ -15,7 +15,7 @@ import cn.stylefeng.roses.kernel.notice.modular.service.SysNoticeService;
import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
import cn.stylefeng.roses.kernel.system.exception.enums.NoticeExceptionEnum;
import cn.stylefeng.roses.kernel.system.pojo.notice.SysNoticeRequest;
import cn.stylefeng.roses.kernel.system.pojo.SysNoticeRequest;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

2
kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserOrgService.java
View File

@ -2,7 +2,7 @@ package cn.stylefeng.roses.kernel.system.modular.user.service;
import cn.stylefeng.roses.kernel.system.UserOrgServiceApi;
import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserOrg;
import cn.stylefeng.roses.kernel.system.pojo.userOrg.UserOrgResponse;
import cn.stylefeng.roses.kernel.system.pojo.UserOrgResponse;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;

2
kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java
View File

@ -7,8 +7,8 @@ import cn.stylefeng.roses.kernel.system.exception.enums.SysUserOrgExceptionEnum;
import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserOrg;
import cn.stylefeng.roses.kernel.system.modular.user.mapper.SysUserOrgMapper;
import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserOrgService;
import cn.stylefeng.roses.kernel.system.pojo.UserOrgResponse;
import cn.stylefeng.roses.kernel.system.pojo.user.SysUserOrgResponse;
import cn.stylefeng.roses.kernel.system.pojo.userOrg.UserOrgResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;