From 405d0d6a560e9a4ce6dbf5457a677a010d0cfeb1 Mon Sep 17 00:00:00 2001 From: 安瑾然 <107107765@qq.com> Date: 星期二, 12 七月 2022 16:52:07 +0800 Subject: [PATCH] commit --- src/main/java/com/example/jz/modle/entity/Message.java | 92 +++++++--- src/main/java/com/example/jz/modle/entity/Cause.java | 73 +++++--- src/main/java/com/example/jz/modle/entity/Announcement.java | 64 +++---- src/main/java/com/example/jz/modle/entity/GroupUser.java | 37 +++- src/main/java/com/example/jz/modle/entity/User.java | 95 +++++++---- src/main/java/com/example/jz/modle/entity/Group.java | 89 ++++++---- 6 files changed, 276 insertions(+), 174 deletions(-) diff --git a/src/main/java/com/example/jz/modle/entity/Announcement.java b/src/main/java/com/example/jz/modle/entity/Announcement.java index 24eed75..785cfd4 100644 --- a/src/main/java/com/example/jz/modle/entity/Announcement.java +++ b/src/main/java/com/example/jz/modle/entity/Announcement.java @@ -1,35 +1,33 @@ package com.example.jz.modle.entity; +import java.io.Serializable; import java.util.Date; -import com.baomidou.mybatisplus.extension.activerecord.Model; - -import java.io.Serializable; - /** - * 鍏憡琛�(Announcement)琛ㄥ疄浣撶被 + * 鍏憡琛�(Announcement)瀹炰綋绫� * * @author makejava - * @since 2022-07-11 16:35:52 + * @since 2022-07-12 16:50:56 */ -@SuppressWarnings("serial") -public class Announcement extends Model<Announcement> { - //鍏憡id - private Integer announcementId; - //鍏憡鍐呭 +public class Announcement implements Serializable { + private static final long serialVersionUID = -64538879138052915L; + /** + * 鍏憡鍐呭 + */ private String text; - //缇d + /** + * 缇d + */ private Integer groupId; - //鍒涘缓鏃堕棿 - private Date createTime; + /** + * 鍏憡id + */ + private Integer id; + /** + * 鍒涘缓鏃堕棿 + */ + private Date ctime; - public Integer getAnnouncementId() { - return announcementId; - } - - public void setAnnouncementId(Integer announcementId) { - this.announcementId = announcementId; - } public String getText() { return text; @@ -47,21 +45,21 @@ this.groupId = groupId; } - public Date getCreateTime() { - return createTime; + public Integer getId() { + return id; } - public void setCreateTime(Date createTime) { - this.createTime = createTime; + public void setId(Integer id) { + this.id = id; } - /** - * 鑾峰彇涓婚敭鍊� - * - * @return 涓婚敭鍊� - */ - @Override - protected Serializable pkVal() { - return this.announcementId; + public Date getCtime() { + return ctime; } + + public void setCtime(Date ctime) { + this.ctime = ctime; + } + } + diff --git a/src/main/java/com/example/jz/modle/entity/Cause.java b/src/main/java/com/example/jz/modle/entity/Cause.java index a5de68c..0ea029c 100644 --- a/src/main/java/com/example/jz/modle/entity/Cause.java +++ b/src/main/java/com/example/jz/modle/entity/Cause.java @@ -1,39 +1,60 @@ package com.example.jz.modle.entity; +import java.io.Serializable; import java.util.Date; -import com.baomidou.mybatisplus.extension.activerecord.Model; - -import java.io.Serializable; - /** - * (Cause)琛ㄥ疄浣撶被 + * (Cause)瀹炰綋绫� * * @author makejava - * @since 2022-07-11 16:55:40 + * @since 2022-07-12 16:50:57 */ -@SuppressWarnings("serial") -public class Cause extends Model<Cause> { - //妗堜欢ID +public class Cause implements Serializable { + private static final long serialVersionUID = 944957375480792530L; + /** + * 妗堜欢ID + */ private Integer id; - //澶村儚鍦板潃 + /** + * 澶村儚鍦板潃 + */ private String pic; - //鎶ユ浜� + /** + * 鎶ユ浜� + */ private String reporter; - //鎶ユ浜烘墜鏈哄彿 + /** + * 鎶ユ浜烘墜鏈哄彿 + */ private String mobile; - //鎶ユ浜鸿韩浠借瘉鍙� + /** + * 鎶ユ浜鸿韩浠借瘉鍙� + */ private String idcard; - //鏄惁浠e姙 Y锛堜唬鍔烇級 N锛堜笉鏄唬鍔烇級 + /** + * 鏄惁浠e姙 Y锛堜唬鍔烇級 N锛堜笉鏄唬鍔烇級 + */ private String isCommission; - //娑夋閲戦 + /** + * 娑夋閲戦 + */ private String amountInvolved; - //鎶ユ鏉愭枡鍥剧墖鍦板潃 澶氫釜鐢�,鍒嗛殧 + /** + * 鎶ユ鏉愭枡鍥剧墖鍦板潃 澶氫釜鐢�,鍒嗛殧 + */ private String reportMaterials; - //鎶ユ鏃堕棿 + /** + * 鎶ユ鏃堕棿 + */ private Date reportTime; - //鎶ユ鏂瑰紡 + /** + * 鎶ユ鏂瑰紡 + */ private String reportMethod; + /** + * 鍒涘缓浜篿d + */ + private Integer creator; public Integer getId() { @@ -116,13 +137,13 @@ this.reportMethod = reportMethod; } - /** - * 鑾峰彇涓婚敭鍊� - * - * @return 涓婚敭鍊� - */ - @Override - protected Serializable pkVal() { - return this.id; + public Integer getCreator() { + return creator; } + + public void setCreator(Integer creator) { + this.creator = creator; + } + } + diff --git a/src/main/java/com/example/jz/modle/entity/Group.java b/src/main/java/com/example/jz/modle/entity/Group.java index 009564e..8bf288e 100644 --- a/src/main/java/com/example/jz/modle/entity/Group.java +++ b/src/main/java/com/example/jz/modle/entity/Group.java @@ -1,39 +1,42 @@ package com.example.jz.modle.entity; -import java.util.Date; - -import com.baomidou.mybatisplus.extension.activerecord.Model; - import java.io.Serializable; +import java.util.Date; /** * 缇よ〃 - * (Group)琛ㄥ疄浣撶被 +(Group)瀹炰綋绫� * * @author makejava - * @since 2022-07-11 16:35:57 + * @since 2022-07-12 16:50:59 */ -@SuppressWarnings("serial") -public class Group extends Model<Group> { - //缇� id - private Integer groupId; - //缇ゅ悕绉� +public class Group implements Serializable { + private static final long serialVersionUID = 208063400600909704L; + /** + * 缇ゅ悕绉� + */ private String groupName; - //缇ゅ垱寤烘椂闂� - private Date createTime; - //缇や慨鏀规椂闂� + /** + * 缇や慨鏀规椂闂� + */ private Date updateTime; - //缇ゅ叕鍛奿d + /** + * 缇ゅ叕鍛奿d + */ private Integer groupAnnouncementId; + /** + * 缇� id + */ + private Integer id; + /** + * 鍒涘缓浜篿d + */ + private Integer userId; + /** + * 缇ゅ垱寤烘椂闂� + */ + private Date ctime; - - public Integer getGroupId() { - return groupId; - } - - public void setGroupId(Integer groupId) { - this.groupId = groupId; - } public String getGroupName() { return groupName; @@ -41,14 +44,6 @@ public void setGroupName(String groupName) { this.groupName = groupName; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; } public Date getUpdateTime() { @@ -67,13 +62,29 @@ this.groupAnnouncementId = groupAnnouncementId; } - /** - * 鑾峰彇涓婚敭鍊� - * - * @return 涓婚敭鍊� - */ - @Override - protected Serializable pkVal() { - return this.groupId; + public Integer getId() { + return id; } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public Date getCtime() { + return ctime; + } + + public void setCtime(Date ctime) { + this.ctime = ctime; + } + } + diff --git a/src/main/java/com/example/jz/modle/entity/GroupUser.java b/src/main/java/com/example/jz/modle/entity/GroupUser.java index 8146e70..6ebc272 100644 --- a/src/main/java/com/example/jz/modle/entity/GroupUser.java +++ b/src/main/java/com/example/jz/modle/entity/GroupUser.java @@ -1,21 +1,32 @@ package com.example.jz.modle.entity; -import com.baomidou.mybatisplus.extension.activerecord.Model; +import java.io.Serializable; +import java.util.Date; /** - * 鐢ㄦ埛鍜岀兢涓棿琛�(GroupUser)琛ㄥ疄浣撶被 + * 鐢ㄦ埛鍜岀兢涓棿琛�(GroupUser)瀹炰綋绫� * * @author makejava - * @since 2022-07-11 16:35:57 + * @since 2022-07-12 16:50:59 */ -@SuppressWarnings("serial") -public class GroupUser extends Model<GroupUser> { - //鐢ㄦ埛id +public class GroupUser implements Serializable { + private static final long serialVersionUID = -27152838957515341L; + /** + * 鐢ㄦ埛id + */ private Integer userId; - //缇d + /** + * 缇d + */ private Integer groupId; - //鏄惁绂佽█(0涓哄惁1涓烘槸锛� + /** + * 鏄惁绂佽█(0涓哄惁1涓烘槸锛� + */ private Object banSpeech; + /** + * 鍒涘缓鏃堕棿 + */ + private Date ctime; public Integer getUserId() { @@ -41,4 +52,14 @@ public void setBanSpeech(Object banSpeech) { this.banSpeech = banSpeech; } + + public Date getCtime() { + return ctime; + } + + public void setCtime(Date ctime) { + this.ctime = ctime; + } + } + diff --git a/src/main/java/com/example/jz/modle/entity/Message.java b/src/main/java/com/example/jz/modle/entity/Message.java index f92f9e1..fc311c4 100644 --- a/src/main/java/com/example/jz/modle/entity/Message.java +++ b/src/main/java/com/example/jz/modle/entity/Message.java @@ -1,41 +1,75 @@ package com.example.jz.modle.entity; +import java.io.Serializable; import java.util.Date; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - /** - * 娑堟伅琛�(Message)琛ㄥ疄浣撶被 + * 娑堟伅琛�(Message)瀹炰綋绫� * * @author makejava - * @since 2022-07-11 16:35:57 + * @since 2022-07-12 16:50:59 */ -@SuppressWarnings("serial") -@Data -@NoArgsConstructor -public class Message extends Model<Message> { - //娑堟伅id - private Integer id; - //娑堟伅鍐呭 - private String text; - //鐢ㄦ埛id - private Integer userId; - //缇d - private Integer groupId; - //鍒涘缓鏃堕棿 - private Date cTime; - +public class Message implements Serializable { + private static final long serialVersionUID = -28737108473853898L; /** - * 鑾峰彇涓婚敭鍊� - * - * @return 涓婚敭鍊� + * 娑堟伅鍐呭 */ - @Override - protected Serializable pkVal() { - return this.id; + private String text; + /** + * 鐢ㄦ埛id + */ + private Integer userId; + /** + * 缇d + */ + private Integer groupId; + /** + * 娑堟伅id + */ + private Integer id; + + private Date ctime; + + + public String getText() { + return text; } + + public void setText(String text) { + this.text = text; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public Integer getGroupId() { + return groupId; + } + + public void setGroupId(Integer groupId) { + this.groupId = groupId; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Date getCtime() { + return ctime; + } + + public void setCtime(Date ctime) { + this.ctime = ctime; + } + } + diff --git a/src/main/java/com/example/jz/modle/entity/User.java b/src/main/java/com/example/jz/modle/entity/User.java index 4be7481..04b73f0 100644 --- a/src/main/java/com/example/jz/modle/entity/User.java +++ b/src/main/java/com/example/jz/modle/entity/User.java @@ -1,56 +1,73 @@ package com.example.jz.modle.entity; +import java.io.Serializable; import java.util.Date; -import com.baomidou.mybatisplus.extension.activerecord.Model; - -import java.io.Serializable; - /** - * 鐢ㄦ埛琛�(User)琛ㄥ疄浣撶被 + * 鐢ㄦ埛琛�(User)瀹炰綋绫� * * @author makejava - * @since 2022-07-11 16:35:57 + * @since 2022-07-12 16:50:59 */ -@SuppressWarnings("serial") -public class User extends Model<User> { - //ID - private String userId; - //鐢ㄦ埛鏄电О +public class User implements Serializable { + private static final long serialVersionUID = 853192857312832170L; + /** + * 鐢ㄦ埛鏄电О + */ private String nickName; - //鐪熷疄濮撳悕 + /** + * 鐪熷疄濮撳悕 + */ private String realName; - //鐧诲綍瀵嗙爜 + /** + * 鐧诲綍瀵嗙爜 + */ private String loginPassword; - //鎵嬫満鍙风爜 + /** + * 鎵嬫満鍙风爜 + */ private String userMobile; - //鐢ㄦ埛韬唤璇佸彿鐮� + /** + * 鐢ㄦ埛韬唤璇佸彿鐮� + */ private String userIdcard; - //淇敼鏃堕棿 + /** + * 淇敼鏃堕棿 + */ private Date modifyTime; - //娉ㄥ唽鏃堕棿 + /** + * 娉ㄥ唽鏃堕棿 + */ private Date userRegtime; - //娉ㄥ唽IP + /** + * 娉ㄥ唽IP + */ private String userRegip; - //鏈�鍚庣櫥褰曟椂闂� + /** + * 鏈�鍚庣櫥褰曟椂闂� + */ private Date userLasttime; - //鏈�鍚庣櫥褰旾P + /** + * 鏈�鍚庣櫥褰旾P + */ private String userLastip; - //澶囨敞 + /** + * 澶囨敞 + */ private String userMemo; - //澶村儚鍥剧墖璺緞 + /** + * 澶村儚鍥剧墖璺緞 + */ private String pic; - //鐘舵�� 1 姝e父 0 鏃犳晥 + /** + * 鐘舵�� 1 姝e父 0 鏃犳晥 + */ private Integer status; + /** + * ID + */ + private String id; - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } public String getNickName() { return nickName; @@ -156,13 +173,13 @@ this.status = status; } - /** - * 鑾峰彇涓婚敭鍊� - * - * @return 涓婚敭鍊� - */ - @Override - protected Serializable pkVal() { - return this.userId; + public String getId() { + return id; } + + public void setId(String id) { + this.id = id; + } + } + -- Gitblit v1.8.0