Skip to content

D
device-back
提交 8d26a0e2 authored 作者: 邓砥奕's avatar 邓砥奕
浏览文件
操作

更新

上级 2c7c2064
隐藏空白字符变更
内嵌 并排
正在显示 包含 18 行增加 和 228 行删除
dev-device/device-user/src/main/java/com/tykj/dev/device/user/subject/entity/Area.java
浏览文件 @ 8d26a0e2
......@@ -8,9 +8,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import org.modelmapper.ModelMapper;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Transient;
import javax.persistence.*;
import java.util.List;
/**
......@@ -30,6 +28,7 @@ public class Area {
* 区域id
*/
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id;
/**
......@@ -45,7 +44,7 @@ public class Area {
/**
* 排序
*/
private String order;
private String orders;
private Integer fatherId;
......
dev-device/device-user/src/main/java/com/tykj/dev/device/user/subject/entity/Permissions.java
浏览文件 @ 8d26a0e2
......@@ -7,6 +7,8 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
/**
......@@ -26,6 +28,7 @@ public class Permissions {
* 权限id
*/
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@ApiModelProperty(value = "数据ID", name = "permissionsId", example = "12321L")
// @GeneratedValue(generator="UserIdentityGenerator",strategy = GenerationType.AUTO)
// @GenericGenerator(name = "UserIdentityGenerator", strategy = "UserIdentityGenerator")
......
dev-device/device-user/src/main/java/com/tykj/dev/device/user/subject/entity/Role.java
浏览文件 @ 8d26a0e2
......@@ -6,9 +6,7 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Transient;
import javax.persistence.*;
import java.util.Date;
import java.util.List;
......@@ -26,6 +24,7 @@ import java.util.List;
@ApiModel(value = "角色对象", description = "角色详细信息")
public class Role {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@ApiModelProperty(value = "数据ID", name = "roleId", example = "12321L")
// @GeneratedValue(generator="UserIdentityGenerator",strategy = GenerationType.AUTO)
// @GenericGenerator(name = "UserIdentityGenerator", strategy = "UserIdentityGenerator")
......
dev-device/device-user/src/main/java/com/tykj/dev/device/user/subject/entity/RolePermissions.java
浏览文件 @ 8d26a0e2
......@@ -7,6 +7,8 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
/**
......@@ -26,6 +28,7 @@ public class RolePermissions {
* id
*/
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@ApiModelProperty(value = "数据ID", name = "rpId", example = "12321L")
// @GeneratedValue(generator="UserIdentityGenerator",strategy = GenerationType.AUTO)
// @GenericGenerator(name = "UserIdentityGenerator", strategy = "UserIdentityGenerator")
......
dev-device/device-user/src/main/java/com/tykj/dev/device/user/subject/entity/Train.java deleted 100644 → 0
浏览文件 @ 2c7c2064
package com.tykj.dev.device.user.subject.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.*;
import java.util.Date;
/**
* entity class for train
* 专管员培训
*/
@Data
@Entity
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("专管员培训")
@Table(name = "train",schema = "train")
public class Train {
/**
* 主键
*/
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
@ApiModelProperty(value = "主键")
private Integer id;
/**
* 培训主题
*/
@Column(name = "theme",columnDefinition = "null varchar(255) 培训主题")
@ApiModelProperty(value = "培训主题")
private String theme;
/**
* 地点
*/
@Column(name = "address",columnDefinition = "null varchar(255) 地点")
@ApiModelProperty(value = "地点")
private String address;
/**
* 主办方
*/
@Column(name = "host",columnDefinition = "null varchar(100) 主办方")
@ApiModelProperty(value = "主办方")
private String host;
/**
* 培训开始时间
*/
@Column(name = "start_time",columnDefinition = "null datetime 培训开始时间")
@ApiModelProperty(value = "培训开始时间")
private Date startTime;
/**
* 培训结束时间
*/
@Column(name = "end_time",columnDefinition = "null datetime 培训结束时间")
@ApiModelProperty(value = "培训结束时间")
private Date endTime;
/**
* 培训内容
*/
@Column(name = "content",columnDefinition = "null varchar(1000) 培训内容")
@ApiModelProperty(value = "培训内容")
private String content;
/**
* 通知单位
*/
@Column(name = "notice_org",columnDefinition = "null varchar(1000) 通知单位")
@ApiModelProperty(value = "通知单位")
private String noticeOrg;
/**
* 培训状态：1.报名中 2.截止报名 3.结束 4.撤销
*/
@Column(name = "status",columnDefinition = "null tinyint(1) unsigned 培训状态：1.报名中 2.截止报名 3.结束 4.撤销")
@ApiModelProperty(value = "培训状态：1.报名中 2.截止报名 3.结束 4.撤销")
private Boolean status;
/**
* 创建用户
*/
@Column(name = "createuser",columnDefinition = "null varchar(32) 创建用户")
@ApiModelProperty(value = "创建用户")
private String createuser;
/**
* 创建单位
*/
@Column(name = "create_org",columnDefinition = "null varchar(32) 创建单位")
@ApiModelProperty(value = "创建单位")
private String createOrg;
/**
* 创建时间
*/
@Column(name = "createtime",columnDefinition = "null datetime 创建时间")
@ApiModelProperty(value = "创建时间")
private java.sql.Timestamp createtime;
/**
* 更新用户
*/
@Column(name = "updateuser",columnDefinition = "null varchar(32) 更新用户")
@ApiModelProperty(value = "更新用户")
private String updateuser;
/**
* 更新时间
*/
@Column(name = "updatetime",columnDefinition = "null datetime 更新时间")
@ApiModelProperty(value = "更新时间")
private java.sql.Timestamp updatetime;
/**
* 合格分数
*/
@Column(name = "passScore",columnDefinition = "null double 合格分数")
@ApiModelProperty(value = "合格分数")
private Double passScore;
/**
* 考试附件
*/
@Column(name = "examFile",columnDefinition = "null varchar(1000) 考试附件")
@ApiModelProperty(value = "考试附件")
private String examFile;
}
dev-device/device-user/src/main/java/com/tykj/dev/device/user/subject/entity/TrainEnroll.java deleted 100644 → 0
浏览文件 @ 2c7c2064
package com.tykj.dev.device.user.subject.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.*;
import java.util.Date;
/**
* entity class for train_enroll
* 培训报名表
*/
@Data
@Entity
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("培训报名表")
@Table(name = "train_enroll",schema = "train_enroll")
public class TrainEnroll {
/**
* 主键
*/
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
@ApiModelProperty(name = "主键")
private Integer id;
/**
* 培训id
*/
@Column(name = "train_id",columnDefinition = "not null int(11) 培训id")
@ApiModelProperty(name = "培训id")
private Integer trainId;
/**
* 培训主办方
*/
@Column(name = "host",columnDefinition = "null varchar(100) 培训主办方")
@ApiModelProperty(name = "培训主办方")
private String host;
/**
* 培训主题
*/
@Column(name = "theme",columnDefinition = "null varchar(255) 培训主题")
@ApiModelProperty(name = "培训主题")
private String theme;
/**
* 专管员id
*/
@Column(name = "vmanager_id",columnDefinition = "not null varchar(32) 专管员id")
@ApiModelProperty(name = "专管员id")
private String vmanagerId;
/**
* 专管员姓名
*/
@Column(name = "vmanager_name",columnDefinition = "not null varchar(500) 专管员姓名")
@ApiModelProperty(name = "专管员姓名")
private String vmanagerName;
/**
* 所在组织
*/
@Column(name = "ownsup",columnDefinition = "not null varchar(32) 所在组织")
@ApiModelProperty(name = "所在组织")
private String ownsup;
/**
* 所属组织名称
*/
@Column(name = "ownsup_name",columnDefinition = "not null varchar(500) 所属组织名称")
@ApiModelProperty(name = "所属组织名称")
private String ownsupName;
/**
* 状态:1.任务未读 2.已报名 3.忽略报名 4.参加考试 5.缺席考试
*/
@Column(name = "status",columnDefinition = "not null tinyint(1) unsigned 状态:1.任务未读 2.已报名 3.忽略报名 4.参加考试 5.缺席考试")
@ApiModelProperty(name = "状态:1.任务未读 2.已报名 3.忽略报名 4.参加考试 5.缺席考试")
private Boolean status;
/**
* 报名时间
*/
@Column(name = "enroll_time",columnDefinition = "null datetime 报名时间")
@ApiModelProperty(name = "报名时间")
private Date enrollTime;
/**
* 得分
*/
@Column(name = "score",columnDefinition = "null double(6,2) 得分")
@ApiModelProperty(name = "得分")
private Double score;
}
dev-device/device-user/src/main/java/com/tykj/dev/device/user/subject/entity/Units.java
浏览文件 @ 8d26a0e2
......@@ -10,9 +10,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import org.modelmapper.ModelMapper;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Transient;
import javax.persistence.*;
/**
* @author zjm
......@@ -31,6 +29,7 @@ public class Units {
* 单位id
*/
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@ApiModelProperty(value = "单位id", name = "unitId", example = "12321L")
// @GeneratedValue(generator="UserIdentityGenerator",strategy = GenerationType.AUTO)
// @GenericGenerator(name = "UserIdentityGenerator", strategy = "UserIdentityGenerator")
......
dev-device/device-user/src/main/java/com/tykj/dev/device/user/subject/entity/UserRole.java
浏览文件 @ 8d26a0e2
......@@ -7,6 +7,8 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
/**
......@@ -26,6 +28,7 @@ public class UserRole {
* id
*/
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@ApiModelProperty(value = "数据ID", name = "urId", example = "12321L")
// @GeneratedValue(generator="UserIdentityGenerator",strategy = GenerationType.AUTO)
// @GenericGenerator(name = "UserIdentityGenerator", strategy = "UserIdentityGenerator")
......
dev-union/src/main/resources/application.properties
浏览文件 @ 8d26a0e2
......@@ -4,11 +4,11 @@ server.port=8087
logging.file=/opt/eqlog/equip.log
spring.servlet.multipart.max-file-size=400MB
spring.servlet.multipart.max-request-size=400MB
spring.jpa.hibernate.ddl-auto=none
spring.jpa.hibernate.ddl-auto=update
spring.jpa.show-sql=false
spring.jpa.open-in-view=true
spring.main.allow-bean-definition-overriding=true
spring.datasource.url=jdbc:mysql://192.168.100.249:3306/equipment?serverTimezone=Asia/Shanghai&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false
spring.datasource.url=jdbc:mysql://192.168.100.249:3306/device?serverTimezone=Asia/Shanghai&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false
spring.datasource.username=root
spring.datasource.password=root
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论