Merge branch 'dev-1' into dev-xym-add-url

api-module/src/main/resources/mybatis-generator-config.xml

@@ -35,28 +35,28 @@
             <property name="forceBigDecimals" value="false"/>
         </javaTypeResolver>
 
-        <javaModelGenerator targetPackage="com.tzld.piaoquan.api.model.po" targetProject="/Users/shimeng/Desktop/project/growth-manager/api-module/src/main/java">
+        <javaModelGenerator targetPackage="com.tzld.piaoquan.growth.common.model.po" targetProject="/Users/shimeng/Desktop/project/growth-manager/common-module/src/main/java">
             <property name="constructorBased" value="false"/>
             <property name="enableSubPackages" value="true"/>
             <property name="immutable" value="false"/>
         </javaModelGenerator>
 
-        <sqlMapGenerator targetPackage="mapper" targetProject="/Users/shimeng/Desktop/project/growth-manager/api-module/src/main/resources">
+        <sqlMapGenerator targetPackage="mapper" targetProject="/Users/shimeng/Desktop/project/growth-manager/common-module/src/main/resources">
             <property name="enableSubPackages" value="true"/>
         </sqlMapGenerator>
 
-        <javaClientGenerator targetPackage="com.tzld.piaoquan.api.dao.mapper" type="XMLMAPPER"
-                             targetProject="/Users/shimeng/Desktop/project/growth-manager/api-module/src/main/java">
+        <javaClientGenerator targetPackage="com.tzld.piaoquan.growth.common.dao.mapper" type="XMLMAPPER"
+                             targetProject="/Users/shimeng/Desktop/project/growth-manager/common-module/src/main/java">
             <property name="enableSubPackages" value="true"/>
         </javaClientGenerator>
 
 <!--        <table tableName="we_com_alert_message" domainObjectName="AlertMessage" alias=""/>-->
-        <table tableName="gh_detail" domainObjectName="GhDetail" alias=""/>
+<!--        <table tableName="gh_detail" domainObjectName="GhDetail" alias=""/>-->
 <!--        <table tableName="we_com_guarantees_video" domainObjectName="GuaranteesVideo" alias=""/>-->
 <!--        <table tableName="we_com_staff" domainObjectName="Staff" alias=""/>-->
 <!--        <table tableName="we_com_staff_with_user" domainObjectName="StaffWithUser" alias=""/>-->
 <!--        <table tableName="we_com_send_message" domainObjectName="SendMessage" alias=""/>-->
-<!--        <table tableName="we_com_user" domainObjectName="WeComUser" alias=""/>-->
+        <table tableName="we_com_user" domainObjectName="WeComUser" alias=""/>
 <!--        <table tableName="we_com_corp" domainObjectName="Corp" alias=""/>-->
 
     </context>

common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/WeComUser.java

