客户群对象修改

linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeGroup.java

 package com.linkwechat.wecom.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -28,31 +29,44 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 @TableName("we_group")
-public class WeGroup {
+public class WeGroup extends BaseEntity{
     private static final long serialVersionUID = 1L;
 
-    @TableId
+    @ApiModelProperty(value = "主键")
+    @TableId(type = IdType.AUTO)
+    @TableField("id")
+    private Long id;
+
+    @ApiModelProperty(value = "企业id")
+    @TableField(value = "corp_id")
+    private String corpId;
+
     @ApiModelProperty(value = "群聊id")
+    @TableField(value = "chat_id")
     private String chatId;
 
     @ApiModelProperty(value = "群名")
+    @TableField(value = "group_name")
     private String groupName;
 
     @TableField(exist = false)
     private Long memberNum;
 
     @ApiModelProperty(value = "群公告")
+    @TableField(value = "notice")
     private String notice;
 
     @ApiModelProperty(value = "群主userId")
+    @TableField(value = "owner")
     private String owner;
 
     @ApiModelProperty(value = "0 - 正常;1 - 跟进人离职;2 - 离职继承中;3 - 离职继承完成")
+    @TableField(value = "status")
     private Integer status;
 
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date createTime;
+    @ApiModelProperty(value = "删除标识 0 正常 1 无效")
+    @TableField(value = "del_flag")
+    private Integer delFlag;
 
     @TableField(exist = false)
     private String groupLeaderName;
@@ -61,13 +75,6 @@ public class WeGroup {
     @TableField(exist = false)
     private String groupLeader;
 
-    @TableField(exist = false)
-    @JsonFormat( pattern = "yyyy-MM-dd")
-    private String beginTime;
-
-    @TableField(exist = false)
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private String endTime;
 
     /**员工id*/
     @TableField(exist = false)

linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeGroupMember.java

 package com.linkwechat.wecom.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.linkwechat.common.core.domain.BaseEntity;
 import com.linkwechat.common.utils.SnowFlakeUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.models.auth.In;
 import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.SuperBuilder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -20,40 +24,53 @@ import java.util.Date;
  * @Description:
  * @Date: create in 2020/9/21 0021 23:56
  */
+@EqualsAndHashCode(callSuper = true)
+@ApiModel
 @Data
 @TableName("we_group_member")
 @SuperBuilder
 @AllArgsConstructor
 @NoArgsConstructor
-public class WeGroupMember {
+public class WeGroupMember extends BaseEntity{
     private static final long serialVersionUID = 1L;
 
-    @TableId
-    private Long id= SnowFlakeUtil.nextId();;
+    @ApiModelProperty(value = "主键")
+    @TableId(type = IdType.AUTO)
+    @TableField("id")
+    private Long id;
 
-    @NotBlank(message = "groupId")
+    @ApiModelProperty(value = "企业id")
+    @TableField(value = "corp_id")
+    private String corpId;
+
+    @ApiModelProperty(value = "群聊id")
+    @NotBlank(message = "群聊id不能为空")
+    @TableField(value = "chat_id")
     private String chatId;
 
     @TableField(exist = false)
     private String memberName;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "加入时间")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @TableField(value = "join_time")
     private Date joinTime;
 
     /**入群方式: 1 - 由成员邀请入群（直接邀请入群) ;   2 - 由成员邀请入群（通过邀请链接入群）;  3 - 通过扫描群二维码入群 */
+    @ApiModelProperty(value = "入群方式: 1 - 由成员邀请入群（直接邀请入群) ;   2 - 由成员邀请入群（通过邀请链接入群）;  3 - 通过扫描群二维码入群")
+    @TableField(value = "join_scene")
     private Integer joinScene;
 
+    @ApiModelProperty(value = "成员类型:1 - 企业成员;2 - 外部联系人")
     @TableField(value="type")
-    private Integer joinType;
-
+    private Integer type;
 
+    @ApiModelProperty(value = "群成员id")
+    @TableField(value="user_id")
     private String userId;
 
+    @ApiModelProperty(value = "外部联系人在微信开放平台的唯一身份标识")
+    @TableField(value="union_id")
     private String unionId;
 
-
-
-
-
-
 }

linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeGroupServiceImpl.java

@@ -183,7 +183,7 @@ public class WeGroupServiceImpl extends ServiceImpl<WeGroupMapper, WeGroup> impl
                                                 .userId(member.getUserid())
                                                 .joinTime(new Date(member.getJoin_time() * 1000L))
                                                 .joinScene(member.getJoin_scene())
-                                                .joinType(member.getType())
+                                                .type(member.getType())
                                                 .unionId(member.getUnionid())
                                                 .build()
                                 );
@@ -247,7 +247,7 @@ public class WeGroupServiceImpl extends ServiceImpl<WeGroupMapper, WeGroup> impl
                                         .userId(member.getUserid())
                                         .joinTime(new Date(member.getJoin_time() * 1000L))
                                         .joinScene(member.getJoin_scene())
-                                        .joinType(member.getType())
+                                        .type(member.getType())
                                         .unionId(member.getUnionid())
                                         .build()
                         );
@@ -288,7 +288,7 @@ public class WeGroupServiceImpl extends ServiceImpl<WeGroupMapper, WeGroup> impl
                                         .userId(member.getUserid())
                                         .joinTime(new Date(member.getJoin_time() * 1000L))
                                         .joinScene(member.getJoin_scene())
-                                        .joinType(member.getType())
+                                        .type(member.getType())
                                         .unionId(member.getUnionid())
                                         .build()
                         );