bug--删除注释以及完善图片素材

This commit is contained in:
taochengbo
2020-05-16 23:52:11 +08:00
parent 299a57d080
commit 907b550991
43 changed files with 50 additions and 707 deletions

View File

@ -5,9 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import org.hibernate.annotations.CreationTimestamp;
import javax.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;

View File

@ -7,6 +7,8 @@
* 一经发现盗用、分享等行为,将追究法律责任,后果自负
*/
package co.yixiang.modules.quartz.domain;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@ -32,43 +34,35 @@ public class QuartzJob implements Serializable {
/** Spring Bean名称 */
//@Column(name = "bean_name")
private String beanName;
/** cron 表达式 */
//@Column(name = "cron_expression")
private String cronExpression;
/** 状态1暂停、0启用 */
//@Column(name = "is_pause")
private Boolean isPause;
/** 任务名称 */
//@Column(name = "job_name")
private String jobName;
/** 方法名称 */
//@Column(name = "method_name")
private String methodName;
/** 参数 */
//@Column(name = "params")
private String params;
/** 备注 */
//@Column(name = "remark")
private String remark;
/** 创建日期 */
//@Column(name = "create_time")
//@TableField(fill= FieldFill.INSERT)
@TableField(fill= FieldFill.INSERT)
private Timestamp createTime;
public void copy(QuartzJob source){

View File

@ -7,6 +7,8 @@
* 一经发现盗用、分享等行为,将追究法律责任,后果自负
*/
package co.yixiang.modules.quartz.domain;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@ -31,48 +33,39 @@ public class QuartzLog implements Serializable {
/** 任务名称 */
//@Column(name = "baen_name")
private String baenName;
/** Bean名称 */
@Column(name = "create_time")
//@TableField(fill= FieldFill.INSERT)
/** 创建时间 */
@TableField(fill= FieldFill.INSERT)
private Timestamp createTime;
/** cron表达式 */
//@Column(name = "cron_expression")
private String cronExpression;
/** 异常详细 */
//@Column(name = "exception_detail")
private String exceptionDetail;
/** 状态 */
//@Column(name = "is_success")
private Boolean isSuccess;
/** 任务名称 */
//@Column(name = "job_name")
private String jobName;
/** 方法名称 */
//@Column(name = "method_name")
private String methodName;
/** 参数 */
//@Column(name = "params")
private String params;
/** 耗时(毫秒) */
//@Column(name = "time")
private Long time;

View File

@ -8,14 +8,12 @@
*/
package co.yixiang.modules.system.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import javax.validation.constraints.*;
import java.sql.Timestamp;
import java.io.Serializable;
@ -37,12 +35,10 @@ public class Dept implements Serializable {
/** 上级部门 */
@NotNull
private Long pid;
/** 状态 */
@NotNull
private Boolean enabled;

View File

@ -8,14 +8,12 @@
*/
package co.yixiang.modules.system.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import javax.validation.constraints.*;
import java.sql.Timestamp;
import java.io.Serializable;
@ -33,7 +31,6 @@ public class Dict implements Serializable {
/** 字典名称 */
//@NotBlank
private String name;

View File

@ -8,14 +8,12 @@
*/
package co.yixiang.modules.system.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import javax.validation.constraints.*;
import java.sql.Timestamp;
import java.io.Serializable;
@ -33,12 +31,10 @@ public class DictDetail implements Serializable {
/** 字典标签 */
//@NotBlank
private String label;
/** 字典值 */
//@NotBlank
private String value;

View File

@ -8,14 +8,12 @@
*/
package co.yixiang.modules.system.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import javax.validation.constraints.*;
import java.sql.Timestamp;
import java.io.Serializable;
@ -32,19 +30,16 @@ public class Job implements Serializable {
private Long id;
/** 岗位名称 */
//@NotBlank
private String name;
/** 岗位状态 */
//@NotNull
private Boolean enabled;
@TableField(exist = false)
private Dept dept;
/** 岗位排序 */
//@NotNull
private Long sort;

View File

@ -8,7 +8,6 @@
*/
package co.yixiang.modules.system.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.FieldFill;

View File

@ -8,7 +8,6 @@
*/
package co.yixiang.modules.system.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.FieldFill;
@ -34,7 +33,6 @@ public class Role implements Serializable {
/** 名称 */
//@NotBlank
private String name;

View File

@ -23,11 +23,9 @@ import java.io.Serializable;
@TableName("roles_depts")
public class RolesDepts implements Serializable {
@TableId
private Long roleId;
@TableId
private Long deptId;

View File

@ -7,7 +7,6 @@
* 一经发现盗用、分享等行为,将追究法律责任,后果自负
*/
package co.yixiang.modules.system.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableName;
import cn.hutool.core.bean.BeanUtil;
@ -23,12 +22,10 @@ import java.io.Serializable;
public class RolesMenus implements Serializable {
/** 菜单ID */
@TableId
private Long menuId;
/** 角色ID */
@TableId
private Long roleId;
public void copy(RolesMenus source){

View File

@ -51,10 +51,15 @@ public class User implements Serializable {
@TableField(exist = false)
private UserAvatar userAvatar;
/** 用户角色 */
@TableField(exist = false)
private Set<Role> roles;
/** 用户职位*/
@TableField(exist = false)
private Job job;
/** 用户部门*/
@TableField(exist = false)
private Dept dept;

View File

@ -9,14 +9,12 @@
package co.yixiang.modules.system.domain;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import javax.validation.constraints.*;
import java.sql.Timestamp;
import java.io.Serializable;

View File

@ -7,7 +7,6 @@
* 一经发现盗用、分享等行为,将追究法律责任,后果自负
*/
package co.yixiang.modules.system.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;