@@ -23,6 +23,8 @@ public class WeComUser {
 
     private Integer isDelete;
 
+    private Byte groupMsgDisabled;
+
     private Long createdAt;
 
     private Long updatedAt;
@@ -113,6 +115,14 @@ public class WeComUser {
         this.isDelete = isDelete;
     }
 
+    public Byte getGroupMsgDisabled() {
+        return groupMsgDisabled;
+    }
+
+    public void setGroupMsgDisabled(Byte groupMsgDisabled) {
+        this.groupMsgDisabled = groupMsgDisabled;
+    }
+
     public Long getCreatedAt() {
         return createdAt;
     }
@@ -169,6 +179,7 @@ public class WeComUser {
         sb.append(", avatar=").append(avatar);
         sb.append(", gender=").append(gender);
         sb.append(", isDelete=").append(isDelete);
+        sb.append(", groupMsgDisabled=").append(groupMsgDisabled);
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);
         sb.append(", deletedAt=").append(deletedAt);

common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/WeComUserExample.java

@@ -767,6 +767,66 @@ public class WeComUserExample {
             return (Criteria) this;
         }
 
+        public Criteria andGroupMsgDisabledIsNull() {
+            addCriterion("group_msg_disabled is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupMsgDisabledIsNotNull() {
+            addCriterion("group_msg_disabled is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupMsgDisabledEqualTo(Byte value) {
+            addCriterion("group_msg_disabled =", value, "groupMsgDisabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupMsgDisabledNotEqualTo(Byte value) {
+            addCriterion("group_msg_disabled <>", value, "groupMsgDisabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupMsgDisabledGreaterThan(Byte value) {
+            addCriterion("group_msg_disabled >", value, "groupMsgDisabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupMsgDisabledGreaterThanOrEqualTo(Byte value) {
+            addCriterion("group_msg_disabled >=", value, "groupMsgDisabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupMsgDisabledLessThan(Byte value) {
+            addCriterion("group_msg_disabled <", value, "groupMsgDisabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupMsgDisabledLessThanOrEqualTo(Byte value) {
+            addCriterion("group_msg_disabled <=", value, "groupMsgDisabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupMsgDisabledIn(List<Byte> values) {
+            addCriterion("group_msg_disabled in", values, "groupMsgDisabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupMsgDisabledNotIn(List<Byte> values) {
+            addCriterion("group_msg_disabled not in", values, "groupMsgDisabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupMsgDisabledBetween(Byte value1, Byte value2) {
+            addCriterion("group_msg_disabled between", value1, value2, "groupMsgDisabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupMsgDisabledNotBetween(Byte value1, Byte value2) {
+            addCriterion("group_msg_disabled not between", value1, value2, "groupMsgDisabled");
+            return (Criteria) this;
+        }
+
         public Criteria andCreatedAtIsNull() {
             addCriterion("created_at is null");
             return (Criteria) this;

common-module/src/main/java/com/tzld/piaoquan/growth/common/service/Impl/WeComUserServiceImpl.java

@@ -91,7 +91,7 @@ public class WeComUserServiceImpl implements WeComUserService {
                 weComUser.setType(type);
                 weComUser.setGender(gender);
                 weComUser.setCorpId(corpId);
-                weComUserMapper.insert(weComUser);
+                weComUserMapper.insertSelective(weComUser);
                 Long userId = weComUser.getId();
                 if (userId == null) {
                     log.error("insertStaffWithUserJob insert weComUser error weComUser={}", weComUser);

common-module/src/main/resources/mapper/WeComUserMapper.xml

@@ -12,6 +12,7 @@
     <result column="avatar" jdbcType="VARCHAR" property="avatar" />
     <result column="gender" jdbcType="INTEGER" property="gender" />
     <result column="is_delete" jdbcType="INTEGER" property="isDelete" />
+    <result column="group_msg_disabled" jdbcType="TINYINT" property="groupMsgDisabled" />
     <result column="created_at" jdbcType="BIGINT" property="createdAt" />
     <result column="updated_at" jdbcType="BIGINT" property="updatedAt" />
     <result column="deleted_at" jdbcType="BIGINT" property="deletedAt" />
@@ -78,7 +79,8 @@
   </sql>
   <sql id="Base_Column_List">
     id, corp_id, external_user_id, union_id, external_user_id_3rd_party, `type`, `name`, 
-    avatar, gender, is_delete, created_at, updated_at, deleted_at, create_time, update_time
+    avatar, gender, is_delete, group_msg_disabled, created_at, updated_at, deleted_at, 
+    create_time, update_time
   </sql>
   <select id="selectByExample" parameterType="com.tzld.piaoquan.growth.common.model.po.WeComUserExample" resultMap="BaseResultMap">
     select
@@ -117,115 +119,124 @@
     insert into we_com_user (id, corp_id, external_user_id, 
       union_id, external_user_id_3rd_party, `type`, 
       `name`, avatar, gender, 
-      created_at, updated_at,
-      deleted_at, create_time, update_time
-      )
+      is_delete, group_msg_disabled, created_at, 
+      updated_at, deleted_at, create_time, 
+      update_time)
     values (#{id,jdbcType=BIGINT}, #{corpId,jdbcType=BIGINT}, #{externalUserId,jdbcType=VARCHAR}, 
       #{unionId,jdbcType=VARCHAR}, #{externalUserId3rdParty,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, 
       #{name,jdbcType=VARCHAR}, #{avatar,jdbcType=VARCHAR}, #{gender,jdbcType=INTEGER}, 
-      #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT},
-      #{deletedAt,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
-      )
+      #{isDelete,jdbcType=INTEGER}, #{groupMsgDisabled,jdbcType=TINYINT}, #{createdAt,jdbcType=BIGINT}, 
+      #{updatedAt,jdbcType=BIGINT}, #{deletedAt,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP})
     <selectKey resultType="java.lang.Long" order="AFTER" keyProperty="id">
       select LAST_INSERT_ID()
     </selectKey>
   </insert>
-  <insert id="insertSelective" parameterType="com.tzld.piaoquan.growth.common.model.po.WeComUser">
-    insert into we_com_user
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="corpId != null">
-        corp_id,
-      </if>
-      <if test="externalUserId != null">
-        external_user_id,
-      </if>
-      <if test="unionId != null">
-        union_id,
-      </if>
-      <if test="externalUserId3rdParty != null">
-        external_user_id_3rd_party,
-      </if>
-      <if test="type != null">
-        `type`,
-      </if>
-      <if test="name != null">
-        `name`,
-      </if>
-      <if test="avatar != null">
-        avatar,
-      </if>
-      <if test="gender != null">
-        gender,
-      </if>
-      <if test="isDelete != null">
-        is_delete,
-      </if>
-      <if test="createdAt != null">
-        created_at,
-      </if>
-      <if test="updatedAt != null">
-        updated_at,
-      </if>
-      <if test="deletedAt != null">
-        deleted_at,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=BIGINT},
-      </if>
-      <if test="corpId != null">
-        #{corpId,jdbcType=BIGINT},
-      </if>
-      <if test="externalUserId != null">
-        #{externalUserId,jdbcType=VARCHAR},
-      </if>
-      <if test="unionId != null">
-        #{unionId,jdbcType=VARCHAR},
-      </if>
-      <if test="externalUserId3rdParty != null">
-        #{externalUserId3rdParty,jdbcType=VARCHAR},
-      </if>
-      <if test="type != null">
-        #{type,jdbcType=INTEGER},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="avatar != null">
-        #{avatar,jdbcType=VARCHAR},
-      </if>
-      <if test="gender != null">
-        #{gender,jdbcType=INTEGER},
-      </if>
-      <if test="isDelete != null">
-        #{isDelete,jdbcType=INTEGER},
-      </if>
-      <if test="createdAt != null">
-        #{createdAt,jdbcType=BIGINT},
-      </if>
-      <if test="updatedAt != null">
-        #{updatedAt,jdbcType=BIGINT},
-      </if>
-      <if test="deletedAt != null">
-        #{deletedAt,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
+  <insert id="insertSelective" parameterType="com.tzld.piaoquan.growth.common.model.po.WeComUser" useGeneratedKeys="true" keyProperty="id">
+      insert into we_com_user
+      <trim prefix="(" suffix=")" suffixOverrides=",">
+          <if test="id != null">
+              id,
+          </if>
+          <if test="corpId != null">
+              corp_id,
+          </if>
+          <if test="externalUserId != null">
+              external_user_id,
+          </if>
+          <if test="unionId != null">
+              union_id,
+          </if>
+          <if test="externalUserId3rdParty != null">
+              external_user_id_3rd_party,
+          </if>
+          <if test="type != null">
+              `type`,
+          </if>
+          <if test="name != null">
+              `name`,
+          </if>
+          <if test="avatar != null">
+              avatar,
+          </if>
+          <if test="gender != null">
+              gender,
+          </if>
+          <if test="isDelete != null">
+              is_delete,
+          </if>
+          <if test="groupMsgDisabled != null">
+              group_msg_disabled,
+          </if>
+          <if test="createdAt != null">
+              created_at,
+          </if>
+          <if test="updatedAt != null">
+              updated_at,
+          </if>
+          <if test="deletedAt != null">
+              deleted_at,
+          </if>
+          <if test="createTime != null">
+              create_time,
+          </if>
+          <if test="updateTime != null">
+              update_time,
+          </if>
+      </trim>
+      <trim prefix="values (" suffix=")" suffixOverrides=",">
+          <if test="id != null">
+              #{id,jdbcType=BIGINT},
+          </if>
+          <if test="corpId != null">
+              #{corpId,jdbcType=BIGINT},
+          </if>
+          <if test="externalUserId != null">
+              #{externalUserId,jdbcType=VARCHAR},
+          </if>
+          <if test="unionId != null">
+              #{unionId,jdbcType=VARCHAR},
+          </if>
+          <if test="externalUserId3rdParty != null">
+              #{externalUserId3rdParty,jdbcType=VARCHAR},
+          </if>
+          <if test="type != null">
+              #{type,jdbcType=INTEGER},
+          </if>
+          <if test="name != null">
+              #{name,jdbcType=VARCHAR},
+          </if>
+          <if test="avatar != null">
+              #{avatar,jdbcType=VARCHAR},
+          </if>
+          <if test="gender != null">
+              #{gender,jdbcType=INTEGER},
+          </if>
+          <if test="isDelete != null">
+              #{isDelete,jdbcType=INTEGER},
+          </if>
+          <if test="groupMsgDisabled != null">
+              #{groupMsgDisabled,jdbcType=TINYINT},
+          </if>
+          <if test="createdAt != null">
+              #{createdAt,jdbcType=BIGINT},
+          </if>
+          <if test="updatedAt != null">
+              #{updatedAt,jdbcType=BIGINT},
+          </if>
+          <if test="deletedAt != null">
+              #{deletedAt,jdbcType=BIGINT},
+          </if>
+          <if test="createTime != null">
+              #{createTime,jdbcType=TIMESTAMP},
+          </if>
+          <if test="updateTime != null">
+              #{updateTime,jdbcType=TIMESTAMP},
+          </if>
+      </trim>
+      <selectKey resultType="java.lang.Long" order="AFTER" keyProperty="id">
+          select LAST_INSERT_ID()
+      </selectKey>
   </insert>
   <select id="countByExample" parameterType="com.tzld.piaoquan.growth.common.model.po.WeComUserExample" resultType="java.lang.Long">
     select count(*) from we_com_user
@@ -266,6 +277,9 @@
       <if test="record.isDelete != null">
         is_delete = #{record.isDelete,jdbcType=INTEGER},
       </if>
+      <if test="record.groupMsgDisabled != null">
+        group_msg_disabled = #{record.groupMsgDisabled,jdbcType=TINYINT},
+      </if>
       <if test="record.createdAt != null">
         created_at = #{record.createdAt,jdbcType=BIGINT},
       </if>
@@ -298,6 +312,7 @@
       avatar = #{record.avatar,jdbcType=VARCHAR},
       gender = #{record.gender,jdbcType=INTEGER},
       is_delete = #{record.isDelete,jdbcType=INTEGER},
+      group_msg_disabled = #{record.groupMsgDisabled,jdbcType=TINYINT},
       created_at = #{record.createdAt,jdbcType=BIGINT},
       updated_at = #{record.updatedAt,jdbcType=BIGINT},
       deleted_at = #{record.deletedAt,jdbcType=BIGINT},
@@ -337,6 +352,9 @@
       <if test="isDelete != null">
         is_delete = #{isDelete,jdbcType=INTEGER},
       </if>
+      <if test="groupMsgDisabled != null">
+        group_msg_disabled = #{groupMsgDisabled,jdbcType=TINYINT},
+      </if>
       <if test="createdAt != null">
         created_at = #{createdAt,jdbcType=BIGINT},
       </if>
@@ -366,6 +384,7 @@
       avatar = #{avatar,jdbcType=VARCHAR},
       gender = #{gender,jdbcType=INTEGER},
       is_delete = #{isDelete,jdbcType=INTEGER},
+      group_msg_disabled = #{groupMsgDisabled,jdbcType=TINYINT},
       created_at = #{createdAt,jdbcType=BIGINT},
       updated_at = #{updatedAt,jdbcType=BIGINT},
       deleted_at = #{deletedAt,jdbcType=BIGINT},

offline-module/src/main/java/com/tzld/piaoquan/offline/job/WeComMessageDataJob.java

@@ -238,7 +238,7 @@ public class WeComMessageDataJob {
         init(staffIds);
         for (Corp corp : corps) {
             WeComUserExample weComUserExample = new WeComUserExample();
-            weComUserExample.createCriteria().andExternalUserIdIsNotNull().andCorpIdEqualTo(corp.getId());
+            weComUserExample.createCriteria().andExternalUserIdIsNotNull().andCorpIdEqualTo(corp.getId()).andGroupMsgDisabledEqualTo((byte) 0);
             if (xxlJobParam.getUserId() != null) {
                 weComUserExample.createCriteria().andIdEqualTo(xxlJobParam.getUserId());
             }

offline-module/src/main/java/com/tzld/piaoquan/offline/job/WeComUserDataJob.java

@@ -121,7 +121,7 @@ public class WeComUserDataJob {
                     weComUser.setCreatedAt(createAt);
                     Long userId;
                     if (CollectionUtils.isEmpty(weComUserList)) {
-                        weComUserMapper.insert(weComUser);
+                        weComUserMapper.insertSelective(weComUser);
                         userId = weComUser.getId();
                     } else {
                         WeComUser oldWeComUser = weComUserList.get(0);